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

Timestamp:

Sep 22, 2006, 12:19:51 AM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: new Resources stuff

Location:

branches/new_class_id/src/lib/graphics/importer

Files:

• resource_texture.cc (modified) (1 diff)
• resource_texture.h (modified) (1 diff)
• texture.h (modified) (1 diff)

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

@@ -5 +5 @@
 
 
+ResourceTexture::ResourceTexture(const std::string& imageName, GLenum target)
+{
+  Resource::Pointer* ptr = this->acquireResource(ResourceTexture::type, imageName + ',' + "TEST");
 
-ResourceTexture::TextureResourcePointer::TextureResourcePointer(TextureData* data)
-{
-  this->pointer = new TextureData::Pointer(data);
+  if (ptr)
+    this->acquireData(static_cast<ResourceTexture::TextureResourcePointer*>(ptr)->ptr());
+  else
+  {
+    this->loadImage(imageName, target);
+  }
 }
 
 
 Resource::Type ResourceTexture::type(Texture::staticClassID());
+
+
+
+
+
+ResourceTexture::TextureResourcePointer::TextureResourcePointer(const std::string& loadString, const Resource::KeepLevel& keepLevel, TextureData* data)
+    : Resource::Pointer(loadString, keepLevel) , pointer(data)
+{
+}
+
+

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

@@ -18 +18 @@
 
 private:
-  class TextureResourcePointer
+  class TextureResourcePointer : public Resource::Pointer
   {
   public:
-    TextureResourcePointer(TextureData* data);
+    TextureResourcePointer(const std::string& loadString, const Resource::KeepLevel& keepLevel, TextureData* data);
+    inline const TextureData::Pointer& ptr() const { return pointer; }
   private:
-    TextureData::Pointer* pointer;
+    TextureData::Pointer pointer;
   };
 

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

@@ -30 +30 @@
   Texture& operator=(const Texture& texture);
   Texture& operator=(const TextureData::Pointer& textureDataPointer);
+  void acquireData(const TextureData::Pointer& textureDataPointer) { this->data = textureDataPointer; };
+  const TextureData::Pointer& dataPointer() const { return data; }
 
   virtual ~Texture();