From 8ef534e7b7d1f781e8c913a7c154b51c3b78b036 Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Sun, 17 Apr 2011 17:39:03 -0300
Subject: [PATCH] render fix

---
 src/framework/core/engine.cpp       | 18 ++++++++----------
 src/framework/core/engine.h         |  3 ---
 src/framework/graphics/graphics.cpp |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/framework/core/engine.cpp b/src/framework/core/engine.cpp
index 4d892a61..a7ec344e 100644
--- a/src/framework/core/engine.cpp
+++ b/src/framework/core/engine.cpp
@@ -90,12 +90,19 @@ void Engine::run()
                 }
             }
 
-            render();
+            // render
+            g_graphics.beginRender();
+
+            if(m_currentState)
+                m_currentState->render();
+            UIContainer::getRootContainer()->render();
 
             // render fps
             if(m_calculateFps)
                 defaultFont->renderText(fpsText, Point(g_graphics.getScreenSize().width() - fpsTextSize.width() - 10, 10));
 
+            g_graphics.endRender();
+
             // swap buffers
             Platform::swapBuffers();
         }
@@ -119,15 +126,6 @@ void Engine::changeState(GameState* newState)
         m_currentState->onEnter();
 }
 
-void Engine::render()
-{
-    g_graphics.beginRender();
-    if(m_currentState)
-        m_currentState->render();
-    UIContainer::getRootContainer()->render();
-    g_graphics.endRender();
-}
-
 void Engine::onClose()
 {
     if(m_currentState)
diff --git a/src/framework/core/engine.h b/src/framework/core/engine.h
index 0f5d2215..ac8848bc 100644
--- a/src/framework/core/engine.h
+++ b/src/framework/core/engine.h
@@ -65,9 +65,6 @@ public:
     int getCurrentFrameTicks() const { return m_lastFrameTicks; }
 
 private:
-    /// Called to render every frame
-    void render();
-
     bool m_stopping;
     bool m_running;
     bool m_calculateFps;
diff --git a/src/framework/graphics/graphics.cpp b/src/framework/graphics/graphics.cpp
index 29220608..d2e127ee 100644
--- a/src/framework/graphics/graphics.cpp
+++ b/src/framework/graphics/graphics.cpp
@@ -41,6 +41,7 @@ void Graphics::init()
     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
     glShadeModel(GL_SMOOTH);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
 
     logInfo("GPU %s", (const char*)glGetString(GL_RENDERER));
     logInfo("OpenGL %s", (const char*)glGetString(GL_VERSION));
@@ -115,7 +116,6 @@ void Graphics::restoreViewport()
 
 void Graphics::beginRender()
 {
-    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT);
     glLoadIdentity();