Changeset 3660 in orxonox.OLD

Timestamp:

Mar 29, 2005, 11:50:51 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now ResourceManager has the ability to unload resources by priority

Location:

orxonox/trunk/src

Files:

• lib/graphics/importer/texture.cc (modified) (7 diffs)
• lib/graphics/importer/texture.h (modified) (1 diff)
• lib/util/resource_manager.cc (modified) (9 diffs)
• lib/util/resource_manager.h (modified) (4 diffs)
• orxonox.cc (modified) (3 diffs)
• orxonox.h (modified) (2 diffs)
• story_entities/world.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)

orxonox/trunk/src/lib/graphics/importer/texture.cc

@@ -23 +23 @@
 
 #include "graphics_engine.h"
-
-// headers only for PathList
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <fstream>
-
-/**
-   \brief creates a ned PathList.
-   
-   It is a good idea to use this as an initial List,
-   because if you give on a name the Path will not be checked for its existence.
-*/
-PathList::PathList()
-{
-  this->pathName = NULL;
-  this->next = NULL;
-}
-
-/**
-   \brief Creates a new PathList with a Name.
-   \param pName the Name of The Path.
-
-   This function just adds the Path without checking if it exists.
-*/
-PathList::PathList(char* pName)
-{
-  this->pathName = new char [strlen(pName)+1];
-  strcpy (this->pathName, pName);
-  this->next = NULL;
-}
-
-/**
-   \brief destroys a PathList
-
-   It does this by deleting the Name and then delete its preceding PathList.
-*/
-PathList::~PathList()
-{
-  if (this->pathName)
-    delete []this->pathName;
-  if (this->next)
-    delete this->next;
-}
-
-PathList* PathList::firstPath = NULL;
-
-/**
-   \returns A Pointer to the first Path of the Pathlist
-*/
-PathList* PathList::getInstance(void)
-{
-  if (firstPath)
-    return firstPath;
-  firstPath = new PathList();
-}
-/**
-   \brief Adds a new Pathlist Element.
-   \param pName
-   
-   Adding a Path automatically checks if the Path exists,
-   and if it does not it will not add it to the List.
-*/
-void PathList::addPath (char* pName)
-{
-  if (pName[0] == '\0')
-    {
-      PRINTF(2)("not Adding empty Path to the List.\n");
-      return;
-    }
-  char* tmpPName = new char[strlen(pName)];
-  strncpy(tmpPName, pName, strlen(pName)-1);
-  tmpPName[strlen(pName)-1] = '\0';
-  if (access (tmpPName, F_OK) == 0)
-    {
-      struct stat status;
-      stat(tmpPName, &status);
-      if (status.st_mode & S_IFDIR)
-        {
-          PRINTF(4)("Adding Path %s to the PathList.\n", pName);
-          PathList* tmpPathList = this;
-          while (tmpPathList->next)
-            tmpPathList = tmpPathList->next;
-          tmpPathList->next = new PathList(pName);
-        }
-      else
-        PRINTF(2)("You tried to add non-folder %s to a PathList.\n", tmpPName);
-    }
-  else
-      PRINTF(2)("You tried to add non-existing folder %s to a PathList.\n", tmpPName);
-  delete []tmpPName;
-}
-
-
 
 /**
@@ -154 +59 @@
   if (this->texture)
     glDeleteTextures(1, &this->texture);
-}
-
-/**
-   \brief Searches for a Texture inside one of the defined Paths
-   \param texName The name of the texture o search for.
-   \returns pathName+texName if texName was found in the pathList. NULL if the Texture is not found.
-*/
-char* Texture::searchTextureInPaths(const char* texName) const
-{
-  char* tmpName = NULL;
-  PathList* pList = PathList::getInstance();
-  while (pList)
-    {
-      if (pList->pathName)
-        {
-          tmpName = new char [strlen(pList->pathName)+strlen(texName)+1];
-          strcpy(tmpName, pList->pathName);
-        }
-      else
-        {
-          tmpName = new char [strlen(texName)+1];
-          tmpName[0]='\0';
-        }
-      strcat(tmpName, texName);
-      if (access (tmpName, F_OK) == 0)
-        return tmpName;
-      
-      if (tmpName)
-        delete []tmpName;
-      tmpName = NULL;
-      pList = pList->next;
-    }
-  return NULL;
 }
 
