Changeset 7248 in orxonox.OLD for branches/preferences

Timestamp:

Mar 24, 2006, 7:03:22 PM (19 years ago)

Author:

rennerc

Message:

removed some more iniParsers

Location:

branches/preferences/src

Files:

• lib/event/event_handler.cc (modified) (1 diff)
• lib/event/event_handler.h (modified) (2 diffs)
• lib/event/key_mapper.cc (modified) (4 diffs)
• lib/event/key_mapper.h (modified) (1 diff)
• lib/util/preferences.cc (modified) (2 diffs)
• lib/util/preferences.h (modified) (2 diffs)
• orxonox.cc (modified) (5 diffs)
• orxonox.h (modified) (2 diffs)

branches/preferences/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();
   }
 }

branches/preferences/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 */

branches/preferences/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(0)("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);
   }
 }

branches/preferences/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);
 

branches/preferences/src/lib/util/preferences.cc

@@ -67 +67 @@
 
       break;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * Check if this section exists
+ * @param section name of the section
+ * @param name name of the item to check
+ * @return true if the item exists
+ */
+bool Preferences::sectionExists( const std::string& section )
+{
+  std::list<prefSection>::const_iterator it = data.begin();
+
+  for ( ; it!=data.end(); it++)
+  {
+    if ( it->sectionName == section )
+    {
+      return true;
     }
   }
@@ -285 +306 @@
 }
 
-
+/**
+ * list all keys in section
+ * @param section section
+ * @return list of keys
+ */
+std::list< std::string > Preferences::listKeys( const std::string section )
+{
+  std::list<std::string> lst;
+  
+  std::list<prefSection>::const_iterator it = data.begin();
+
+  for ( ; it!=data.end(); it++)
+  {
+    if ( it->sectionName == section )
+    {
+      std::list<prefItem>::const_iterator it2 = it->items.begin();
+
+      for ( ; it2!=it->items.end(); it2++)
+      {
+        lst.push_back( it2->name );
+      }
+
+      break;
+    }
+  }
+
+  return lst;
+}
+
+

branches/preferences/src/lib/util/preferences.h

@@ -36 +36 @@
 
    //check if this entry exists
+   bool sectionExists(const std::string& section );
    bool exists(const std::string& section, const std::string& name);
 
@@ -52 +53 @@
    bool save();
 
-
    void debug();
+   
+   std::list<std::string> listKeys( const std::string section );
 
 

branches/preferences/src/orxonox.cc

@@ -78 +78 @@
   this->setName("orxonox-main");
 
-  this->iniParser = NULL;
-
   this->argc = 0;
   this->argv = NULL;
@@ -115 +113 @@
   // output-buffer
   delete ShellBuffer::getInstance();
-
-  // orxonox class-stuff
-  delete this->iniParser;
 
   SDL_QuitSubSystem(SDL_INIT_TIMER);
@@ -176 +171 @@
   else
     this->configFileName = ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE);
-  this->iniParser = new IniParser(this->configFileName);
+
   PRINTF(3)("Parsed Config File: '%s'\n", this->configFileName);
 }
@@ -261 +256 @@
   PRINT(3)("> Initializing input\n");
 
-  EventHandler::getInstance()->init(this->iniParser);
+  EventHandler::getInstance()->init();
   EventHandler::getInstance()->subscribe(GraphicsEngine::getInstance(), ES_ALL, EV_VIDEO_RESIZE);
 
@@ -300 +295 @@
   // init the resource manager
   std::string dataPath;
-  if ((dataPath = this->iniParser->getVar(CONFIG_NAME_DATADIR, CONFIG_SECTION_DATA))!= "")
+  if ((dataPath = Preferences::getInstance()->getString(CONFIG_SECTION_DATA, CONFIG_NAME_DATADIR, ""))!= "")
   {
     if (!ResourceManager::getInstance()->setDataDir(dataPath) &&

branches/preferences/src/orxonox.h

@@ -32 +32 @@
   Orxonox ();
 
-  void parseIniFile(const std::string& fileName);
-
   int initResources ();
   int initVideo ();
@@ -46 +44 @@
   static Orxonox*   singletonRef;            //!< singleton reference to orxonox
 
-  IniParser*        iniParser;               //!< Reference to the ini-parser used in orxonox
   std::string       configFileName;          //!< Filename of the configuration-file.
   GameLoader*       gameLoader;              //!< The gameLoader