Changeset 4091 in orxonox.OLD for orxonox/trunk

Timestamp:

May 6, 2005, 8:02:26 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: now All options get loaded in new style (be aware, quiting only works with ESCAPE, not q, but of corse you can change this now in the GUI

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• command_node.cc (modified) (2 diffs)
• defs/globals.h (added)
• defs/stdincl.h (modified) (1 diff)
• game_loader.cc (modified) (4 diffs)
• lib/gui/gui/gui_audio.cc (modified) (3 diffs)
• lib/gui/gui/gui_exec.cc (modified) (2 diffs)
• lib/gui/gui/gui_gtk.h (modified) (1 diff)
• lib/gui/gui/gui_keys.cc (modified) (3 diffs)
• lib/gui/gui/gui_update.cc (modified) (2 diffs)
• lib/gui/gui/gui_video.cc (modified) (5 diffs)
• orxonox.cc (modified) (2 diffs)
• story_entities/world.cc (modified) (1 diff)
• util/resource_manager.cc (modified) (1 diff)
• util/resource_manager.h (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)

orxonox/trunk/src/Makefile.am

@@ -131 +131 @@
                  defs/error.h \
                  defs/debug.h \
+                 defs/globals.h \
                  lib/coord/p_node.h \
                  lib/coord/null_parent.h \

orxonox/trunk/src/Makefile.in

@@ -372 +372 @@
                  defs/error.h \
                  defs/debug.h \
+                 defs/globals.h \
                  lib/coord/p_node.h \
                  lib/coord/null_parent.h \

orxonox/trunk/src/command_node.cc

@@ -126 +126 @@
   // create parser
   IniParser parser (filename);
-  if( parser.getSection ("player1") == -1)
-    {
-      PRINTF(1)("Could not find key bindings in %s\n", filename);
+  if( parser.getSection (CONFIG_SECTION_PLAYER "1") == -1)
+    {
+      PRINTF(1)("Could not find key bindings " CONFIG_SECTION_PLAYER"1 in %s\n", filename);
       return;
     }
@@ -162 +162 @@
 
   // PARSE MISC SECTION
-  if( parser.getSection ("miscKeys") == -1)
+  if( parser.getSection (CONFIG_SECTION_MISC_KEYS) == -1)
     {
       PRINTF(1)("Could not find key bindings in %s\n", filename);

orxonox/trunk/src/defs/stdincl.h

@@ -25 +25 @@
 #include "error.h"
 #include "debug.h"
+#include "globals.h"
 
 #include "compiler.h"

orxonox/trunk/src/game_loader.cc

@@ -214 +214 @@
 bool GameLoader::worldCommand (Command* cmd)
 {
-  if( !strcmp( cmd->cmd, "up_world"))
+  if( !strcmp( cmd->cmd, CONFIG_NAME_NEXT_WORLD))
     {
       if( !cmd->bUp) 
@@ -222 +222 @@
       return true;
     }
-  else if( !strcmp( cmd->cmd, "down_world"))
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_PREV_WORLD))
     {
       if( !cmd->bUp)
@@ -230 +230 @@
       return true;
     }
-  else if( !strcmp( cmd->cmd, "pause"))
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_PAUSE))
     {
       if( !cmd->bUp)
@@ -241 +241 @@
       return true;
     }
