Changeset 4650 in orxonox.OLD

Timestamp:

Jun 17, 2005, 11:07:59 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Now the Subprojects get the DataDirectory from the ~/orxonox/orxonox.conf file

Location:

orxonox/trunk/src/subprojects

Files:

• framework.cc (modified) (3 diffs)
• framework.h (modified) (2 diffs)
• particles/Makefile.am (modified) (2 diffs)
• particles/Makefile.in (modified) (3 diffs)

orxonox/trunk/src/subprojects/framework.cc

@@ -25 +25 @@
 #include "resource_manager.h"
 #include "camera.h"
+#include "ini_parser.h"
 
 
 int verbose;
+
+void Framework::init(void)
+{
+  // 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);
+  }
+  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::getInstance()->setDataDir(valuebuf))
+      {
+        PRINTF(1)("Data Could not be located\n");
+      }
+    }
+
+    memset (namebuf, 0, 256);
+    memset (valuebuf, 0, 256);
+  }
+
+  if (!ResourceManager::getInstance()->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::getInstance()->getDataDir(),
+    DEFAULT_CONFIG_FILE,
+    CONFIG_SECTION_DATA,
+    CONFIG_NAME_DATADIR);
+    exit(-1);
+  }
+}
+
 
 void* Framework::mainLoop(void* tmp)
@@ -238 +279 @@
 Framework::Framework()
 {
+  this->init();
+
   this->isFinished = false;
 
@@ -256 +299 @@
   for (int i = 0; i < 4; i++)
     backgroundColor[i] = 0;
-
-  ResourceManager::getInstance()->setDataDir(DATA_DIRECTORY);
 
   camera = new Camera();

orxonox/trunk/src/subprojects/framework.h

@@ -11 +11 @@
 #endif
 
-#define DATA_DIRECTORY "~/orxonox/repos/trunk/data/"
-#define MOUSE_BUTTON_COUNT 8
+#define MOUSE_BUTTON_COUNT 3
 
 class Camera;
@@ -52 +51 @@
 
 
-
+  void init(void);
   static void* mainLoop(void* tmp);
   bool draw(float dt);

orxonox/trunk/src/subprojects/particles/Makefile.am

@@ -8 +8 @@
                   $(MAINSRCDIR)/lib/event/libORXevent.a \
                   $(MAINSRCDIR)/lib/particles/libORXparticles.a \
+                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
                   $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
                   $(MAINSRCDIR)/lib/physics/libORXphysics.a \
@@ -13 +14 @@
                   $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
-particles_CPPFLAGS =  -DGUI_MODULE  -DNO_AUDIO \
+particles_CPPFLAGS =  -DGUI_MODULE  \
                       $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
 

orxonox/trunk/src/subprojects/particles/Makefile.in

@@ -68 +68 @@
         $(MAINSRCDIR)/lib/event/libORXevent.a \
         $(MAINSRCDIR)/lib/particles/libORXparticles.a \
+        $(MAINSRCDIR)/lib/sound/libORXsound.a \
         $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
         $(MAINSRCDIR)/lib/physics/libORXphysics.a \
@@ -216 +217 @@
                   $(MAINSRCDIR)/lib/event/libORXevent.a \
                   $(MAINSRCDIR)/lib/particles/libORXparticles.a \
+                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
                   $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
                   $(MAINSRCDIR)/lib/physics/libORXphysics.a \
@@ -221 +223 @@
                   $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
-particles_CPPFLAGS = -DGUI_MODULE  -DNO_AUDIO \
+particles_CPPFLAGS = -DGUI_MODULE  \
                       $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)