Enable resource management on Texture2D

[libs/gl.git] / source / texture2d.h

diff --git a/source/texture2d.h b/source/texture2d.h
index f81231d18466eebf8746cb2cb9a19d552513a3fc..a37e2a4d7fd746eeb732d23483d8896115377338 100644 (file)
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -5,6 +5,7 @@
 #include <msp/graphics/image.h>
 #include "datatype.h"
 #include "pixelformat.h"
+#include "resource.h"
 #include "texture.h"
 
 namespace Msp {
@@ -12,17 +13,20 @@ namespace GL {
 
 /**
 Two-dimensional texture.  Consists of an array of texels in the shape of a
-rectangle.  Texture coordinate have a principal range of [0, 1].  This is the
-most common type of texture.
+rectangle.  Texture coordinate have a range of [0, 1].  Coordinates outside of
+this range are subject to wrapping.  This is the most common type of texture.
 */
 class Texture2D: public Texture
 {
 public:
-       class Loader: public Texture::Loader
+       class Loader: public Msp::DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>
        {
        public:
                Loader(Texture2D &);
+               Loader(Texture2D &, Collection &);
        private:
+               void init();
+
                void image_data(const std::string &);
                void raw_data(const std::string &);
                void storage(PixelFormat, unsigned, unsigned);
@@ -30,13 +34,15 @@ public:
        };
 
 private:
+       class AsyncLoader;
+
        PixelFormat ifmt;
        unsigned width;
        unsigned height;
        unsigned allocated;
 
 public:
-       Texture2D();
+       Texture2D(ResourceManager * = 0);
 
        /** Defines storage structure for the texture.  Must be called before an
        image can be uploaded.  Once storage is defined, it can't be changed. */
@@ -45,7 +51,7 @@ public:
        /** Allocates storage for the texture.  The contents are initially
        undefined.  If storage has already been allocated, does nothing. */
        void allocate(unsigned level);
-       
+
        /** Uploads an image to the texture.  Storage must be defined beforehand.
        The image data must have dimensions and format compatible with the defined
        storage. */
@@ -57,20 +63,30 @@ public:
        void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht,
                PixelFormat fmt, DataType type, const void *data);
 
-       /** Loads an image from a file and uploads it to the texture.  If storage
-       has not been defined, it will be set to match the loaded image.  Otherwise
-       the image must be compatible with the defined storage. */
-       void load_image(const std::string &fn);
+       /// Loads a Graphics::Image from a file and uploads it to the texture.
+       void load_image(const std::string &fn, bool srgb = false);
+
+       /** Uploads an image to the texture.  If storage has not been defined, it
+       will be set to match the image.  Otherwise the image must be compatible with
+       the defined storage.
+
+       If srgb is true and storage is determined by this call, then an sRGB pixel
+       format will be used. */
+       void image(const Graphics::Image &, bool srgb = false);
 
 private:
-       void image(const Graphics::Image &);
+       void image(const Graphics::Image &, bool, bool);
 
 public:
-       unsigned get_width() const  { return width; }
+       unsigned get_width() const { return width; }
        unsigned get_height() const { return height; }
 
 private:
        void get_level_size(unsigned, unsigned &, unsigned &);
+
+public:
+       virtual Resource::AsyncLoader *load(IO::Seekable &);
+       virtual void unload();
 };
 
 } // namespace GL