Changeset 4606 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 12, 2005, 2:58:12 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: minor

Location:

orxonox/trunk

Files:

• orxonox.kdevelop (modified) (1 diff)
• src/orxonox.cc (modified) (1 diff)
• src/util/resource_manager.cc (modified) (1 diff)
• src/util/resource_manager.h (modified) (1 diff)

orxonox/trunk/orxonox.kdevelop

@@ -156 +156 @@
     </groups>
     <tree>
-      <hidepatterns>*.o,*.a,Makefile.in,Makefile,*~</hidepatterns>
+      <hidepatterns>*.o</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
     </tree>

orxonox/trunk/src/orxonox.cc

@@ -187 +187 @@
 int Orxonox::initResources()
 {
-  PRINT(3)("initializing ResourceManager\n");
-  resourceManager = ResourceManager::getInstance();
+   PRINT(3)("initializing ResourceManager\n");
+   resourceManager = ResourceManager::getInstance();
 
   // 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))
-        {
+   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");
-  TextEngine::getInstance();
-
-  PRINT(3)("initializing ObjectManager\n");
-  this->objectManager = ObjectManager::getInstance();
+       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);
+   }
+   //! \todo this is a hack and should be loadable
+   resourceManager->addImageDir(ResourceManager::getInstance()->getFullName("maps/"));
+   resourceManager->debug();
+
+   PRINT(3)("initializing TextEngine\n");
+   TextEngine::getInstance();
+
+   PRINT(3)("initializing ObjectManager\n");
+   this->objectManager = ObjectManager::getInstance();
 
   return 0;

orxonox/trunk/src/util/resource_manager.cc

@@ -765 +765 @@
    \brief outputs debug information about the ResourceManager
 */
-void ResourceManager::debug(void)
+void ResourceManager::debug(void) const
 {
   PRINT(0)("=RM===================================\n");

orxonox/trunk/src/util/resource_manager.h

@@ -116 +116 @@
   bool unloadAllByPriority(ResourcePriority prio);
 
-  void debug(void);
+  void debug(void) const;