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

Timestamp:

Jul 3, 2005, 4:49:42 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: setting the resolution works again (workaround. now i fix the subprojects again.)

File:

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

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

@@ -36 +36 @@
   this->setClassID(CL_GRAPHICS_ENGINE, "GraphicsEngine");
   this->setName("GraphicsEngine");
+
+  this->isInit = false;
+
   this->bDisplayFPS = false;
   this->minFPS = 9999;
@@ -42 +45 @@
   this->fullscreenFlag = 0;
 
-  this->initVideo();
-
-  this->listModes();
+//  this->listModes();
 }
 
@@ -60 +61 @@
 }
 
+int GraphicsEngine::init()
+{
+  this->initVideo(640,480,16);
+}
+
 /**
    \brief initializes the Video for openGL.
@@ -65 +71 @@
    This has to be done only once when starting orxonox.
 */
-int GraphicsEngine::initVideo()
-{
+int GraphicsEngine::initVideo(unsigned int resX, unsigned int resY, unsigned int bbp)
+{
+  if (this->isInit)
+    return -1;
   // initialize SDL_VIDEO
   if (SDL_Init(SDL_INIT_VIDEO) == -1)
@@ -95 +103 @@
   */
     // setting up the Resolution
-  this->setResolution(640, 480, 16);
+  this->setResolution(resX, resY, bbp);
 
   // TO DO: Create a cool icon and use it here
@@ -104 +112 @@
   // Enable default GL stuff
   glEnable(GL_DEPTH_TEST);
+
+  this->isInit = true;
 }
 
@@ -112 +122 @@
  * @returns nothing usefull
  */
-int GraphicsEngine::loadFromIniFile(IniParser* iniParser)
+int GraphicsEngine::initFromIniFile(IniParser* iniParser)
 {
   // searching for a usefull resolution
   SubString resolution(iniParser->getVar(CONFIG_NAME_RESOLUTION, CONFIG_SECTION_VIDEO, "640x480"), 'x');
-  this->setResolution(atoi(resolution.getString(0)), atoi(resolution.getString(1)), 16);
+  this->initVideo(atoi(resolution.getString(0)), atoi(resolution.getString(1)), 16);
 
   // looking if we are in fullscreen-mode