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

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

Location:

trunk/src/util

Files:

• resource_manager.cc (modified) (8 diffs)
• resource_manager.h (modified) (4 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;

trunk/src/util/resource_manager.h

@@ -66 +66 @@
 {
   BaseObject*       pointer;           //!< Pointer to the Resource.
-  int               count;             //!< How many times this Resource has been loaded.
+  unsigned int      count;             //!< How many times this Resource has been loaded.
 
   char*             name;              //!< Name of the Resource.
@@ -85 +85 @@
 //! The ResourceManager is a class, that decides if a file/resource should be loaded
 /**
-   If a file/resource was already loaded the resourceManager will
-   return a void pointer to the desired resource.
-   Otherwise it will instruct the corresponding resource-loader to load,
-   and receive the pointer to it.
-
-   It does it by looking, if a desired file has already been loaded.
-*/
+ * If a file/resource was already loaded the resourceManager will
+ * return a pointer to the desired resource.
+ * Otherwise it will instruct the corresponding resource-loader to load,
+ * and receive the pointer to it.
+ *
+ * It does it by looking, if a desired file has already been loaded.
+ * There is also the possibility to check for some variables
+ */
 class ResourceManager : public BaseObject
 {
@@ -101 +102 @@
   bool setDataDir(const char* dataDir);
   /** @returns the Name of the data directory */
-  inline const char* getDataDir() const {return this->dataDir;}
+  inline const char* getDataDir() const { return this->dataDir; };
 
   bool checkDataDir(const char* fileInside);
@@ -135 +136 @@
   static ResourceManager*  singletonRef;       //!< singleton Reference
 
+  char*                    dataDir;            //!< The Data Directory, where all relevant Data is stored.
   tList<Resource>*         resourceList;       //!< The List of Resources, that has already been loaded.
-  char*                    dataDir;            //!< The Data Directory, where all relevant Data is stored.
   tList<char>*             imageDirs;          //!< A list of directories in which images are stored.