Changeset 9795 in orxonox.OLD

Timestamp:

Sep 23, 2006, 6:52:01 PM (18 years ago)

Author:

bensch

Message:

the new ResourceManger should work with the global settings

Location:

branches/new_class_id/src

Files:

• lib/util/loading/new_resource_manager.cc (modified) (3 diffs)
• lib/util/loading/new_resource_manager.h (modified) (1 diff)
• lib/util/loading/resource.cc (modified) (2 diffs)
• orxonox.cc (modified) (1 diff)

branches/new_class_id/src/lib/util/loading/new_resource_manager.cc

@@ -34 +34 @@
 NewResourceManager::NewResourceManager ()
 {
-  //this->registerObject(this, NewResourceManager::_objectList);
+  this->registerObject(this, NewResourceManager::_objectList);
   this->setName("NewResourceManager");
 
@@ -103 +103 @@
 
 
+
+bool NewResourceManager::checkFileInMainPath(const File& fileInside)
+{
+  return (this->_mainGlobalPath + fileInside).exists();
+}
+
+
 /**
  * @brief outputs debug information about the NewResourceManager
@@ -114 +121 @@
   std::vector<Resources::Type*>::const_iterator it;
   for (it = this->_resourceTypes.begin(); it != this->_resourceTypes.end(); ++it)
+  {
     (*it)->debug();
+    if (it != --this->_resourceTypes.end())
+      PRINT(0)(" ------------------------------------\n ");
+  }
 
   PRINT(0)("==================================RM==\n");

branches/new_class_id/src/lib/util/loading/new_resource_manager.h

@@ -33 +33 @@
 
 
-  bool verifyDataDir(const std::string& fileInside);
+  bool checkFileInMainPath(const File& fileInside);
 
   bool unloadAllByPriority();

branches/new_class_id/src/lib/util/loading/resource.cc

@@ -50 +50 @@
 
   std::string locatedFile;
-  locatedFile = locateFileInSubDir(Directory("/home/bensch/svn/orxonox/data/"), fileName);
+  locatedFile = locateFileInSubDir(NewResourceManager::getInstance()->mainGlobalPath(), fileName);
   if (!locatedFile.empty())
   {
@@ -56 +56 @@
     return locatedFile;
   }
-  return std::string("/home/bensch/svn/orxonox/data/") + fileName;
+
+  return (NewResourceManager::getInstance()->mainGlobalPath() + File(fileName)).name();
 }
 

branches/new_class_id/src/orxonox.cc

@@ -366 +366 @@
   }
 
+  NewResourceManager::getInstance()->setMainGlobalPath(dataPath);
+  if (!NewResourceManager::getInstance()->checkFileInMainPath(File(DEFAULT_DATA_DIR_CHECKFILE)))
+    exit(-1);
+
+
   //! @todo this is a hack and should be loadable
   NewResourceManager::getInstance()->addResourceSubPath("Texture", "maps");