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

Timestamp:

Oct 7, 2005, 2:42:30 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: less output on quit… still some strange effecs caused by unloading textures

File:

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

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

@@ -36 +36 @@
 Material::Material (const char* mtlName)
 {
-  PRINTF(4)("initializing new Material.\n");
+  this->setClassID(CL_MATERIAL, "Material");
+
   this->setIllum(3);
   this->setDiffuse(0,0,0);
@@ -58 +59 @@
   PRINTF(4)("delete Material %s.\n", this->getName());
 
-  if (this->diffuseTexture)
+  if (this->diffuseTexture != NULL)
     ResourceManager::getInstance()->unload(this->diffuseTexture);
-  if (this->ambientTexture)
+  if (this->ambientTexture != NULL)
     ResourceManager::getInstance()->unload(this->ambientTexture);
-  if (this->specularTexture)
+  if (this->specularTexture != NULL)
     ResourceManager::getInstance()->unload(this->specularTexture);
 }
@@ -275 +276 @@
   //! @todo Textures from .mtl-file need special care.
   if (dMap!= NULL)
-    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE);
+    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME);
   else
     this->diffuseTexture = NULL;