Changeset 3672 in orxonox.OLD for orxonox/trunk/src/lib/util/resource_manager.h

Timestamp:

Mar 30, 2005, 3:02:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ResourceManager not totally static anymore, list-iterators, and so on

File:

• orxonox/trunk/src/lib/util/resource_manager.h (modified) (2 diffs)

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

@@ -56 +56 @@
   virtual ~ResourceManager();
 
-  static bool setDataDir(char* dataDir);
-  static bool addImageDir(char* imageDir);
-  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);
+  bool setDataDir(char* dataDir);
+  bool addImageDir(char* imageDir);
+  void* load(const char* fileName, ResourcePriority prio = RP_NO);
+  void* load(const char* fileName, ResourceType type, ResourcePriority prio = RP_NO);
+  bool unload(void* pointer, ResourcePriority prio = RP_NO);
+  bool unload(Resource* resource, ResourcePriority = RP_NO);
+  bool unloadAllByPriority(ResourcePriority prio);
 
  private:
@@ -68 +68 @@
   static ResourceManager* singletonRef;
 
-  static tList<Resource>* resourceList;
-  static char* dataDir;
-  static tList<char>* imageDirs;
+  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.
 
-  static Resource* locateResourceByName(const char* fileName);
-  static Resource* locateResourceByPointer(const void* pointer);
+
+  Resource* locateResourceByName(const char* fileName);
+  Resource* locateResourceByPointer(const void* pointer);
   
-  static bool isDir(const char* directory);
-  static bool isFile(const char* directory);  
+  bool isDir(const char* directory);
+  bool isFile(const char* directory);  
 };