Changeset 6651 in orxonox.OLD for trunk/src/lib

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/lib

Files:

• graphics/importer/material.cc (modified) (1 diff)
• particles/sprite_particles.cc (modified) (1 diff)

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);