@@ -231 +103 @@
   if (GraphicsEngine::texturesEnabled)
     {
-      char* imgNameWithPath = searchTextureInPaths(imageName);
-      if (imgNameWithPath)
-        {
-          this->map=IMG_Load(imgNameWithPath);
+      if (imageName)
+        {
+          this->map=IMG_Load(imageName);
           if(!map)
             {
@@ -249 +120 @@
             pImage->format = GL_RGBA;
           
-          if( !IMG_isPNG(SDL_RWFromFile(imgNameWithPath, "rb")) && !IMG_isJPG(SDL_RWFromFile(imgNameWithPath, "rb")))
+          if( !IMG_isPNG(SDL_RWFromFile(imageName, "rb")) && !IMG_isJPG(SDL_RWFromFile(imageName, "rb")))
             for (int i=0;i<map->h * map->w *3;i+=3)
               { 
@@ -268 +139 @@
       else
         {
-          PRINTF(2)("Image not Found: %s\n", imgNameWithPath);
+          PRINTF(2)("Image not Found: %s\n", imageName);
           return false;
         }
@@ -285 +156 @@
   if (GraphicsEngine::texturesEnabled)
     {
-      char* imgNameWithPath = searchTextureInPaths(imageName);
-      if (imgNameWithPath)
-        {
-          if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".bmp", 4))
+      if (imageName)
+        {
+          if (!strncmp(imageName+strlen(imageName)-4, ".bmp", 4))
             {
               PRINTF(4)("Requested bmp-image. Trying to Import.\n");
-              return this->loadBMP(imgNameWithPath);
+              return this->loadBMP(imageName);
             }
           
-          else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".jpg", 4) || !strncmp(imgNameWithPath+strlen(imgNameWithPath)-5, ".jpg", 5))
+          else if (!strncmp(imageName+strlen(imageName)-4, ".jpg", 4) || !strncmp(imageName+strlen(imageName)-5, ".jpg", 5))
             {
               PRINTF(4)("Requested jpeg-image. Trying to Import\n");
-              return this->loadJPG(imgNameWithPath);
-            }
-          else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".tga", 4))
+              return this->loadJPG(imageName);
+            }
+          else if (!strncmp(imageName+strlen(imageName)-4, ".tga", 4))
             {
               PRINTF(4)("Requested tga-image. Trying to Import\n");
-              return this->loadTGA(imgNameWithPath);
-            }
-          else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".png", 4))
+              return this->loadTGA(imageName);
+            }
+          else if (!strncmp(imageName+strlen(imageName)-4, ".png", 4))
             {
               PRINTF(4)("Requested png-image. Trying to Import\n");
-              return this->loadPNG(imgNameWithPath);
+              return this->loadPNG(imageName);
             }
           else
             {
-              PRINTF(2)("Requested Image was not recognized in its type. (Maybe a type-Cast-error.)\n FileName: %s", imgNameWithPath);
+              PRINTF(2)("Requested Image was not recognized in its type. (Maybe a type-Cast-error.)\n FileName: %s", imageName);
               return false;
             }
@@ -317 +187 @@
       else
         {
-          PRINTF(2)("Image not Found: %s\n", imgNameWithPath);
+          PRINTF(2)("Image not Found: %s\n", imageName);
           return false;
         }

orxonox/trunk/src/lib/graphics/importer/texture.h

@@ -27 +27 @@
 #endif /* HAVE_PNG_H */
 #endif /* HAVE_SDL_SDL_IMAGE_H */
-
-
-
-//! Class to handle lists of paths.
-/**
-   \todo Ability to return Paths by itself.
-
-   It is simple to use, and good, for all PathList you want.
-   just create a new Pathlist, and add Paths.
-*/
-class PathList
-{
- private:
-  PathList();
-  static PathList* firstPath; //!< A static Pointer to the first PathList in the List.
- public:
-  PathList(char* pName);
-  ~PathList();
-  static PathList* getInstance(void);
-  
-  void addPath (char* pName);
-  char* pathName;              //!< The Name of the current Path.
-  PathList* next;              //!< Pointer to the next Pathlist.
-};
 
 //! A Class, that reads in Textures from different fileformats.

orxonox/trunk/src/lib/util/resource_manager.cc

@@ -43 +43 @@
 }
 
+/**
+   \returns the Instance to this ResourceManager
+*/
 ResourceManager* ResourceManager::getInstance(void)
 {
@@ -60 +63 @@
 
 /**
-   \brief standard deconstructor
+   \brief standard destructor
 */
 ResourceManager::~ResourceManager (void) 
 {
-
+  // deleting the Resources-List
+  unloadAllByPriority(RP_GAME);
   delete resourceList;
   resourceList = NULL;
+  // deleting the Directorie Lists
+  char* tmpDir = imageDirs->enumerate();
+  while(tmpDir)
+    {
+      delete []tmpDir;
+      tmpDir = imageDirs->nextElement();
+    }
+
+  delete imageDirs;
+  imageDirs = NULL;
   ResourceManager::singletonRef = NULL;
 }
@@ -87 +101 @@
 }
 
