Changeset 6222 in orxonox.OLD for trunk/src/util/loading

Timestamp:

Dec 21, 2005, 1:49:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/loading/resource_manager.cc (modified) (20 diffs)
• src/util/loading/resource_manager.h (modified) (2 diffs)

trunk/src/util/loading/resource_manager.cc

@@ -19 +19 @@
 
 #include "debug.h"
+
+#include <algorithm>
 
 // different resource Types
@@ -40 +42 @@
 #endif /* NO_SHADERS */
 
-#include "list.h"
-#include "sdlincl.h"
-
 // File Handling Includes
 #include <sys/types.h>
@@ -61 +60 @@
   strcpy(this->dataDir, "./");
   this->tryDataDir("./data");
-  this->imageDirs = new tList<char>;
-  this->resourceList = new tList<Resource>;
 }
 
@@ -76 +73 @@
   this->unloadAllByPriority(RP_GAME);
 
-  if (this->resourceList->getSize() > 0)
-    PRINTF(1)("Not removed all Resources, since there are still %d resources registered\n", this->resourceList->getSize());
-
-  delete this->resourceList;
+  if (!this->resourceList.empty())
+    PRINTF(1)("Not removed all Resources, since there are still %d resources registered\n", this->resourceList.size());
+
   // deleting the Directorie Lists
-  tIterator<char>* tmpIt = imageDirs->getIterator();
-  char* tmpDir = tmpIt->firstElement();
-  while(tmpDir)
-    {
-      delete[] tmpDir;
-      tmpDir = tmpIt->nextElement();
-    }
-  delete tmpIt;
-  delete this->imageDirs;
+  while (!this->imageDirs.empty())
+    {
+      delete[] this->imageDirs.front();
+      this->imageDirs.pop_front();
+    }
 
   delete[] this->dataDir;
@@ -211 +203 @@
     {
       // check if the Directory has been added before
-      tIterator<char>* tmpImageDirs = imageDirs->getIterator();
-      char* tmpDir = tmpImageDirs->firstElement();
-      while(tmpDir)
-        {
-          if (!strcmp(tmpDir, newDir))
-            {
-              PRINTF(3)("Path %s already loaded\n", newDir);
-              delete[] newDir;
-              delete tmpImageDirs;
-              return true;
-            }
-          tmpDir = tmpImageDirs->nextElement();
-        }
-      delete tmpImageDirs;
-
+      std::list<char*>::const_iterator imageDir;
+      for (imageDir = this->imageDirs.begin(); imageDir != this->imageDirs.end(); imageDir++)
+      {
+         if (!strcmp(*imageDir, newDir))
+         {
+           PRINTF(3)("Path %s already loaded\n", newDir);
+           delete[] newDir;
+           return true;
+         }
+      }
       // adding the directory to the List
-      this->imageDirs->add(newDir);
+      this->imageDirs.push_back(newDir);
       return true;
     }
@@ -389 +376 @@
               else
                 tmpResource->secFileName = NULL;
-              tmpResource->pointer = new MD2Data(fullName, tmpResource->secFileName);
+                tmpResource->pointer = new MD2Data(fullName, tmpResource->secFileName);
+//               tmpResource->pointer = new MD2Model(fullName, tmpResource->secFileName);
+
             }
               break;
@@ -425 +414 @@
           else
             {
-              char* tmpDir;
-              tIterator<char>* iterator = imageDirs->getIterator();
-              tmpDir = iterator->firstElement();
-              while(tmpDir)
+              std::list<char*>::iterator imageDir;
+              for (imageDir = this->imageDirs.begin(); imageDir != this->imageDirs.end(); imageDir++)
                 {
-                  char* imgName = new char[strlen(tmpDir)+strlen(fileName)+1];
-                  sprintf(imgName, "%s%s", tmpDir, fileName);
+                  char* imgName = new char[strlen(*imageDir)+strlen(fileName)+1];
+                  sprintf(imgName, "%s%s", *imageDir, fileName);
                   if(isFile(imgName))
                     {
@@ -440 +427 @@
                     }
                   delete[] imgName;
-                  tmpDir = iterator->nextElement();
                 }
-              delete iterator;
             }
           if(!tmpResource)
