Changeset 5308 in orxonox.OLD for trunk/src/util/resource_manager.cc

Timestamp:

Oct 8, 2005, 12:32:52 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Fixed a reversive BUG in the ResourceManager:
Since resources, that depend on each other are loaded left tgo right they must be unlinked right to left… this cost me 3 hours.
What a luck i found this

File:

• trunk/src/util/resource_manager.cc (modified) (8 diffs)

trunk/src/util/resource_manager.cc

@@ -251 +251 @@
     {
       PRINTF(4)("not loading cached resource %s\n", tmpResource->name);
-//      printf("adding %s count: %d\n", tmpResource->pointer->getName(),  tmpResource->count);
       tmpResource->count++;
       if(tmpResource->prio < prio)
@@ -409 +408 @@
     }
   else
-    unload(tmpResource, prio);
+    return unload(tmpResource, prio);
 }
 
@@ -416 +415 @@
  * @param resource: The resource to unloade
  * @param prio the PriorityLevel to unload this resource
+ * @returns true on success, false otherwise.
 */
 bool ResourceManager::unload(Resource* resource, ResourcePriority prio)
@@ -421 +421 @@
   if (resource == NULL)
     return false;
-//  printf("removing %s count: %d\n", resource->pointer->getName(),  resource->count);
   if (resource->count > 0)
     resource->count--;
@@ -427 +426 @@
   if (resource->prio <= prio)
     {
-      if (resource->count <= 0)
+      if (resource->count == 0)
         {
           // deleting the Resource
@@ -480 +479 @@
 
 /**
- *  unloads all alocated Memory of Resources with a pririty lower than prio
+ * unloads all alocated Memory of Resources with a pririty lower than prio
  * @param prio The priority to delete
 */
@@ -486 +485 @@
 {
   tIterator<Resource>* iterator = resourceList->getIterator();
-  Resource* enumRes = iterator->firstElement();
+  Resource* enumRes = iterator->lastElement();
   while (enumRes)
     {
@@ -496 +495 @@
                    enumRes->name, enumRes->count);
       //enumRes = resourceList->nextElement();
-      enumRes = iterator->nextElement();
+      enumRes = iterator->prevElement();
     }
   delete iterator;