+/**
+   \brief adds a new Path for Images
+   \param imageDir The path to insert
+   \returns true, if the Path was well and injected (or already existent within the list)
+   false otherwise
+*/
 bool ResourceManager::addImageDir(char* imageDir)
 {
+  // check if the param is a Directory
   if (isDir(imageDir))
     {
-      char* tmpDir  = new char[strlen(imageDir)+1];
+      // check if the Directory has been added before
+      char* tmpDir = imageDirs->enumerate();
+      while(tmpDir)
+        {
+          if (!strcmp(tmpDir, imageDir))
+            {
+              PRINTF(4)("Path %s already loaded\n", imageDir);
+              return true;
+            }
+          tmpDir = imageDirs->nextElement();
+        }
+      // adding the directory to the List
+      tmpDir  = new char[strlen(imageDir)+1];
       strcpy(tmpDir, imageDir);
       imageDirs->add(tmpDir);
+      return true;
     }
   else
     {
       PRINTF(1)("%s is not a Directory, and can not be added to the Paths of Images\n", dataDir);
+      return false;
     }
 }
@@ -104 +139 @@
    \brief loads resources
    \param fileName The fileName of the resource to load
+   \param prio The ResourcePriority of this resource (will only be increased)
    \returns a pointer to a desired Resource.
 */
-void* ResourceManager::load(const char* fileName)
+void* ResourceManager::load(const char* fileName, ResourcePriority prio)
 {
   ResourceType tmpType;
@@ -126 +162 @@
     tmpType = IMAGE;
 
-  return ResourceManager::load(fileName, tmpType);
+  return ResourceManager::load(fileName, tmpType, prio);
 }
 
@@ -133 +169 @@
    \param fileName The fileName of the resource to load
    \param type The Type of Resource to load (\see ResourceType)
+   \param prio The ResourcePriority of this resource (will only be increased)
    \returns a pointer to a desired Resource.
 */
