Changeset 9785 in orxonox.OLD for branches/new_class_id/src/lib/graphics/importer/material.cc

Timestamp:

Sep 22, 2006, 3:40:06 PM (18 years ago)

Author:

bensch

Message:

some implementations of the new self sustained Resources. It works, but does not yet load the correct stuff

File:

• branches/new_class_id/src/lib/graphics/importer/material.cc (modified) (4 diffs)

branches/new_class_id/src/lib/graphics/importer/material.cc

@@ -25 +25 @@
 #include "loading/load_param.h"
 
-#include "util/loading/resource_manager.h"
+#include "resource_texture.h"
+//#include "util/loading/resource_manager.h"
 
 ObjectListDefinition(Material);
@@ -91 +92 @@
 {
   PRINTF(5)("delete Material %s.\n", this->getCName());
-
-  if (this->ambientTexture != NULL)
-    ResourceManager::getInstance()->unload(this->ambientTexture);
-  if (this->specularTexture != NULL)
-    ResourceManager::getInstance()->unload(this->specularTexture);
 
   if (this == Material::selectedMaterial)
@@ -297 +293 @@
 void Material::addTexturePath(const std::string& pathName)
 {
-  ResourceManager::getInstance()->addImageDir(pathName);
+  printf("HUPS\n");
+  //ResourceManager::getInstance()->addImageDir(pathName);
 }
 
@@ -351 +348 @@
   if (!dMap.empty())
   {
-    Texture* tex = dynamic_cast<Texture*>(ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (int)target));
-    if (tex != NULL)
-      this->textures[textureNumber] = *tex;
+    this->textures[textureNumber] = ResourceTexture(dMap);
+        //dynamic_cast<Texture*>(ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (int)target));
+/*    if (tex != NULL)
+      this->textures[textureNumber] = tex;
     else
-      this->textures[textureNumber] = Texture();
+      this->textures[textureNumber] = Texture();*/
   }
   else