-  else if( !strcmp( cmd->cmd, "quit"))
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_QUIT))
     {
       if( !cmd->bUp) this->stop();

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

@@ -36 +36 @@
 
   audioFrame = new Frame("Audio-Options:");
-  audioFrame->setGroupName("audio");
+  audioFrame->setGroupName(CONFIG_SECTION_AUDIO);
   {
     Box* audioBox;            //!< The Box that holds the audio Options.
@@ -45 +45 @@
       Slider* effectsVolume;    //!< A Slider for effects volume.
       
-      enableSound = new CheckButton("Disable Sound");
+      enableSound = new CheckButton(CONFIG_NAME_DISABLE_AUDIO);
       enableSound->setFlagName ("no-sound", 0);
       enableSound->saveability();
       audioBox->fill(enableSound);
-      Label* musicVolumeLabel = new Label("Music Volume");
+      Label* musicVolumeLabel = new Label(CONFIG_NAME_MUSIC_VOLUME);
       audioBox->fill(musicVolumeLabel);
       musicVolume = new Slider("Music Volume", 0, 100);
@@ -55 +55 @@
       musicVolume->saveability();
       audioBox->fill (musicVolume);
-      Label* effectsVolumeLabel = new Label ("Effects Volume");
+      Label* effectsVolumeLabel = new Label (CONFIG_NAME_EFFECTS_VOLUME);
       audioBox->fill (effectsVolumeLabel);
       effectsVolume = new Slider ("Effects Volume", 0, 100);

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

@@ -53 +53 @@
 
     execBox = new Box('v');
-    execFrame->setGroupName("misc");
+    execFrame->setGroupName(CONFIG_SECTION_MISC);
     {
       Button* start;               //!< The start Button of orxonox.
@@ -65 +65 @@
 #endif /* HAVE_GTK2 */
       execBox->fill(start);
-      this->saveSettings = new CheckButton("Save Settings");
+      this->saveSettings = new CheckButton(CONFIG_NAME_SAVE_SETTINGS);
       this->saveSettings->value = 1;
       this->saveSettings->saveability();
       execBox->fill(this->saveSettings);
 
-      verboseMode = new Menu("verbose mode", "nothing", "error", "warning", "info", "lastItem");
+      verboseMode = new Menu(CONFIG_NAME_VERBOSE_MODE, "nothing", "error", "warning", "info", "lastItem");
       verboseMode->setFlagName("verbose", "v", 2);
       verboseMode->saveability();
       execBox->fill(verboseMode);
 
-      alwaysShow = new CheckButton("Always Show this Menu");
+      alwaysShow = new CheckButton(CONFIG_NAME_ALWAYS_SHOW_GUI);
       alwaysShow->setFlagName("gui", "g", 0);
       alwaysShow->saveability();

orxonox/trunk/src/lib/gui/gui/gui_gtk.h

@@ -11 +11 @@
 
 #include "debug.h"
+#include "globals.h"
 
 #ifdef HAVE_GTK2

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

@@ -50 +50 @@
         PlayerKeys* player2;       //!< The seconds Player's keys.
         
-        player1 = new PlayerKeys("player1");
-        player2 = new PlayerKeys("player2");
+        player1 = new PlayerKeys(CONFIG_SECTION_PLAYER "1");
+        player2 = new PlayerKeys(CONFIG_SECTION_PLAYER "2");
         
         keysBox1->fill(player1->getOpenButton());
@@ -115 +115 @@
 
         pKeysBox->setGroupName(player);
-        pKeysBox->fill(addKey("up", "UP"));
-        pKeysBox->fill(addKey("down", "DOWN"));
-        pKeysBox->fill(addKey("left", "LEFT"));
-        pKeysBox->fill(addKey("right", "RIGHT"));
-        pKeysBox->fill(addKey("fire", "SPACE"));
+        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_UP, "UP"));
+        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_DOWN, "DOWN"));
+        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_LEFT, "LEFT"));
+        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_RIGHT, "RIGHT"));
+        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_FIRE, "SPACE"));
+        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_NEXT_WEAPON, "m"));
+        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_PREV_WEAPON, "n"));
         closeButton = new Button("close");
 #ifdef HAVE_GTK2
@@ -174 +176 @@
         Button* closeButton;    //!< The CloseButton for this key-settings.
 