-void* ResourceManager::load(const char* fileName, ResourceType type)
+void* ResourceManager::load(const char* fileName, ResourceType type, ResourcePriority prio)
 {
   // searching if the resource was loaded before.
   Resource* tmpResource = ResourceManager::locateResourceByName(fileName);
-  char* tmpDir;
   if (!tmpResource) // if the resource was not loaded before.
     {
+      char* tmpDir;
       // Setting up the new Resource
       tmpResource = new Resource;
       tmpResource->count = 1;
       tmpResource->type = type;
+      tmpResource->prio = prio;
       tmpResource->name = new char[strlen(fileName)+1];
       strcpy(tmpResource->name, fileName);
@@ -212 +250 @@
       resourceList->add(tmpResource);
       delete []fullName;
-
     }
   else
     {
       tmpResource->count++;
+      if(tmpResource->prio < prio)
+        tmpResource->prio = prio;
     }
 
@@ -228 +267 @@
    
 */
-bool ResourceManager::unload(void* pointer)
+bool ResourceManager::unload(void* pointer, ResourcePriority prio)
 {
   // if pointer is existent. and only one resource of this type exists.
-  Resource* tmpResource = ResourceManager::locateResourceByPointer(pointer);
+  Resource* tmpResource =ResourceManager::locateResourceByPointer(pointer);
   if (!tmpResource)
     {
@@ -237 +276 @@
       return false;
     }
-  tmpResource->count--;
-  if (tmpResource->count <= 0)
-    {
-      // deleting the Resource
-      switch(tmpResource->type)
+  else
+    unload(tmpResource, prio);
+}
+
+bool ResourceManager::unload(Resource* resource, ResourcePriority prio)
+{
+  resource->count--;
+  if (resource->prio <= prio)
+    {
+      if (resource->count <= 0)
         {
-        case OBJ:
-        case PRIM:
-          delete (Model*)tmpResource->pointer;
-          break;
-        case IMAGE:
-          delete (Texture*)tmpResource->pointer;
-          break;
-        default:
-          PRINTF(1)("NOT YET IMPLEMENTED FIX FIX\n");
-          return false;
-          break;
+          // deleting the Resource
+          switch(resource->type)
+            {
+            case OBJ:
+            case PRIM:
+              delete (Model*)resource->pointer;
+              break;
+            case IMAGE:
+              delete (Texture*)resource->pointer;
+              break;
+            default:
+              PRINTF(1)("NOT YET IMPLEMENTED !!FIX FIX!!\n");
+              return false;
+              break;
+            }
+          // deleting the List Entry:
+          PRINTF(4)("Resource %s safely removed.\n", resource->name);
+          delete []resource->name;
+          resourceList->remove(resource);
         }
-      // deleting the List Entry:
-      PRINTF(4)("Resource %s Safely removed.\n", tmpResource->name);
-      delete []tmpResource->name;
-      resourceList->remove(tmpResource);
-    }
-  else
-    PRINTF(4)("Resource not removed, because there are still %d References to it.\n", tmpResource->count);
+      else
+        PRINTF(4)("Resource %s not removed, because there are still %d References to it.\n", resource->name, resource->count);
+    }
+  else
+    PRINTF(4)("not deleting resource %s because DeleteLevel to high\n", resource->name);
   return true;
+}
+
+
+/**
+   \brief unloads all alocated Memory of Resources with a pririty lower than prio
+   \param prio The priority to delete
+*/
+bool ResourceManager::unloadAllByPriority(ResourcePriority prio)
+{
+  Resource* enumRes = resourceList->enumerate();
+  while (enumRes)
+    {
+      if (enumRes->prio <= prio)
+        unload(enumRes, prio);
+      enumRes = resourceList->nextElement();
+    }
 }
 

orxonox/trunk/src/lib/util/resource_manager.h

@@ -17 +17 @@
 //template<class T> class tList;
 #include "list.h"                //! \todo do this by forward definition (ask Patrick)
+
+//! An eumerator for different fileTypes the resourceManager supports \todo WAV, MP3, OGG support
 enum ResourceType {OBJ, PRIM, WAV, MP3, OGG, IMAGE};
+//! An enumerator for different UNLOAD-types. 
+/**
+   RP_NO: will be unloaded on request
+   RP_LEVEL: will be unloaded at the end of a Level
+   RP_CAMPAIGN: will be unloaded at the end of a Campaign
+   RP_GAME: will be unloaded at the end of the whole Game (when closing orxonox)
+*/
+enum ResourcePriority {RP_NO = 0, RP_LEVEL = 1, RP_CAMPAIGN = 2, RP_GAME = 3};
 
+//! A Struct that keeps track about A resource its name its Type, and so on
 struct Resource
 {
@@ -25 +36 @@
   char* name;                //!< Name of the Resource.
   ResourceType type;         //!< ResourceType of this Resource.
+  ResourcePriority prio;     //!< The Priority of this resource. (This will only be increased)
   int count;                 //!< How many times this Resource has been loaded.
 };
@@ -46 +58 @@
   static bool setDataDir(char* dataDir);
   static bool addImageDir(char* imageDir);
-  static void* load(const char* fileName);
-  static void* load(const char* fileName, ResourceType type);
-  static bool unload(void* pointer);
+  static void* load(const char* fileName, ResourcePriority prio = RP_NO);
+  static void* load(const char* fileName, ResourceType type, ResourcePriority prio = RP_NO);
+  static bool unload(void* pointer, ResourcePriority prio = RP_NO);
+  static bool unload(Resource* resource, ResourcePriority = RP_NO);
+  static bool unloadAllByPriority(ResourcePriority prio);
 
  private:
@@ -61 +75 @@
   static Resource* locateResourceByPointer(const void* pointer);
   
-
   static bool isDir(const char* directory);
   static bool isFile(const char* directory);  

orxonox/trunk/src/orxonox.cc

@@ -22 +22 @@
    main-programmer: Patrick Boenzli
    co-programmer: Christian Meyer
+   co-programmer: Benjamin Grauer: injected ResourceManager/GraphicsEngine
 */
 
@@ -56 +57 @@
   if( resources != NULL) delete resources;
   delete GraphicsEngine::getInstance(); // deleting the Graphics
+  delete ResourceManager::getInstance(); // deletes the Resource Manager
 }
 
@@ -329 +331 @@
   orx->start();
   
-  //delete orx;
+  //  delete orx;
   
 }

orxonox/trunk/src/orxonox.h

@@ -26 +26 @@
   static Orxonox* singletonRef;
   Orxonox ();
-  virtual ~Orxonox ();
 
   char configfilename[256];   //!< Filename of the configuration-file.
@@ -59 +58 @@
  public:
   static Orxonox* getInstance ();
+  virtual ~Orxonox ();
+
   void start();
   void quitGame();

orxonox/trunk/src/story_entities/world.cc

@@ -145 +145 @@
   cn->unbind(this->localPlayer);
   cn->reset();
+
+  ResourceManager::unloadAllByPriority(RP_LEVEL);
 
   delete WorldInterface::getInstance();

orxonox/trunk/src/world_entities/player.cc

@@ -45 +45 @@
      the player.cc for debug also
   */
-  this->model = (Model*)ResourceManager::load("models/reaplow.obj", OBJ);
+  this->model = (Model*)ResourceManager::load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
   travelSpeed = 15.0;
   velocity = new Vector();