Changeset 6693 in orxonox.OLD for branches/network/src/lib/graphics/importer/material.cc

Timestamp:

Jan 25, 2006, 2:19:46 PM (18 years ago)

Author:

patrick

Message:

branches: removed spaceshipcontrol branche

File:

• branches/network/src/lib/graphics/importer/material.cc (modified) (2 diffs)

branches/network/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
@@ -303 +303 @@
   //! @todo Textures from .mtl-file need special care.
   if (dMap != NULL)
-    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (void*)&target);
+    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (int)target);
   else
     this->diffuseTexture = NULL;