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

Timestamp:

Mar 30, 2005, 3:02:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ResourceManager not totally static anymore, list-iterators, and so on

File:

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

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

@@ -62 +62 @@
     delete []this->name;
   if (this->diffuseTexture)
-    ResourceManager::unload(this->diffuseTexture);
+    ResourceManager::getInstance()->unload(this->diffuseTexture);
   if (this->nextMat)
     delete this->nextMat;
@@ -339 +339 @@
   //! \todo check if RESOURCE MANAGER is availiable
   //! \todo Textures from .mtl-file need special care.
-  this->diffuseTextureSet = this->diffuseTexture = (Texture*)ResourceManager::load(dMap, IMAGE);
+  this->diffuseTextureSet = this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE);
 }