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

Timestamp:

Dec 9, 2005, 10:43:31 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: much cleaner Model Loading unloading, model is now private to WorldEntity (not protected)

Location:

trunk/src/util/loading

Files:

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

trunk/src/util/loading/resource_manager.cc

@@ -606 +606 @@
 }
 
+
 /**
  * Searches for a Resource by some information
@@ -616 +617 @@
 */
 Resource* ResourceManager::locateResourceByInfo(const char* fileName, ResourceType type,
-                                                void* param1, void* param2, void* param3)
+                                                void* param1, void* param2, void* param3) const
 {
   //  Resource* enumRes = resourceList->enumerate();
@@ -692 +693 @@
  * @returns a Pointer to the Resource if found, NULL otherwise.
 */
-Resource* ResourceManager::locateResourceByPointer(const void* pointer)
+Resource* ResourceManager::locateResourceByPointer(const void* pointer) const
 {
   //  Resource* enumRes = resourceList->enumerate();

trunk/src/util/loading/resource_manager.h

@@ -119 +119 @@
   bool unloadAllByPriority(ResourcePriority prio);
 
+  Resource* locateResourceByInfo(const char* fileName, ResourceType type, void* param1, void* param2, void* param3) const;
+  Resource* locateResourceByPointer(const void* pointer) const;
+
   void debug() const;
 
@@ -137 +140 @@
   ResourceManager();
 
-  Resource* locateResourceByInfo(const char* fileName, ResourceType type, void* param1, void* param2, void* param3);
-  Resource* locateResourceByPointer(const void* pointer);
-
  private:
   static ResourceManager*  singletonRef;       //!< singleton Reference