Changeset 9799 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/resource.cc

Timestamp:

Sep 24, 2006, 12:06:35 PM (18 years ago)

Author:

bensch

Message:

ResourceManager now cleans up too

File:

• branches/new_class_id/src/lib/util/loading/resource.cc (modified) (5 diffs)

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

@@ -44 +44 @@
 std::string NewResource::locateFile(const std::string& fileName) const
 {
-  if (File(fileName).exists())
-    return fileName;
-  else if ((NewResourceManager::getInstance()->mainGlobalPath() + File(fileName)).exists() )
+  if ((NewResourceManager::getInstance()->mainGlobalPath() + File(fileName)).exists() )
     return (NewResourceManager::getInstance()->mainGlobalPath() + File(fileName)).name();
 
@@ -56 +54 @@
     return locatedFile;
   }
+
+  if (File(fileName).exists())
+    return fileName;
 
   return (NewResourceManager::getInstance()->mainGlobalPath() + File(fileName)).name();
@@ -114 +115 @@
 }
 
+const std::string& Resources::KeepLevel::name() const
+{
+  return NewResourceManager::getInstance()->getKeepLevelName(this->_keepLevel);
+}
+
 
 
@@ -134 +140 @@
   NewResourceManager::getInstance()->registerType(this);
   PRINTF(4)("Created ResourceType '%s'\n", typeName.c_str());
+}
+
+Resources::Type::~Type()
+{
+  NewResourceManager::getInstance()->unregisterType(this);
 }
 
@@ -176 +187 @@
   for (unsigned int i = 0; i < this->_resourcePaths.size(); ++i)
     PRINT(0)("    %s\n", this->_resourcePaths[i].name().c_str());
-  PRINT(0)("  Sub-Paths:\n");
+  PRINT(0)("  Sub-Paths:");
   for (unsigned int i = 0; i < this->_resourceSubPaths.size(); ++i)
-    PRINT(0)("    %s\n", this->_resourceSubPaths[i].name().c_str());
+    PRINT(0)(" '%s'", this->_resourceSubPaths[i].name().c_str());
+  PRINT(0)("\n");
 
 }