Changeset 7913 in orxonox.OLD

Timestamp:

May 27, 2006, 9:31:48 PM (18 years ago)

Author:

bensch

Message:

gui: fixed a pop-attrib-missing-bug

Location:

branches/gui/src

Files:

• lib/graphics/graphics_engine.cc (modified) (1 diff)
• lib/graphics/render2D/element_2d.cc (modified) (1 diff)
• lib/gui/gl_gui/glmenu/glmenu_imagescreen.cc (modified) (1 diff)
• story_entities/game_world.cc (modified) (1 diff)
• story_entities/movie_loader.cc (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (3 diffs)
• world_entities/skybox.cc (modified) (1 diff)

branches/gui/src/lib/graphics/graphics_engine.cc

@@ -573 +573 @@
 void GraphicsEngine::drawBackgroundElements() const
 {
+  GraphicsEngine::storeMatrices();
+
   Render2D::getInstance()->draw(E2D_LAYER_BELOW_ALL, E2D_LAYER_BELOW_ALL);
 }

branches/gui/src/lib/graphics/render2D/element_2d.cc

@@ -1107 +1107 @@
   if (level == 0)
     glPopAttrib();
-
 }
 

branches/gui/src/lib/gui/gl_gui/glmenu/glmenu_imagescreen.cc

@@ -240 +240 @@
   glEnd();
 
-  glDisable(GL_TEXTURE_2D);
   /* draw white border */
   glBegin(GL_LINE_LOOP);

branches/gui/src/story_entities/game_world.cc

@@ -523 +523 @@
   GraphicsEngine* engine = GraphicsEngine::getInstance();
 
+
   AtmosphericEngine::getInstance()->draw();
+
+  //glEnable(GL_DEPTH_TEST);
+  //glEnable(GL_LIGHTING);
 
   // set camera

branches/gui/src/story_entities/movie_loader.cc

@@ -128 +128 @@
   glEnd();
 
+  glPopAttrib();
   GraphicsEngine::leave2DMode();
 

branches/gui/src/story_entities/simple_game_menu.cc

@@ -66 +66 @@
   /// GUI
   ///(this is as modular as it is possible).
+  /*
   OrxGui::GLGuiPushButton* pb = new OrxGui::GLGuiPushButton("PUSH ME");
   pb->show();
@@ -86 +87 @@
   OrxGui::GLGuiHandler::getInstance()->activateCursor();
   OrxGui::GLGuiHandler::getInstance()->activate();
+  */
   /////
+
   if (root != NULL)
     this->loadParams(root);
@@ -106 +109 @@
   if( this->dataTank)
     delete this->dataTank;
-  delete OrxGui::GLGuiHandler::getInstance( );
+  //delete OrxGui::GLGuiHandler::getInstance( );
 }
 

branches/gui/src/world_entities/skybox.cc

@@ -227 +227 @@
   glDisable(GL_LIGHTING);
 
-  glPushAttrib(GL_ENABLE_BIT);
   glDisable(GL_FOG);
 
   WorldEntity::draw();
 
-  glPopAttrib();
   glPopAttrib();