Changeset 7256 in orxonox.OLD for trunk/src/lib

Timestamp:

Mar 30, 2006, 11:45:31 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the preferences back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/preferences . -r7233:HEAD
no conflicts… nice work

Location:

trunk/src/lib

Files:

• BuildLibs.am (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• event/event_handler.cc (modified) (1 diff)
• event/event_handler.h (modified) (2 diffs)
• event/key_mapper.cc (modified) (4 diffs)
• event/key_mapper.h (modified) (1 diff)
• graphics/graphics_engine.cc (modified) (3 diffs)
• graphics/graphics_engine.h (modified) (2 diffs)
• network/network_manager.cc (modified) (1 diff)
• network/network_manager.h (modified) (1 diff)
• parser/Makefile.am (modified) (1 diff)
• parser/cmdline_parser (copied) (copied from branches/preferences/src/lib/parser/cmdline_parser)
• parser/cmdline_parser/Makefile.am (copied) (copied from branches/preferences/src/lib/parser/cmdline_parser/Makefile.am)
• parser/cmdline_parser/cmdline_parser.cc (copied) (copied from branches/preferences/src/lib/parser/cmdline_parser/cmdline_parser.cc)
• parser/cmdline_parser/cmdline_parser.h (copied) (copied from branches/preferences/src/lib/parser/cmdline_parser/cmdline_parser.h)
• parser/ini_parser/ini_parser.cc (modified) (1 diff)
• parser/ini_parser/ini_parser.h (modified) (1 diff)
• parser/preferences (copied) (copied from branches/preferences/src/lib/parser/preferences)
• parser/preferences/Makefile.am (copied) (copied from branches/preferences/src/lib/parser/preferences/Makefile.am)
• parser/preferences/cmd_line_prefs_reader.cc (copied) (copied from branches/preferences/src/lib/parser/preferences/cmd_line_prefs_reader.cc)
• parser/preferences/cmd_line_prefs_reader.h (copied) (copied from branches/preferences/src/lib/parser/preferences/cmd_line_prefs_reader.h)
• parser/preferences/ini_file_prefs_reader.cc (copied) (copied from branches/preferences/src/lib/parser/preferences/ini_file_prefs_reader.cc)
• parser/preferences/ini_file_prefs_reader.h (copied) (copied from branches/preferences/src/lib/parser/preferences/ini_file_prefs_reader.h)
• sound/sound_engine.cc (modified) (2 diffs)
• sound/sound_engine.h (modified) (1 diff)
• util/preferences.cc (copied) (copied from branches/preferences/src/lib/util/preferences.cc)
• util/preferences.h (copied) (copied from branches/preferences/src/lib/util/preferences.h)

trunk/src/lib/BuildLibs.am

@@ -15 +15 @@
                 $(LIB_PREFIX)/graphics/spatial_separation/libORXquadtree.a \
                 $(LIB_PREFIX)/parser/tinyxml/libtinyxml.a \
+                $(LIB_PREFIX)/parser/preferences/libPrefsParser.a \
+                $(LIB_PREFIX)/parser/cmdline_parser/libCmdLineParser.a \
                 $(LIB_PREFIX)/parser/ini_parser/libIniParser.a \
                 $(LIB_PREFIX)/shell/libORXshell.a \
-                $(LIB_PREFIX)/math/libORXmath.a
+                $(LIB_PREFIX)/math/libORXmath.a \
+                $(LIB_PREFIX)/libORXlibs.a

trunk/src/lib/Makefile.am

@@ -23 +23 @@
                 util/loading/factory.cc \
                 util/loading/dynamic_loader.cc \
+                util/preferences.cc \
                 \
                 data/data_tank.cc
@@ -39 +40 @@
                 util/executor/executor_specials.h \
                 util/executor/functor_list.h \
+                util/preferences.h \
                 \
                 util/loading/resource_manager.h \

trunk/src/lib/event/event_handler.cc

@@ -88 +88 @@
  * this has to be called before the use of the event handler
 */
-void EventHandler::init(IniParser* iniParser)
+void EventHandler::init()
 {
   if (this->keyMapper == NULL)
   {
     this->keyMapper = new KeyMapper();
-    this->keyMapper->loadKeyBindings(iniParser);
+    this->keyMapper->loadKeyBindings();
   }
 }

trunk/src/lib/event/event_handler.h

@@ -15 +15 @@
 // FORWARD DECLARATION
 class EventListener;
-class IniParser;
 
 //! The one Event Handler from Orxonox
@@ -24 +23 @@
   /** @returns a Pointer to the only object of this Class */
   inline static EventHandler* getInstance() { if (!singletonRef) singletonRef = new EventHandler();  return singletonRef; };
-  void init(IniParser* iniParser);
+  void init();
 
   /** @param state: to which the event handler shall change */

trunk/src/lib/event/key_mapper.cc

@@ -25 +25 @@
 #include "globals.h"
 #include "parser/ini_parser/ini_parser.h"
+#include "util/preferences.h"
 #include "key_names.h"
 #include "debug.h"
@@ -145 +146 @@
 
   iniParser->firstVar();
-  while(iniParser->getCurrentName() != "")
+  while( iniParser->getCurrentName() != "" )
   {
     PRINTF(3)("Keys: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
@@ -164 +165 @@
 
   iniParser->firstVar();
-  while(iniParser->getCurrentName() != "")
+  while( iniParser->getCurrentName() != "" )
   {
     PRINTF(3)("MISC: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
@@ -170 +171 @@
     this->mapKeys(iniParser->getCurrentName(), index);
     iniParser->nextVar();
+  }
+}
+
+void KeyMapper::loadKeyBindings()
+{
+  if( !Preferences::getInstance()->sectionExists(CONFIG_SECTION_PLAYER "1"))
+  {
+    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_PLAYER"1\n");
+    return;
+  }
+  int* index;
+
+  std::list<std::string> keys = Preferences::getInstance()->listKeys(CONFIG_SECTION_PLAYER "1");
+  for ( std::list<std::string>::const_iterator it = keys.begin(); it!=keys.end(); it++ )
+  {
+    PRINTF(3)("Keys: Parsing %s, %s now.\n", it->c_str(), Preferences::getInstance()->getString(CONFIG_SECTION_PLAYER "1", *it, "").c_str());
+    // map the name to an sdl index
+    index = nameToIndex (Preferences::getInstance()->getString(CONFIG_SECTION_PLAYER "1", *it, ""));
+    // map the index to a internal name
+    this->mapKeys(*it, index);
+  }
+
+
+  // PARSE MISC SECTION
+  if( !Preferences::getInstance()->sectionExists (CONFIG_SECTION_MISC_KEYS))
+  {
+    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_MISC_KEYS "\n");
+    return;
+  }
+
+  keys = Preferences::getInstance()->listKeys(CONFIG_SECTION_MISC_KEYS);
+  for ( std::list<std::string>::const_iterator it = keys.begin(); it!=keys.end(); it++ )
+  {
+    PRINTF(3)("MISC: Parsing %s, %s now.\n", it->c_str(), Preferences::getInstance()->getString(CONFIG_SECTION_MISC_KEYS, *it, "").c_str());
+    index = nameToIndex (Preferences::getInstance()->getString(CONFIG_SECTION_MISC_KEYS, *it, ""));
+    this->mapKeys(*it, index);
   }
 }

trunk/src/lib/event/key_mapper.h

@@ -29 +29 @@
   virtual ~KeyMapper();
 
-  void loadKeyBindings(const std::string& fileName = "" );
+  void loadKeyBindings(const std::string& fileName );
+  void loadKeyBindings();
   void loadKeyBindings(IniParser* iniParser);
 

trunk/src/lib/graphics/graphics_engine.cc

@@ -29 +29 @@
 #include "debug.h"
 
-#include "parser/ini_parser/ini_parser.h"
+#include "util/preferences.h"
 #include "substring.h"
 #include "text.h"
@@ -150 +150 @@
 /**
  * loads the GraphicsEngine's settings from a given ini-file and section
- * @param iniParser the iniParser to load from
- * @param section the Section in the ini-file to load from
  * @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 +168 @@
 
   // 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);

trunk/src/lib/graphics/graphics_engine.h

@@ -20 +20 @@
 // Forward Declaration
 class Text;
-class IniParser;
 class WorldEntity;
 class GraphicsEffect;
@@ -39 +38 @@
 
     int init();
-    int initFromIniFile(IniParser* iniParser);
+    int initFromPreferences();
 
     void setWindowName(const std::string& windowName, const std::string& icon);

trunk/src/lib/network/network_manager.cc

@@ -88 +88 @@
  * @param hostName: the name of the destination host
  */
-int NetworkManager::establishConnection(const char* name, unsigned int port)
+int NetworkManager::establishConnection(const std::string & name, unsigned int port)
 {
   IPaddress ipAddress;
-  int error = SDLNet_ResolveHost(&ipAddress, name, port);
+  int error = SDLNet_ResolveHost(&ipAddress, name.c_str(), port);
   if( error == -1) {
     printf("\n\nerror on address resolution, program inconsistency\n\n");

trunk/src/lib/network/network_manager.h

@@ -36 +36 @@
     void shutdown();
 
-    int establishConnection(const char* name, unsigned int port);
+    int establishConnection( const std::string & name, unsigned int port);
     int createServer(unsigned int port);
 

trunk/src/lib/parser/Makefile.am

@@ -1 +1 @@
 SUBDIRS = \
           tinyxml \
-          ini_parser
+          ini_parser \
+          preferences \
+          cmdline_parser
 
 

trunk/src/lib/parser/ini_parser/ini_parser.cc

@@ -392 +392 @@
 }
 
+/**
+ * @brief edits the entry speciefied by entryName in sectionName/currentSection or creates it if it doesn't exist
+ * @param entryName the Name of the Entry to add
+ * @param value the value to assign to this entry
+ * @param sectionName if NULL then this entry will be set to the currentSection
+ * otherwise to the section refered to by sectionName.
+ * If both are NULL no entry will be added
+ * @return true if everything is ok false on error
+ */
+bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName)
+{
+  std::list<IniSection>::iterator section;
+
+  if (!sectionName.empty())
+  {
+    for (section = this->sections.begin(); section != this->sections.end(); section++)
+      if ((*section).name == sectionName)
+        break;
+  }
+  else
+    section = this->currentSection;
+
+  if (section == this->sections.end())
+  {
+    IniSection sec;
+    sec.comment = "";
+    sec.name = sectionName;
+    section = this->sections.insert(this->sections.end(), sec);
+  }
+
+  if (section == this->sections.end())
+  {
+    PRINTF(2)("section '%s' not found for value '%s'\n", sectionName.c_str(), entryName.c_str());
+    return false;
+  }
+  else
+  {
+    //try find item
+    std::list<IniEntry>::iterator entry;
+    for (entry = section->entries.begin(); entry!=section->entries.end(); entry++)
+      if (entry->name == entryName )
+        break;
+
+    //found it?
+    if ( entry != section->entries.end() )
+    {
+      entry->value = value;
+
+      return true;
+    }
+
+    //not found -> create it
+    (*section).entries.push_back(IniEntry());
+    (*section).entries.back().comment = "";
+    (*section).entries.back().name = entryName;
+    (*section).entries.back().value = value;
+    PRINTF(5)("Added Entry %s with Value '%s' to Section %s\n",
+    (*section).entries.back().name.c_str(),
+    (*section).entries.back().value.c_str(),
+    (*section).name);
+    this->currentEntry = --(*section).entries.end();
+    return true;
+  }
+}
+
 
 /**

trunk/src/lib/parser/ini_parser/ini_parser.h

@@ -69 +69 @@
     bool addVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "" );
     const std::string& getVar(const std::string& entryName, const std::string& sectionName, const std::string& defaultValue = "") const;
+    bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "");
     void setEntryComment(const std::string& comment, const std::string& entryName, const std::string& sectionName);
     const std::string& getEntryComment(const std::string& entryName, const std::string& sectionName) const;

trunk/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"
 
@@ -95 +95 @@
 /**
  * loads the settings of the SoundEngine from an ini-file
- * @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;
 }

trunk/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);