-        keysBox->setGroupName("miscKeys");
-        keysBox->fill(addKey( "quit", "ESCAPE"));
-        keysBox->fill(addKey("pause", "PAUSE"));
-        keysBox->fill(addKey("up_world", "x"));
-        keysBox->fill(addKey("down_world", "z"));
-        keysBox->fill(addKey("view0", "1"));
-        keysBox->fill(addKey("view1", "2"));
-        keysBox->fill(addKey("view2", "3"));
-        keysBox->fill(addKey("view3", "4"));
-        keysBox->fill(addKey("view4", "5"));
-        keysBox->fill(addKey("view5", "6"));
+        keysBox->setGroupName(CONFIG_SECTION_MISC_KEYS);
+        keysBox->fill(addKey(CONFIG_NAME_QUIT , "ESCAPE"));
+        keysBox->fill(addKey(CONFIG_NAME_PAUSE, "PAUSE"));
+        keysBox->fill(addKey(CONFIG_NAME_NEXT_WORLD, "x"));
+        keysBox->fill(addKey(CONFIG_NAME_PREV_WORLD, "z"));
+        keysBox->fill(addKey(CONFIG_NAME_VIEW0, "1"));
+        keysBox->fill(addKey(CONFIG_NAME_VIEW1, "2"));
+        keysBox->fill(addKey(CONFIG_NAME_VIEW2, "3"));
+        keysBox->fill(addKey(CONFIG_NAME_VIEW3, "4"));
+        keysBox->fill(addKey(CONFIG_NAME_VIEW4, "5"));
+        keysBox->fill(addKey(CONFIG_NAME_VIEW5, "6"));
 
         closeButton = new Button("close");

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

@@ -50 +50 @@
 
   this->updateFrame = new Frame("Update-Options:");
-  this->updateFrame->setGroupName("update");
+  this->updateFrame->setGroupName(CONFIG_SECTION_DATA);
   this->updateBox = new Box('v');
 
-  dataDirButton = new Button("Data Directory");
-  dataDirLabel = new OptionLabel("DataDir", "unknown");
+  dataDirButton = new Button(CONFIG_NAME_DATADIR);
+  dataDirLabel = new OptionLabel(CONFIG_NAME_DATADIR, "unknown");
   dataDirLabel->saveability();
   dataDirDialog = new FileDialog("data-Repos-location");
@@ -70 +70 @@
 
   // the Button for autoUpdating
-  this->autoUpdate = new CheckButton("auto update");
+  this->autoUpdate = new CheckButton(CONFIG_NAME_AUTO_UPDATE);
   this->updateBox->fill(this->autoUpdate);
   this->autoUpdate->setFlagName("update", "u", 0);

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

@@ -49 +49 @@
       CheckButton* wireframe;   //!< CheckButton for wireframe Mode.
 
-      fullscreen = new CheckButton("Fullscreen-mode");
+      fullscreen = new CheckButton(CONFIG_NAME_FULLSCREEN);
       fullscreen->setFlagName("windowed", "q", 1);
       fullscreen->saveability();
       videoBox->fill(fullscreen);
-      resolution = new Menu("Resolution");
+      resolution = new Menu(CONFIG_NAME_RESOLUTION);
       getResolutions(resolution);
       resolution->saveability();
       resolution->setFlagName("resolution", "r", 0);
       videoBox->fill(resolution);
-      wireframe = new CheckButton("WireFrame-mode");
+      wireframe = new CheckButton(CONFIG_NAME_WIREFRAME);
       wireframe->setFlagName("wireframe", "w", 0);
       wireframe->saveability();
@@ -91 +91 @@
   // the Window itself
   advancedWindow = new Window("Advanced Video Options");
