Changeset 9785 in orxonox.OLD for branches/new_class_id/src/lib/graphics/importer/resource_texture.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/resource_texture.cc (modified) (3 diffs)

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)
-{
-}
+{}