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

Timestamp:

Mar 26, 2005, 3:28:39 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved protoclass to folder proto
added protosingleton
added resourceManager
modiefied some stuff to work better

File:

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

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

@@ -23 +23 @@
 #include <stdlib.h>
 #include <string.h>
+
+//! \todo check if we are in RESOURCE MANAGER-mode
+#include "resource_manager.h"
 
 using namespace std;
@@ -104 +107 @@
   this->ambientTextureSet = false;
   this->specularTextureSet = false;
-
-  
 }
 
@@ -333 +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);
 }