Changeset 3844 in orxonox.OLD

Timestamp:

Apr 17, 2005, 12:41:57 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: GraphicsEngine now stores the glMatrices, when transforming into 2D-mode

Location:

orxonox/trunk/src/lib/graphics

Files:

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

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -174 +174 @@
 void GraphicsEngine::enter2DMode(void)
 {
+  GraphicsEngine::storeMatrices();
   SDL_Surface *screen = SDL_GetVideoSurface();
   
@@ -218 +219 @@
 }
 
+/**
+   \brief stores the GL_matrices 
+*/
+void GraphicsEngine::storeMatrices(void)
+{
+  glGetDoublev(GL_PROJECTION_MATRIX, GraphicsEngine::projMat);
+  glGetDoublev(GL_MODELVIEW_MATRIX, GraphicsEngine::modMat);
+  glGetIntegerv(GL_VIEWPORT, GraphicsEngine::viewPort);
+}
+
+//! the stored ModelView Matrix.
+GLdouble GraphicsEngine::modMat[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+//! the stored Projection Matrix
+GLdouble GraphicsEngine::projMat[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+//! The ViewPort
+GLint GraphicsEngine::viewPort[4] = {0,0,0,0};
 
 

orxonox/trunk/src/lib/graphics/graphics_engine.h

@@ -40 +40 @@
   static void leave2DMode(void);
 
+  static void storeMatrices(void);
+  static GLdouble modMat[16];
+  static GLdouble projMat[16];
+  static GLint viewPort[4];
+
+
+
  private:
   GraphicsEngine();

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

@@ -183 +183 @@
 void Text::draw(void) const
 {
-  // storing all the Transformation Matrices.
-  GLdouble modMat[16];
-  GLdouble projMat[16];
-  GLint viewPort[4];
-  glGetDoublev(GL_PROJECTION_MATRIX, projMat);
-  glGetDoublev(GL_MODELVIEW_MATRIX, modMat);
-  glGetIntegerv(GL_VIEWPORT, viewPort);
-
-  GraphicsEngine::enter2DMode();
-
-
   // setting the Position of this Text.
   Vector pos;
@@ -202 +191 @@
       GLdouble z = this->bindNode->getAbsCoor().z;
       GLdouble tmp[3];
-      gluProject(x, y, z, modMat, projMat, viewPort, tmp, tmp+1, tmp+2);
+      gluProject(x, y, z, GraphicsEngine::modMat, GraphicsEngine::projMat, GraphicsEngine::viewPort, tmp, tmp+1, tmp+2);
       pos.x = tmp[0] + this->posSize.x;
       pos.y = GraphicsEngine::getInstance()->getResolutionY() - tmp[1] + this->posSize.y;
@@ -266 +255 @@
     }
   glPopMatrix();
-  GraphicsEngine::leave2DMode();
 }
 
@@ -931 +919 @@
 void TextEngine::draw(void) const
 {
+  // entering 3D-mode
+  GraphicsEngine::enter2DMode();
+  // drawing all the texts
   tIterator<Text>* textIterator = textList->getIterator();
   Text* text = textIterator->nextElement();
@@ -939 +930 @@
     }
   delete textIterator;
+  // retruning to the previous mode
+  GraphicsEngine::leave2DMode();
 }