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

Timestamp:

Mar 27, 2005, 7:44:39 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: resource manager working, player uses it.

File:

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

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

@@ -21 +21 @@
 #include "texture.h"
 #include "debug.h"
+#include "resource_manager.h"
 #include <stdlib.h>
 #include <string.h>
@@ -61 +62 @@
     delete []this->name;
   if (this->diffuseTexture)
-    this->diffuseTexture;
+    ResourceManager::unload(this->diffuseTexture);
   if (this->nextMat)
     delete this->nextMat;
@@ -92 +93 @@
   this->nextMat = NULL;
   this->name ="";
-  this->setIllum(1);
+  this->setIllum(3);
   this->setDiffuse(0,0,0);
   this->setAmbient(0,0,0);
@@ -168 +169 @@
 }
 
-
 /**
    \brief Set the Name of the Material. (Important for searching)
@@ -322 +322 @@
 void Material::addTexturePath(char* pathName)
 {
-  PathList::getInstance()->addPath(pathName);
+  ResourceManager::getInstance()->addImageDir(pathName);
 }
 
@@ -334 +334 @@
 {
   PRINTF(4)("setting Diffuse Map %s\n", dMap);
-    diffuseTexture = new Texture();
-    this->diffuseTextureSet = diffuseTexture->loadImage(dMap);
+  //    diffuseTexture = new Texture();
+  //    this->diffuseTextureSet = diffuseTexture->loadImage(dMap);
 
   //! \todo check if RESOURCE MANAGER is availiable
-  //this->diffuseTextureSet = this->diffuseTexture = (Texture*)ResourceManager::load(dMap, IMAGE);
+  //! \todo Textures from .mtl-file need special care.
+  this->diffuseTextureSet = this->diffuseTexture = (Texture*)ResourceManager::load(dMap, IMAGE);
 }