@@ -477 +462 @@
         }
       if (tmpResource->pointer != NULL)
-        this->resourceList->add(tmpResource);
+        this->resourceList.push_back(tmpResource);
       delete[] fullName;
     }
@@ -572 +557 @@
           PRINTF(4)("Resource %s safely removed.\n", resource->name);
           delete[] resource->name;
-          this->resourceList->remove(resource);
+          std::list<Resource*>::iterator resourceIT = std::find(this->resourceList.begin(), this->resourceList.end(), resource);
+          this->resourceList.erase(resourceIT);
           delete resource;
         }
@@ -590 +576 @@
 bool ResourceManager::unloadAllByPriority(ResourcePriority prio)
 {
-  tIterator<Resource>* iterator = resourceList->getIterator();
-  Resource* enumRes = iterator->lastElement();
-  while (enumRes)
-    {
-      if (enumRes->prio <= prio)
-        if (enumRes->count == 0)
-          unload(enumRes, prio);
-        else
-          PRINTF(2)("unable to unload %s because there are still %d references to it\n",
-                   enumRes->name, enumRes->count);
-      //enumRes = resourceList->nextElement();
-      enumRes = iterator->prevElement();
-    }
-  delete iterator;
+  std::list<Resource*>::iterator resource, pre;
+  pre = --this->resourceList.end();
+  unsigned int removeCount;
+  for (unsigned int round = 0; round < 3; round++)
+  {
+    removeCount = 0;
+    while (pre != resourceList.end())
+    {
+      resource = pre;
+      pre--;
+        if ((*resource)->prio <= prio)
+        {
+          if ((*resource)->count == 0)
+            unload((*resource), prio);
+          else
+          {
+            PRINTF(2)("unable to unload %s because there are still %d references to it\n",
+                     (*resource)->name, (*resource)->count);
+            removeCount++;
+          }
+        }
+     }
+     if (removeCount == 0) break;
+  }
 }
 
@@ -619 +615 @@
                                                 void* param1, void* param2, void* param3) const
 {
-  //  Resource* enumRes = resourceList->enumerate();
-  tIterator<Resource>* iterator = resourceList->getIterator();
-  Resource* enumRes = iterator->firstElement();
-  while (enumRes)
-    {
-      if (enumRes->type == type && !strcmp(fileName, enumRes->name))
+  std::list<Resource*>::const_iterator resource;
+  for (resource = this->resourceList.begin(); resource != this->resourceList.end(); resource++)
+  {
+    if ((*resource)->type == type && !strcmp(fileName, (*resource)->name))
         {
           bool match = false;
@@ -635 +629 @@
               if (!param1)
                 {
-                  if (enumRes->modelSize == 1.0)
+                  if ((*resource)->modelSize == 1.0)
                     match = true;
                 }
-              else if (enumRes->modelSize == *(float*)param1)
+              else if ((*resource)->modelSize == *(float*)param1)
                 match = true;
               break;
@@ -644 +638 @@
               if (!param1)
                 {
-                  if (enumRes->secFileName == NULL)
+                  if ((*resource)->secFileName == NULL)
                     match = true;
                 }
-              else if (!strcmp(enumRes->secFileName, (const char*)param1))
+              else if (!strcmp((*resource)->secFileName, (const char*)param1))
                 match = true;
               break;
@@ -655 +649 @@
               if (param1 == NULL)
                 {
-                  if (enumRes->ttfSize == FONT_DEFAULT_RENDER_SIZE)
+                  if ((*resource)->ttfSize == FONT_DEFAULT_RENDER_SIZE)
                     match = true;
                 }
-              else if (enumRes->ttfSize == *(unsigned int*)param1)
+              else if ((*resource)->ttfSize == *(unsigned int*)param1)
                 match = true;
               break;
@@ -666 +660 @@
                 if (!param1)
                 {
-                  if (enumRes->secFileName == NULL)
+                  if ((*resource)->secFileName == NULL)
                     match = true;
                 }
-                else if (!strcmp(enumRes->secFileName, (const char*)param1))
+                else if (!strcmp((*resource)->secFileName, (const char*)param1))
                   match = true;
 #endif /* NO_SHADERS */
@@ -678 +672 @@
           if (match)
             {
-              delete iterator;
-              return enumRes;
+              return (*resource);
             }
         }
-      enumRes = iterator->nextElement();
-    }
-  delete iterator;
+    }
   return NULL;
 }
