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

Timestamp:

Oct 7, 2005, 3:28:25 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: so, ResourceManager now operates on BaseObjects. If this is better, i do not know, but at least it is more intuitive, i think

Location:

trunk/src/util

Files:

• resource_manager.cc (modified) (3 diffs)
• resource_manager.h (modified) (2 diffs)

trunk/src/util/resource_manager.cc

@@ -73 +73 @@
 
   if (this->resourceList->getSize() > 0)
-    PRINTF(1)("Not removed all Textures, since there are still %d resources registered\n", this->resourceList->getSize());
+    PRINTF(1)("Not removed all Resources, since there are still %d resources registered\n", this->resourceList->getSize());
 
   delete this->resourceList;
@@ -185 +185 @@
  * @returns a pointer to a desired Resource.
 */
-void* ResourceManager::load(const char* fileName, ResourcePriority prio, void* param1, void* param2, void* param3)
+BaseObject* ResourceManager::load(const char* fileName, ResourcePriority prio, void* param1, void* param2, void* param3)
 {
   ResourceType tmpType;
@@ -243 +243 @@
  * @returns a pointer to a desired Resource.
 */
-void* ResourceManager::load(const char* fileName, ResourceType type, ResourcePriority prio,
+BaseObject* ResourceManager::load(const char* fileName, ResourceType type, ResourcePriority prio,
                             void* param1, void* param2, void* param3)
 {

trunk/src/util/resource_manager.h

@@ -65 +65 @@
 struct Resource
 {
-  void*             pointer;           //!< Pointer to the Resource.
+  BaseObject*       pointer;           //!< Pointer to the Resource.
   int               count;             //!< How many times this Resource has been loaded.
 
@@ -105 +105 @@
   bool checkDataDir(const char* fileInside);
   bool addImageDir(const char* imageDir);
-  void* load(const char* fileName, ResourcePriority prio = RP_NO,
+  BaseObject* load(const char* fileName, ResourcePriority prio = RP_NO,
              void* param1 = NULL, void* param2 = NULL, void* param3 = NULL);
-  void* load(const char* fileName, ResourceType type, ResourcePriority prio = RP_NO,
+  BaseObject* load(const char* fileName, ResourceType type, ResourcePriority prio = RP_NO,
              void* param1 = NULL, void* param2 = NULL, void* param3 = NULL);
   bool unload(void* pointer, ResourcePriority prio = RP_NO);