Changeset 5303 in orxonox.OLD for trunk/src/lib/graphics/importer
- Timestamp:
- Oct 7, 2005, 2:42:30 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/graphics/importer/material.cc
r5302 r5303 36 36 Material::Material (const char* mtlName) 37 37 { 38 PRINTF(4)("initializing new Material.\n"); 38 this->setClassID(CL_MATERIAL, "Material"); 39 39 40 this->setIllum(3); 40 41 this->setDiffuse(0,0,0); … … 58 59 PRINTF(4)("delete Material %s.\n", this->getName()); 59 60 60 if (this->diffuseTexture )61 if (this->diffuseTexture != NULL) 61 62 ResourceManager::getInstance()->unload(this->diffuseTexture); 62 if (this->ambientTexture )63 if (this->ambientTexture != NULL) 63 64 ResourceManager::getInstance()->unload(this->ambientTexture); 64 if (this->specularTexture )65 if (this->specularTexture != NULL) 65 66 ResourceManager::getInstance()->unload(this->specularTexture); 66 67 } … … 275 276 //! @todo Textures from .mtl-file need special care. 276 277 if (dMap!= NULL) 277 this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE );278 this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME); 278 279 else 279 280 this->diffuseTexture = NULL;
Note: See TracChangeset
for help on using the changeset viewer.