@@ -696 +687 @@
 {
   //  Resource* enumRes = resourceList->enumerate();
-  tIterator<Resource>* iterator = resourceList->getIterator();
-  Resource* enumRes = iterator->firstElement();
-  while (enumRes)
-    {
-      if (pointer == enumRes->pointer)
-        {
-          delete iterator;
-          return enumRes;
-        }
-      enumRes = iterator->nextElement();
-    }
-  delete iterator;
+  std::list<Resource*>::const_iterator resource;
+  for (resource = this->resourceList.begin(); resource != this->resourceList.end(); resource++)
+    if (pointer == (*resource)->pointer)
+        return (*resource);
   return NULL;
 }
@@ -920 +903 @@
   PRINT(0)(" Data-Directory is: %s\n", this->dataDir);
   PRINT(0)(" List of Image-Directories: ");
-  tIterator<char>* tmpIt = imageDirs->getIterator();
-  char* tmpDir = tmpIt->firstElement();
-  while(tmpDir)
-    {
-      PRINT(0)("%s ",tmpDir);
-      tmpDir = tmpIt->nextElement();
-    }
-  delete tmpIt;
+  std::list<char*>::const_iterator imageDir;
+  for (imageDir = this->imageDirs.begin(); imageDir != this->imageDirs.end(); imageDir++)
+      PRINT(0)("%s ", (*imageDir));
   PRINT(0)("\n");
 
   PRINT(0)("List of all stored Resources:\n");
-  tIterator<Resource>* iterator = resourceList->getIterator();
-  Resource* enumRes = iterator->firstElement();
-  while (enumRes)
+  std::list<Resource*>::const_iterator resource;
+  for (resource = this->resourceList.begin(); resource != this->resourceList.end(); resource++)
+
     {
       PRINT(0)("-----------------------------------------\n");
-      PRINT(0)("Name: %s; References: %d; Type: %s ", enumRes->name, enumRes->count, ResourceManager::ResourceTypeToChar(enumRes->type));
+      PRINT(0)("Name: %s; References: %d; Type: %s ", (*resource)->name, (*resource)->count, ResourceManager::ResourceTypeToChar((*resource)->type));
 
       PRINT(0)("gets deleted at ");
-      switch(enumRes->prio)
+      switch((*resource)->prio)
         {
         default:
@@ -955 +933 @@
           break;
         }
-      enumRes = iterator->nextElement();
-    }
-  delete iterator;
+    }
 
 

trunk/src/util/loading/resource_manager.h

@@ -21 +21 @@
 #include "base_object.h"
 
-#include "stdlibincl.h"
 
-// FORWARD DECLARATION
-template<class T> class tList;
+#include <list>
 
 //! An eumerator for different fileTypes the resourceManager supports
@@ -144 +142 @@
 
   char*                    dataDir;            //!< The Data Directory, where all relevant Data is stored.
-  tList<Resource>*         resourceList;       //!< The List of Resources, that has already been loaded.
-  tList<char>*             imageDirs;          //!< A list of directories in which images are stored.
+  std::list<Resource*>     resourceList;       //!< The List of Resources, that has already been loaded.
+  std::list<char*>         imageDirs;          //!< A list of directories in which images are stored.
 
 };