Changeset 7247 in orxonox.OLD

Timestamp:

Mar 24, 2006, 6:24:41 PM (18 years ago)

Author:

rennerc

Message:

removed several iniParser

Location:

branches/preferences/src

Files:

• lib/graphics/graphics_engine.cc (modified) (3 diffs)
• lib/graphics/graphics_engine.h (modified) (1 diff)
• lib/sound/sound_engine.cc (modified) (2 diffs)
• lib/sound/sound_engine.h (modified) (1 diff)
• orxonox.cc (modified) (3 diffs)
• subprojects/framework.cc (modified) (2 diffs)

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

@@ -30 +30 @@
 
 #include "parser/ini_parser/ini_parser.h"
+#include "util/preferences.h"
 #include "substring.h"
 #include "text.h"
@@ -154 +155 @@
  * @returns nothing usefull
  */
-int GraphicsEngine::initFromIniFile(IniParser* iniParser)
+int GraphicsEngine::initFromPreferences()
 {
   // looking if we are in fullscreen-mode
-  const std::string fullscreen = iniParser->getVar(CONFIG_NAME_FULLSCREEN, CONFIG_SECTION_VIDEO, "0");
+  const std::string fullscreen = Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO, CONFIG_NAME_FULLSCREEN, "0");
+
   if (fullscreen[0] == '1' || fullscreen == "true")
     this->fullscreenFlag = SDL_FULLSCREEN;
 
   // looking if we are in fullscreen-mode
-  const std::string textures = iniParser->getVar(CONFIG_NAME_TEXTURES, CONFIG_SECTION_VIDEO_ADVANCED, "0");
+  const std::string textures = Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO_ADVANCED, CONFIG_NAME_TEXTURES, "0");
   if (textures[0] == '1' || textures == "true")
     Texture::setTextureEnableState(true);
@@ -169 +171 @@
 
   // searching for a usefull resolution
-  SubString resolution(iniParser->getVar(CONFIG_NAME_RESOLUTION, CONFIG_SECTION_VIDEO, "640x480").c_str(), 'x'); ///FIXME
+  SubString resolution(Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO, CONFIG_NAME_RESOLUTION, "640x480").c_str(), 'x'); ///FIXME
   //resolution.debug();
   MultiType x = resolution.getString(0), y = resolution.getString(1);

branches/preferences/src/lib/graphics/graphics_engine.h

@@ -39 +39 @@
 
     int init();
-    int initFromIniFile(IniParser* iniParser);
+    int initFromPreferences();
 
     void setWindowName(const std::string& windowName, const std::string& icon);

branches/preferences/src/lib/sound/sound_engine.cc

@@ -26 +26 @@
 #include "util/loading/resource_manager.h"
 #include "debug.h"
-#include "parser/ini_parser/ini_parser.h"
+#include "util/preferences.h"
 #include "globals.h"
 
@@ -97 +97 @@
  * @param iniParser the IniParser of the inifile
  */
-void SoundEngine::loadSettings(IniParser* iniParser)
-{
-  MultiType channels = iniParser->getVar(CONFIG_NAME_AUDIO_CHANNELS, CONFIG_SECTION_AUDIO, "32");
+void SoundEngine::loadSettings()
+{
+  MultiType channels = Preferences::getInstance()->getString(CONFIG_SECTION_AUDIO, CONFIG_NAME_AUDIO_CHANNELS, "32");
   this->maxSourceCount = channels.getInt();
 
-  MultiType effectsVolume = iniParser->getVar(CONFIG_NAME_EFFECTS_VOLUME, CONFIG_SECTION_AUDIO, "80");
+  MultiType effectsVolume = Preferences::getInstance()->getString(CONFIG_SECTION_AUDIO, CONFIG_NAME_EFFECTS_VOLUME, "80");
   this->effectsVolume = effectsVolume.getFloat()/100.0;
 
-  MultiType musicVolume = iniParser->getVar(CONFIG_NAME_MUSIC_VOLUME, CONFIG_SECTION_AUDIO, "75");
+  MultiType musicVolume = Preferences::getInstance()->getString(CONFIG_SECTION_AUDIO, CONFIG_NAME_MUSIC_VOLUME, "75");
   this->musicVolume = musicVolume.getFloat()/100.0;
 }

branches/preferences/src/lib/sound/sound_engine.h

@@ -31 +31 @@
     inline static SoundEngine* getInstance() { if (!SoundEngine::singletonRef) SoundEngine::singletonRef = new SoundEngine();  return SoundEngine::singletonRef; };
 
-    void loadSettings(IniParser* iniParser);
+    void loadSettings();
 
     SoundSource* createSource(const std::string& fileName, PNode* sourceNode = NULL);

branches/preferences/src/orxonox.cc

@@ -228 +228 @@
   GraphicsEngine::getInstance();
 
-  GraphicsEngine::getInstance()->initFromIniFile(this->iniParser);
+  GraphicsEngine::getInstance()->initFromPreferences();
 
   std::string iconName = ResourceManager::getFullName("pictures/fighter-top-32x32.bmp");
@@ -248 +248 @@
   SoundEngine::getInstance();
 
-  SoundEngine::getInstance()->loadSettings(this->iniParser);
+  SoundEngine::getInstance()->loadSettings();
   SoundEngine::getInstance()->initAudio();
   return 0;
@@ -410 +410 @@
   prefs.parse(argc, argv);
   
-  Preferences::getInstance()->debug();
-
-  assert(false);
+  //Preferences::getInstance()->debug();
   
   int i;

branches/preferences/src/subprojects/framework.cc

@@ -23 +23 @@
 #include "util/loading/resource_manager.h"
 #include "camera.h"
-#include "parser/ini_parser/ini_parser.h"
+#include "util/preferences.h"
 #include "globals.h"
 
@@ -30 +30 @@
 void Framework::init(void)
 {
-  // create parser
-  char* configFileName = ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE);
-
-  IniParser iniParser (configFileName);
-  delete configFileName;
-
-  GraphicsEngine::getInstance()->initFromIniFile(&iniParser);
+  GraphicsEngine::getInstance()->initFromPreferences();
 
   LightManager::getInstance();
 
   const char* dataPath;
-  if ((dataPath = iniParser.getVar(CONFIG_NAME_DATADIR, CONFIG_SECTION_DATA))!= NULL)
+  if ((dataPath = Preferences::getInstance()->getString(CONFIG_SECTION_DATA, CONFIG_NAME_DATADIR, ""))!= NULL)
   {
     if (!ResourceManager::getInstance()->setDataDir(dataPath))