Changeset 7428 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Apr 29, 2006, 12:13:38 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: move the Pollution of the ShellCommand to some other File

Location:

trunk/src/lib/graphics

Files:

• graphics_engine.cc (modified) (2 diffs)
• text_engine/font.cc (modified) (1 diff)
• text_engine/font.h (modified) (1 diff)
• text_engine/text_engine.cc (modified) (2 diffs)

trunk/src/lib/graphics/graphics_engine.cc

@@ -571 +571 @@
   //  LightManager::getInstance()->draw();
 
-  GraphicsEngine::storeMatrices();
-  Shader::suspendShader();
-
-  Render2D::getInstance()->draw(E2D_LAYER_ALL);
-  Shader::restoreShader();
-
   if (this->graphicsEffects != NULL)
   {
@@ -584 +578 @@
       dynamic_cast<GraphicsEffect*>(*it)->draw();
   }
+  GraphicsEngine::storeMatrices();
+  Shader::suspendShader();
+
+  Render2D::getInstance()->draw(E2D_LAYER_ALL);
+  Shader::restoreShader();
 }
 

trunk/src/lib/graphics/text_engine/font.cc

@@ -29 +29 @@
 #include "stdlibincl.h"
 #include "compiler.h"
-
 using namespace std;
 

trunk/src/lib/graphics/text_engine/font.h

@@ -74 +74 @@
     inline TTF_Font* getTTF() const { return this->fontTTF; };
 
-
     /** @returns the default Font */
     inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; };

trunk/src/lib/graphics/text_engine/text_engine.cc

@@ -37 +37 @@
 
 #include "debug.h"
-
 ///////////////////
 /// TEXT-ENGINE ///
@@ -104 +103 @@
 /**
  *  function to disable TTF_fonts
-*/
+ */
 void TextEngine::disableFonts()
 {