-  advancedWindow->setGroupName("advancedVideoOptions");
+  advancedWindow->setGroupName(CONFIG_SECTION_VIDEO_ADVANCED);
   {
     Box* advancedBox;         //!< A Box to pack the options into.
@@ -111 +111 @@
 
       // Advanced Performance Options
-      shadows = new CheckButton("Shadows");
+      shadows = new CheckButton(CONFIG_NAME_SHADOWS);
       shadows->saveability();
       advancedBox->fill(shadows);
       
-      fog = new CheckButton("Fog");
+      fog = new CheckButton(CONFIG_NAME_FOG);
       fog->saveability();
       advancedBox->fill(fog);
       
-      reflections = new CheckButton("Reflections");
+      reflections = new CheckButton(CONFIG_NAME_REFLECTIONS);
       reflections->saveability();
       advancedBox->fill(reflections);
       
-      textures = new CheckButton("Textures");
+      textures = new CheckButton(CONFIG_NAME_TEXTURES);
       textures->saveability();
       advancedBox->fill(textures);
       
-      textureDetail = new Menu("Texture Detail", "low", "medium", "high", "lastItem");
+      textureDetail = new Menu(CONFIG_NAME_TEXTURE_DETAIL, "low", "medium", "high", "lastItem");
       textureDetail->setDefaultValue(1);
       textureDetail->saveability();
       advancedBox->fill(textureDetail);
       
-      modelDetailLabel = new Label("Model Detail");
+      modelDetailLabel = new Label(CONFIG_NAME_MODEL_DETAIL);
       advancedBox->fill(modelDetailLabel);
-      modelDetail = new Menu("Model Detail", "low", "high", "lastItem");
+      modelDetail = new Menu(CONFIG_NAME_MODEL_DETAIL, "low", "high", "lastItem");
       modelDetail->setDefaultValue(1);
       modelDetail->saveability();
@@ -141 +141 @@
       antiAliasingLabel = new Label("Anti-Aliasing-depth:");
       advancedBox->fill(antiAliasingLabel);
-      antiAliasing = new Menu("Anti Aliasing", "0", "1", "2", "4", "8",  "lastItem");
+      antiAliasing = new Menu(CONFIG_NAME_ANTI_ALIASING, "0", "1", "2", "4", "8",  "lastItem");
       antiAliasing->setDefaultValue(2);
       antiAliasing->saveability();
@@ -148 +148 @@
       filterMethodLabel = new Label("Filtering Method:");
       advancedBox->fill(filterMethodLabel);
-      filterMethod = new Menu("Filtering Method", "none", "linear", "bilinear", "trilinear", "anisortopic", "lastItem");
+      filterMethod = new Menu(CONFIG_NAME_FILTER_METHOD, "none", "linear", "bilinear", "trilinear", "anisortopic", "lastItem");
       filterMethod->setDefaultValue(1);
       filterMethod->saveability();

orxonox/trunk/src/orxonox.cc

@@ -32 +32 @@
 #include "data_tank.h"
 #include "command_node.h"
+#include "ini_parser.h"
 #include "game_loader.h"
 #include "graphics_engine.h"
@@ -173 +174 @@
 int Orxonox::initResources() 
 {
-  //  printf("Not yet implemented\n");
   PRINT(3)("initializing ResourceManager\n");
   resourceManager = ResourceManager::getInstance();
-  if (!resourceManager->setDataDir("../data/"))
-    {
-      PRINTF(1)("Data Could not be located\n");
+
+  // create parser
+  IniParser parser (DEFAULT_CONFIG_FILE);
+  if( parser.getSection (CONFIG_SECTION_DATA) == -1)
+    {
+      PRINTF(1)("Could not find Section %s in %s\n", CONFIG_SECTION_DATA, DEFAULT_CONFIG_FILE);
+      return -1;
+    }
+  char namebuf[256];
+  char valuebuf[256];
+  memset (namebuf, 0, 256);
+  memset (valuebuf, 0, 256);
+  
+  while( parser.nextVar (namebuf, valuebuf) != -1)
+    {
+      if (!strcmp(namebuf, CONFIG_NAME_DATADIR))
+        {
+          //  printf("Not yet implemented\n");
+          if (!resourceManager->setDataDir(valuebuf))
+            {
+              PRINTF(1)("Data Could not be located\n");
+              exit(-1);
+            }
+        }
+      
+      memset (namebuf, 0, 256);
+      memset (valuebuf, 0, 256);
+    }
+  
+  if (!resourceManager->checkDataDir(DEFAULT_DATA_DIR_CHECKFILE))
+    {
+      PRINTF(1)("The DataDirectory %s could not be verified\nPlease Change in File %s Section %s Entry %s to a suitable value\n",
+                resourceManager->getDataDir(),
+                DEFAULT_CONFIG_FILE,
+                CONFIG_SECTION_DATA,
+                CONFIG_NAME_DATADIR);
       exit(-1);
     }
+
 
   PRINT(3)("initializing TextEngine\n");

orxonox/trunk/src/story_entities/world.cc

@@ -1219 +1219 @@
 bool World::command(Command* cmd)
 {
-  if( !strcmp( cmd->cmd, "view0")) this->localCamera->setViewMode(VIEW_NORMAL);
-  else if( !strcmp( cmd->cmd, "view1")) this->localCamera->setViewMode(VIEW_BEHIND);
-  else if( !strcmp( cmd->cmd, "view2")) this->localCamera->setViewMode(VIEW_FRONT);
-  else if( !strcmp( cmd->cmd, "view3")) this->localCamera->setViewMode(VIEW_LEFT);
-  else if( !strcmp( cmd->cmd, "view4")) this->localCamera->setViewMode(VIEW_RIGHT);
-  else if( !strcmp( cmd->cmd, "view5")) this->localCamera->setViewMode(VIEW_TOP);
+  if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW0)) this->localCamera->setViewMode(VIEW_NORMAL);
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW1)) this->localCamera->setViewMode(VIEW_BEHIND);
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW2)) this->localCamera->setViewMode(VIEW_FRONT);
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW3)) this->localCamera->setViewMode(VIEW_LEFT);
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW4)) this->localCamera->setViewMode(VIEW_RIGHT);
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW5)) this->localCamera->setViewMode(VIEW_TOP);
 
   return false;

