Changeset 4777 in orxonox.OLD for orxonox

Timestamp:

Jul 2, 2005, 7:21:50 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ability to disable textures

Location:

orxonox/trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (1 diff)
• lib/graphics/graphics_engine.h (modified) (1 diff)
• lib/gui/gui_video.cc (modified) (9 diffs)
• orxonox.cc (modified) (1 diff)

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

@@ -112 +112 @@
  * @returns nothing usefull
  */
-int GraphicsEngine::loadFromIniFile(IniParser* iniParser, const char* section)
+int GraphicsEngine::loadFromIniFile(IniParser* iniParser)
 {
   // searching for a usefull resolution
-  SubString resolution(iniParser->getVar(CONFIG_NAME_RESOLUTION, section, "640x480"), 'x');
+  SubString resolution(iniParser->getVar(CONFIG_NAME_RESOLUTION, CONFIG_SECTION_VIDEO, "640x480"), 'x');
   this->setResolution(atoi(resolution.getString(0)), atoi(resolution.getString(1)), 16);
 
   // looking if we are in fullscreen-mode
-  const char* fullscreen = iniParser->getVar(CONFIG_NAME_FULLSCREEN, section, "0");
+  const char* fullscreen = iniParser->getVar(CONFIG_NAME_FULLSCREEN, CONFIG_SECTION_VIDEO, "0");
   if (strchr(fullscreen, '1'))
     this->setFullscreen(true);
+
+  // looking if we are in fullscreen-mode
+  const char* textures = iniParser->getVar(CONFIG_NAME_TEXTURES, CONFIG_SECTION_VIDEO_ADVANCED, "0");
+  if (strchr(textures, '1'))
+    this->texturesEnabled = true;
+  else
+    this->texturesEnabled = false;
+
 }
 

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

@@ -31 +31 @@
 
     int initVideo();
-    int loadFromIniFile(IniParser* iniParser, const char* section);
+    int loadFromIniFile(IniParser* iniParser);
 
     void setWindowName(const char* windowName, const char* icon);

orxonox/trunk/src/lib/gui/gui_video.cc

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -16 +16 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
@@ -118 +118 @@
       shadows->saveability();
       advancedBox->fill(shadows);
-      
+
       fog = new CheckButton(CONFIG_NAME_FOG);
       fog->saveability();
       advancedBox->fill(fog);
-      
+
       reflections = new CheckButton(CONFIG_NAME_REFLECTIONS);
       reflections->saveability();
       advancedBox->fill(reflections);
-      
+
       textures = new CheckButton(CONFIG_NAME_TEXTURES);
+      textures->setDefaultValue(1);
       textures->saveability();
       advancedBox->fill(textures);
-      
+
       textureDetail = new Menu(CONFIG_NAME_TEXTURE_DETAIL, "low", "medium", "high", "lastItem");
       textureDetail->setDefaultValue(1);
       textureDetail->saveability();
       advancedBox->fill(textureDetail);
-      
+
       modelDetailLabel = new Label(CONFIG_NAME_MODEL_DETAIL);
       advancedBox->fill(modelDetailLabel);
@@ -142 +143 @@
       modelDetail->saveability();
       advancedBox->fill(modelDetail);
-      
+
       particles = new CheckButton(CONFIG_NAME_PARTICLES_ENABLED);
       particles->saveability();
@@ -154 +155 @@
       antiAliasing->saveability();
       advancedBox->fill(antiAliasing);
-      
+
       filterMethodLabel = new Label("Filtering Method:");
       advancedBox->fill(filterMethodLabel);
@@ -163 +164 @@
 
 
-  
+
       closeButton = new Button("close");
 #ifdef HAVE_GTK2
@@ -194 +195 @@
   int x = 0,y =0; // check for difference
   char tmpChar[100];
-  
+
   /* Get available fullscreen/hardware modes */
   modes=SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE);
-  
+
   /* Check is there are any modes available */
   if(modes == (SDL_Rect **)0){
@@ -203 +204 @@
     exit(-1);
   }
-  
+
   /* Check if our resolution is restricted */
   if(modes == (SDL_Rect **)-1){
@@ -213 +214 @@
     for(i = 0; modes[i] ;++i)
       {
-        if (x != modes[i]->w || y != modes[i]->h)
-          { 
-            PRINTF(5)("  %d x %d\n", modes[i]->w, modes[i]->h);
-            sprintf(tmpChar, "%dx%d", modes[i]->w, modes[i]->h);
-            menu->addItem(tmpChar);
-            x = modes[i]->w; y = modes[i]->h;
-          }
+        if (x != modes[i]->w || y != modes[i]->h)
+          {
+            PRINTF(5)("  %d x %d\n", modes[i]->w, modes[i]->h);
+            sprintf(tmpChar, "%dx%d", modes[i]->w, modes[i]->h);
+            menu->addItem(tmpChar);
+            x = modes[i]->w; y = modes[i]->h;
+          }
       }
   }

orxonox/trunk/src/orxonox.cc

@@ -153 +153 @@
   GraphicsEngine::getInstance()->setWindowName(PACKAGE_NAME " " PACKAGE_VERSION, PACKAGE_NAME " " PACKAGE_VERSION);
 
-  GraphicsEngine::getInstance()->loadFromIniFile(this->iniParser, CONFIG_SECTION_VIDEO);
+  GraphicsEngine::getInstance()->loadFromIniFile(this->iniParser);
 
   return 0;