Changeset 8308 in orxonox.OLD for branches/terrain

Timestamp:

Jun 10, 2006, 5:26:50 PM (18 years ago)

Author:

ponder

Message:

• orxonox crashed on osx when a call to the opengl subsystem was done before the window was created. I changed the

order of initialisation in graphics_engine.cc.

• orxonox.cc contained a bug when debug level is set unter 3

Location:

branches/terrain/src

Files:

• lib/graphics/graphics_engine.cc (modified) (2 diffs)
• orxonox.cc (modified) (1 diff)

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

@@ -234 +234 @@
   // Enable default GL stuff
   glEnable(GL_DEPTH_TEST);
-
+  glEnable(GL_CULL_FACE);
+  glCullFace(GL_FRONT);
   Render2D::getInstance();
 
@@ -287 +288 @@
   SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);  //Enable double buffering
 
-  glEnable(GL_CULL_FACE);
-  glCullFace(GL_FRONT);
 }
 

branches/terrain/src/orxonox.cc

@@ -515 +515 @@
   // checking for existence of the configuration-files, or if the lock file is still used
   if (showGui || (!File("./orxonox.conf").isFile() &&
-                  !File(DEFAULT_CONFIG_FILE).isFile())
-#if DEBUG_LEVEL <= 3 // developers do not need to see the GUI, when orxonox fails
-      || ResourceManager::isFile(DEFAULT_LOCK_FILE)
-#endif
-     )
+                  !File(DEFAULT_CONFIG_FILE).isFile() ) )
   {
     File lockFile(DEFAULT_LOCK_FILE);