orxonox/trunk/src/util/resource_manager.cc

@@ -99 +99 @@
       return false;
     }
+}
+
+/**
+   \brief checks for the DataDirectory, by looking if 
+   \param fileInside is inisde??
+*/
+bool ResourceManager::checkDataDir(const char* fileInside)
+{
+  bool retVal;
+  if (!isDir(this->dataDir))
+    {
+      PRINTF(1)("%s is not a directory\n", this->dataDir);
+      return false;
+    }
+  
+  char* testFile = new char[strlen(this->dataDir)+strlen(fileInside)+1];
+  sprintf(testFile, "%s%s", this->dataDir, fileInside);
+  retVal = isFile(testFile);
+  delete testFile;
+  return retVal;
 }
 

orxonox/trunk/src/util/resource_manager.h

@@ -65 +65 @@
 
   bool setDataDir(const char* dataDir);
+  /** \returns the Name of the data directory */
+  const char*  getDataDir(void) {return this->dataDir;}
+  bool checkDataDir(const char* fileInside);
   bool addImageDir(char* imageDir);
   void* load(const char* fileName, ResourcePriority prio = RP_NO,

orxonox/trunk/src/world_entities/player.cc

@@ -294 +294 @@
 {
   PRINTF(3)("recieved command [%s]\n", cmd->cmd);
-  if( !strcmp( cmd->cmd, "up")) this->bUp = !cmd->bUp;
-  if( !strcmp( cmd->cmd, "down")) this->bDown = !cmd->bUp;
-  if( !strcmp( cmd->cmd, "left")) this->bLeft = !cmd->bUp;
-  if( !strcmp( cmd->cmd, "right")) this->bRight = !cmd->bUp;
-  if( !strcmp( cmd->cmd, "fire")) this->bFire = !cmd->bUp;
-  if( !strcmp( cmd->cmd, "mode")) if(cmd->bUp) this->bWeaponChange = !this->bWeaponChange;
-}
+  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_UP)) this->bUp = !cmd->bUp;
+  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_DOWN)) this->bDown = !cmd->bUp;
+  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_LEFT)) this->bLeft = !cmd->bUp;
+  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_RIGHT)) this->bRight = !cmd->bUp;
+  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_FIRE)) this->bFire = !cmd->bUp;
+  if( !strcmp( cmd->cmd, CONFIG_NAME_PLAYER_NEXT_WEAPON)) if(cmd->bUp) this->bWeaponChange = !this->bWeaponChange;
+}