Changeset 6651 in orxonox.OLD for trunk

Timestamp:

Jan 22, 2006, 2:22:48 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: copy Resources from the ResourceManger (this is not as safe as with smart-pointers )

maybe implement:
​http://ootips.org/yonat/4dev/counted_ptr.h

Location:

trunk/src

Files:

• lib/graphics/importer/material.cc (modified) (1 diff)
• lib/particles/sprite_particles.cc (modified) (1 diff)
• util/loading/resource_manager.cc (modified) (2 diffs)
• util/loading/resource_manager.h (modified) (2 diffs)

trunk/src/lib/graphics/importer/material.cc

@@ -81 +81 @@
     ResourceManager::getInstance()->unload(this->diffuseTexture);
   if (m.diffuseTexture != NULL)
-    this->diffuseTexture = m.diffuseTexture; /// HACK shoudl be:(Texture*)ResourceManager::getInstance()->load();
+    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->copy(m.diffuseTexture);
   this->ambientTexture = NULL; /// FIXME
   this->specularTexture = NULL; /// FIXME

trunk/src/lib/particles/sprite_particles.cc

@@ -125 +125 @@
   GLboolean checkLight = false;
   glGetBooleanv(GL_LIGHTING, &checkLight);
-  if (checkLight == GL_TRUE)
-    glDisable(GL_LIGHTING);
+//  if (checkLight == GL_TRUE)
+//    glDisable(GL_LIGHTING);
   glMatrixMode(GL_MODELVIEW);
   glDepthMask(GL_FALSE);

trunk/src/util/loading/resource_manager.cc

@@ -325 +325 @@
   else
     return false;
+}
+
+/**
+ * tells the ResourceManager to generate a Copy of the Resource.
+ * @brief resourcePointer: The Pointer to the resource to copy
+ * @returns the Resource pointed to resourcePointer.
+ */
+BaseObject* ResourceManager::copy(BaseObject* resourcePointer)
+{
+  Resource* tmp = locateResourceByPointer(resourcePointer);
+  if (tmp!=NULL)
+  {
+    tmp->count++;
+    return tmp->pointer;
+  }
+  else
+    return NULL;
 }
 
@@ -543 +560 @@
  * @returns true if successful (pointer found, and deleted), false otherwise
 */
-bool ResourceManager::unload(void* pointer, ResourcePriority prio)
+bool ResourceManager::unload(BaseObject* pointer, ResourcePriority prio)
 {
   if (pointer == NULL)

trunk/src/util/loading/resource_manager.h

@@ -107 +107 @@
   bool cache(const char* fileName, ResourceType type, ResourcePriority prio = RP_NO,
              const MultiType& param0 = MultiType(), const MultiType& param1 = MultiType(), const MultiType& param2 = MultiType());
+  BaseObject* copy(BaseObject* resourcePointer);
 
   BaseObject* load(const char* fileName, ResourcePriority prio = RP_NO,
@@ -112 +113 @@
   BaseObject* load(const char* fileName, ResourceType type, ResourcePriority prio = RP_NO,
                    const MultiType& param0 = MultiType(), const MultiType& param1 = MultiType(), const MultiType& param2 = MultiType());
-  bool unload(void* pointer, ResourcePriority prio = RP_NO);
+  bool unload(BaseObject* pointer, ResourcePriority prio = RP_NO);
   bool unload(Resource* resource, ResourcePriority = RP_NO);
   bool unloadAllByPriority(ResourcePriority prio);