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

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

Location:

branches/new_class_id/src/lib/graphics/importer

Files:

• material.cc (modified) (4 diffs)
• resource_texture.cc (modified) (3 diffs)
• resource_texture.h (modified) (2 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

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

@@ -6 +6 @@
 
 ResourceTexture::ResourceTexture(const std::string& imageName, GLenum target)
+    : Resource(&ResourceTexture::type)
 {
-  Resource::Pointer* ptr = this->acquireResource(ResourceTexture::type, imageName + ',' + "TEST");
+  Resource::Pointer* ptr = this->acquireResource(imageName + ',' + "TEST");
 
   if (ptr)
@@ -13 +14 @@
   else
   {
-    this->loadImage(imageName, target);
+    std::string fileName = this->Resource::locateFile(imageName);
+    this->Texture::loadImage(fileName, target);
+    this->Resource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + "TEST", KeepLevel(), this->Texture::dataPointer()));
   }
 }
@@ -24 +27 @@
 
 
-ResourceTexture::TextureResourcePointer::TextureResourcePointer(const std::string& loadString, const Resource::KeepLevel& keepLevel, TextureData* data)
+ResourceTexture::TextureResourcePointer::TextureResourcePointer(const std::string& loadString, const Resource::KeepLevel& keepLevel, const TextureData::Pointer& data)
     : Resource::Pointer(loadString, keepLevel) , pointer(data)
-{
-}
+{}
 
 

branches/new_class_id/src/lib/graphics/importer/resource_texture.h

@@ -14 +14 @@
 class ResourceTexture : public Texture, public Resource
 {
+public:
   ResourceTexture(const std::string& imageName, GLenum target = GL_TEXTURE_2D);
 
 
 private:
-  class TextureResourcePointer : public Resource::Pointer
+class TextureResourcePointer : public Resource::Pointer
   {
   public:
-    TextureResourcePointer(const std::string& loadString, const Resource::KeepLevel& keepLevel, TextureData* data);
+    TextureResourcePointer(const std::string& loadString, const Resource::KeepLevel& keepLevel, const TextureData::Pointer& data);
     inline const TextureData::Pointer& ptr() const { return pointer; }
   private:
@@ -27 +28 @@
   };
 
-  private:
-    static Resource::Type type;
+private:
+  static Resource::Type type;
 };