Changeset 9851 in orxonox.OLD

Timestamp:

Sep 28, 2006, 12:48:03 AM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: Resources now get Loaded and Unloaded correctly by will alone

Location:

branches/new_class_id/src/lib

Files:

• shell/some_shell_commands.cc (modified) (1 diff)
• util/loading/resource.cc (modified) (2 diffs)
• util/loading/resource.h (modified) (1 diff)
• util/loading/resource_manager.h (modified) (1 diff)

branches/new_class_id/src/lib/shell/some_shell_commands.cc

@@ -56 +56 @@
   SHELL_COMMAND(debug, ResourceManager, debug);
   SHELL_COMMAND(load, ResourceManager, loadFromLoadString);
+  SHELL_COMMAND(unload, ResourceManager, unloadAllBelowKeepLevelINT);
 }
 

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

@@ -165 +165 @@
   StorePointer::StorePointer(const std::string& loadString, const KeepLevel& keeplevel)
       : _loadString(loadString), _keepLevel(keeplevel)
-  {}
-
+  {
+    PRINTF(4)("Acquired a Resource with LoadString '%s' and KeepLevel '%s'\n", _loadString.c_str(), _keepLevel.name().c_str());
+  }
+
+  StorePointer::~StorePointer()
+  {
+    PRINTF(4)("Deleting Stored Resource '%s' from KeepLevel '%s'\n", _loadString.c_str(), _keepLevel.name().c_str());
+  };
 
 
@@ -234 +240 @@
   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 && (*it)->last())
-      {
-        delete (*it);
-        this->_storedResources.erase(it);
-        it = this->_storedResources.begin();
-      }
+    std::vector<Resources::StorePointer*>::iterator it, it2;
+    bool finished = false;
+
+    while (!finished)
+    {
+      finished = true;
+      for (it = this->_storedResources.begin(); it != this->_storedResources.end();++it)
+        if((*it)->keepLevel() < keepLevel && (*it)->last())
+        {
+          delete (*it);
+          this->_storedResources.erase(it);
+          finished = false;
+          break;
+        }
+    }
   }
 

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

@@ -55 +55 @@
   public:
     //! Virtual Destructor, that removes the Stored information-pointer.
-    virtual ~StorePointer() {};
+    virtual ~StorePointer();
 
     /** @returns the LoadString this resource was loaded with */

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

@@ -47 +47 @@
 
     void unloadAllBelowKeepLevel(const Resources::KeepLevel& keepLevel);
+    void unloadAllBelowKeepLevelINT(unsigned int level) { unloadAllBelowKeepLevel(level); };
     void loadFromLoadString(const std::string& resourceTypeName, const std::string& loadString);