Changeset 9799 in orxonox.OLD for branches

Timestamp:

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

Author:

bensch

Message:

ResourceManager now cleans up too

Location:

branches/new_class_id/src/lib/util/loading

Files:

• new_resource_manager.cc (modified) (2 diffs)
• new_resource_manager.h (modified) (1 diff)
• resource.cc (modified) (5 diffs)
• resource.h (modified) (2 diffs)

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

@@ -68 +68 @@
 }
 
+void NewResourceManager::unregisterType(Resources::Type* type)
+{
+  std::vector<Resources::Type*>::iterator it = std::find (this->_resourceTypes.begin(), this->_resourceTypes.end(), type);
+  if (it != this->_resourceTypes.end())
+  {
+    this->_resourceTypes.erase(it);
+    PRINTF(5)("ResourceType '%s' with ID %d removed\n", type->storedClassName().c_str(), type->id());
+  }
+}
+
+
 void NewResourceManager::setMainGlobalPath(const Directory& directory)
 {
@@ -127 +138 @@
 }
 
-const std::string& NewResourceManager::getKeepLevelID(unsigned int keepLevelID) const
+const std::string& NewResourceManager::getKeepLevelName(unsigned int keepLevelID) const
 {
   assert(keepLevelID < this->_keepLevelNames.size());

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

@@ -25 +25 @@
   bool addResourceSubPath(const std::string& resourceName, const std::string& pathName);
   void registerType(Resources::Type* type);
+  void unregisterType(Resources::Type* type);
 
   unsigned int addKeepLevelName(const std::string& keepLevelName);
   unsigned int getKeepLevelID(const std::string& keepLevelName) const;
-  const std::string& getKeepLevelID(unsigned int keepLevelID) const;
+  const std::string& getKeepLevelName(unsigned int keepLevelID) const;
 
   const std::vector<Resources::Type*> resourceTypes() const { return _resourceTypes; };

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");
 
 }

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

@@ -23 +23 @@
 
     unsigned int keepLevel() const { return _keepLevel; };
+    const std::string& name() const;
   private:
     unsigned int                        _keepLevel;
@@ -43 +44 @@
   public:
     Type(const std::string& typeName);
+    ~Type();
     bool operator==(const std::string& resourceName) const { return this->_typeName == resourceName; };