Changeset 6778 in orxonox.OLD for trunk/src/lib/graphics/graphics_engine.cc

Timestamp:

Jan 26, 2006, 5:49:58 PM (18 years ago)

Author:

bensch

Message:

trunk: ModelView work…

File:

• trunk/src/lib/graphics/graphics_engine.cc (modified) (4 diffs)

trunk/src/lib/graphics/graphics_engine.cc

@@ -321 +321 @@
       //    return -1;
     }
-    glMatrixMode(GL_PROJECTION_MATRIX);
-    glLoadIdentity();
     glViewport(0, 0, width, height);                     // Reset The Current Viewport
 
@@ -451 +449 @@
   glDisable(GL_LIGHTING);  // will be set back when leaving 2D-mode
 
-  glViewport(0, 0, screen->w, screen->h);
-
   glMatrixMode(GL_PROJECTION);
   glPushMatrix();
   glLoadIdentity();
-
   glOrtho(0.0, (GLdouble)screen->w, (GLdouble)screen->h, 0.0, 0.0, 1.0);
 
@@ -462 +457 @@
   glPushMatrix();
   glLoadIdentity();
-
-  glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 }
 
@@ -585 +578 @@
 void GraphicsEngine::draw() const
 {
+  GraphicsEngine::storeMatrices();
+
   LightManager::getInstance()->draw();
-  GraphicsEngine::storeMatrices();
+
   Shader::suspendShader();