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

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.h (modified) (2 diffs)

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;
 };