Changeset 9854 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/resource_manager.cc

Timestamp:

Sep 28, 2006, 10:17:56 AM (18 years ago)

Author:

bensch

Message:

more nice comments, and also updated the KeepLevel loading (if you want to load a Resource to a KeepLevel just append it at loadtime:
eg.:
Texture tex = ResourceTexture(orxonox.png, GL_TEXTURE_2D, GameEnd);
where GameEnd is the KeepLevel as defined in orxonox.cc→initResources()

File:

• branches/new_class_id/src/lib/util/loading/resource_manager.cc (modified) (4 diffs)

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

@@ -35 +35 @@
   */
   ResourceManager::ResourceManager ()
+  : _defaultKeepLevel(0)
   {
     this->registerObject(this, ResourceManager::_objectList);
@@ -47 +48 @@
   ResourceManager::~ResourceManager ()
   {
-    // deleting the Resources-List
-    //this->unloadAllByPriority(RP_GAME);
-
-    //   if (!this->resourceList.empty())
-    //     PRINTF(1)("Not removed all Resources, since there are still %d resources registered\n", this->resourceList.size());
-
     ResourceManager::_singletonRef = NULL;
   }
@@ -195 +190 @@
    * @param loadString the loadString to load in the Type.
    */
-  void ResourceManager::loadFromLoadString(const std::string& resourceTypeName, const std::string& loadString)
+  void ResourceManager::loadFromLoadString(const std::string& resourceTypeName, const std::string& loadString, const KeepLevel& keepLevel)
   {
     std::vector<Resources::Type*>::const_iterator it;
@@ -202 +197 @@
       if (*(*it) == resourceTypeName)
       {
-        (*it)->createFromString(loadString);
+        (*it)->createFromString(loadString, keepLevel);
         /// TODO check if the resource was allocated!!
         return ;