Changeset 9845 in orxonox.OLD

Timestamp:

Sep 27, 2006, 11:13:17 PM (18 years ago)

Author:

bensch

Message:

some more functionality for the unloading of resources

Location:

branches/new_class_id/src

Files:

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

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

@@ -137 +137 @@
   //////////////
   Type::Type(const std::string& typeName)
-      : _id(-1), _typeName(typeName)
+      : _typeName(typeName)
   {
     ResourceManager::getInstance()->registerType(this);
@@ -151 +151 @@
   {
     this->_storedResources.push_back(resource);
-
   }
 
@@ -175 +174 @@
   }
 
-
-  void Type::setID(int id)
-  {
-    this->_id = id;
+  void Type::unloadAllBelowKeepLevel(const Resources::KeepLevel& keepLevel)
+  {
+    std::vector<Resources::StorePointer*>::iterator it;
+    for (it = this->_storedResources.begin(); it != this->_storedResources.end(); ++it)
+      if((*it)->keepLevel() < keepLevel)
+    {
+      delete (*it);
+      this->_storedResources.erase(it);
+      it = this->_storedResources.begin();
+    }
   }
 
@@ -184 +189 @@
   void Type::debug() const
   {
-    PRINT(0)(" ResourceType '%s' with ID %d stores %d Resources\n", this->_typeName.c_str(), this->_id, this->_storedResources.size());
+    PRINT(0)(" ResourceType '%s' stores %d Resources\n", this->_typeName.c_str(), this->_storedResources.size());
     PRINT(0)("  Paths:\n");
     for (unsigned int i = 0; i < this->_resourcePaths.size(); ++i)

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

@@ -29 +29 @@
     KeepLevel(const std::string& keepLevelName);
 
+    bool operator==(const KeepLevel& keepLevel) const { return this->_keepLevel == keepLevel._keepLevel; };
+    bool operator!=(const KeepLevel& keepLevel) const { return this->_keepLevel != keepLevel._keepLevel; };
+    bool operator<=(const KeepLevel& keepLevel) const { return this->_keepLevel <= keepLevel._keepLevel; };
+    bool operator<(const KeepLevel& keepLevel) const { return this->_keepLevel < keepLevel._keepLevel; };
+
     /** @returns the KeepLevel */
     unsigned int keepLevel() const { return _keepLevel; };
@@ -41 +46 @@
   public:
     StorePointer(const std::string& loadString, const Resources::KeepLevel& keeplevel);
+    //! Virtual Destructor, that removes the Stored information-pointer.
+    virtual ~StorePointer() {};
+
     /** @returns the LoadString this resource was loaded with */
     const std::string& loadString() const { return _loadString; };
@@ -73 +81 @@
     const std::string& storedClassName() const { return _typeName; };
     /** @returns the ID of the Type != ClassID */
-    int id() const { return _id; };
     /** @returns the type-specific paths this Resource searches in. */
     const std::vector<Directory>& resourcePaths() const { return _resourcePaths; };
@@ -83 +90 @@
     virtual void createFromString(const std::string& loadString) = 0;
 
-    void setID(int id);
+    void unloadAllBelowKeepLevel(const Resources::KeepLevel& keepLevel);
+
     void addResource(Resources::StorePointer* resource);
 
@@ -94 +102 @@
     Type(const Type& type) {};
   private:
-    int                                   _id;                //!< ID of the Type in over all of the Types.
     const std::string                     _typeName;          //!< Name of the Type. (Name of the Resource this loads.)
     std::vector<Directory>                _resourcePaths;     //!< The Paths to search for files in this type

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

@@ -60 +60 @@
   void ResourceManager::registerType(Resources::Type* type)
   {
-    if(type->id() == -1)
-    {
-      type->setID(this->_resourceTypes.size());
-      this->_resourceTypes.push_back(type);
-      PRINTF(5)("ResourceType '%s' with ID %d added\n", type->storedClassName().c_str(), type->id());
-    }
+    this->_resourceTypes.push_back(type);
+    PRINTF(5)("ResourceType '%s' added\n", type->storedClassName().c_str());
   }
 
@@ -74 +70 @@
     {
       this->_resourceTypes.erase(it);
-      PRINTF(5)("ResourceType '%s' with ID %d removed\n", type->storedClassName().c_str(), type->id());
+      PRINTF(5)("ResourceType '%s' removed\n", type->storedClassName().c_str());
     }
   }
@@ -149 +145 @@
 
 
+  void ResourceManager::unloadAllBelowKeepLevel(const Resources::KeepLevel& keepLevel)
+  {
+    std::vector<Resources::Type*>::const_iterator it;
+    for (it = this->_resourceTypes.begin(); it != this->_resourceTypes.end(); ++it)
+    {
+      (*it)->unloadAllBelowKeepLevel(keepLevel);
+    }
+  }
+
+
   /**
    * @brief outputs debug information about the ResourceManager

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

@@ -46 +46 @@
     std::string prependAbsoluteMainPath(const std::string& fileName);
 
-    bool unloadAllByKeepLevel(const Resources::KeepLevel& keepLevel);
+    void unloadAllBelowKeepLevel(const Resources::KeepLevel& keepLevel);
 
     void debug() const;

branches/new_class_id/src/orxonox.cc

@@ -370 +370 @@
   Resources::ResourceManager::getInstance()->addResourceSubPath("SoundBuffer", "music");
 
+  Resources::ResourceManager::getInstance()->addResourceSubPath("Shader", "shaders");
+  Resources::ResourceManager::getInstance()->addResourceSubPath("OBJ", "models");
+
   Resources::ResourceManager::getInstance()->addKeepLevelName("Imediately");
   Resources::ResourceManager::getInstance()->addKeepLevelName("LevelEnd");
@@ -375 +378 @@
   Resources::ResourceManager::getInstance()->addKeepLevelName("GameEnd");
 
-
-  Resources::ResourceManager::getInstance()->debug();
   //  DynamicLoader::loadDyLib("libtest.so");
   return 0;