Changeset 7913 in orxonox.OLD for branches/gui/src/story_entities

Timestamp:

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

Author:

bensch

Message:

gui: fixed a pop-attrib-missing-bug

Location:

branches/gui/src/story_entities

Files:

• game_world.cc (modified) (1 diff)
• movie_loader.cc (modified) (1 diff)
• simple_game_menu.cc (modified) (3 diffs)

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( );
 }