Changeset 4834 in orxonox.OLD for orxonox/trunk/src/lib/graphics/importer/material.cc

Timestamp:

Jul 11, 2005, 5:47:23 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: crosshair in WeaponManager (instead of World) and implemented easy Cyling for LoadParam

File:

• orxonox/trunk/src/lib/graphics/importer/material.cc (modified) (2 diffs)

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

@@ -57 +57 @@
 {
   PRINTF(4)("delete Material %s.\n", this->getName());
+
   if (this->diffuseTexture)
     ResourceManager::getInstance()->unload(this->diffuseTexture);
+  if (this->ambientTexture)
+    ResourceManager::getInstance()->unload(this->ambientTexture);
+  if (this->specularTexture)
+    ResourceManager::getInstance()->unload(this->specularTexture);
 }
 
@@ -267 +272 @@
     ResourceManager::getInstance()->unload(this->diffuseTexture);
 
-  //! \todo check if RESOURCE MANAGER is availiable
-  //! \todo Textures from .mtl-file need special care.
-  this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE);
+  //! @todo check if RESOURCE MANAGER is availiable
+  //! @todo Textures from .mtl-file need special care.
+  if (dMap!= NULL)
+    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE);
+  else
+    this->diffuseTexture = NULL;
 }