Store a Transform in keyframes instead of a Matrix

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

diff --git a/source/texture2d.h b/source/texture2d.h
index 5f4a7f9293e49f90781dbeaa50322cd6cc90747c..2a49eca572ee06e25a7a770488b0639d6fd07fc9 100644 (file)
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -3,72 +3,88 @@
 
 #include <string>
 #include <msp/graphics/image.h>
-#include "datatype.h"
-#include "pixelformat.h"
 #include "texture.h"
 
 namespace Msp {
 namespace GL {
 
 /**
-Two-dimensional texture class.  This is the most common type of texture.
+Two-dimensional texture.  Consists of an array of texels in the shape of a
+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 image_data(const std::string &);
+               void init();
+
                void raw_data(const std::string &);
                void storage(PixelFormat, unsigned, unsigned);
-               void storage_b(PixelFormat, unsigned, unsigned, unsigned);
        };
 
 private:
-       PixelFormat ifmt;
+       class AsyncLoader;
+
        unsigned width;
        unsigned height;
+       unsigned levels;
        unsigned allocated;
 
 public:
-       Texture2D();
+       Texture2D(ResourceManager * = 0);
+       virtual ~Texture2D();
+
+       /** Defines storage structure for the texture.  If lv is zero, the number
+       of mipmap levels is automatically determined from storage dimensions.
 
-       /**
-       Defines the texture storage.  This function may only be successfully called
-       once.
-       */
-       void storage(PixelFormat fmt, unsigned wd, unsigned ht);
+       Must be called before an image can be uploaded.  Once storage is defined,
+       it can't be changed. */
+       void storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv = 0);
 
-       /** Allocates texture storage.  If storage has already been allocated, this
-       function does nothing. */
+       /** 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 have been called prior to
-       this, and the image must have dimensions conforming to the specified
-       storage.  For level>0, mipmapping rules apply to the image dimensions. */
+
+       /** Uploads an image to the texture.  Storage must be defined beforehand.
+       The image data must have dimensions and format compatible with the defined
+       storage. */
        void image(unsigned level, PixelFormat fmt, DataType type, const void *data);
 
-       /**
-       Uploads a sub-image into the texture.  Unlike full image upload, there are
-       no constraints on the size of the sub-image.
-       */
-       void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data);
+       /** Updates a rectangular region of the texture.  Storage must be defined
+       and allocated beforehand.  The update region must be fully inside the
+       texture. */
+       void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht,
+               PixelFormat fmt, DataType type, const void *data);
+
+       /** 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.
 
-       /**
-       Loads an image from a file and uploads it to the texture.  If storage() has
-       not been called, the storage format will be set to match the loaded image.
-       */
-       void load_image(const std::string &fn);
+       If srgb is true and storage is determined by this call, then an sRGB pixel
+       format will be used. */
+       virtual void image(const Graphics::Image &, bool srgb = false);
 
-       unsigned get_width() const  { return width; }
+private:
+       void image(const Graphics::Image &, bool, bool);
+
+public:
+       unsigned get_width() const { return width; }
        unsigned get_height() const { return height; }
 
 private:
-       void image(const Graphics::Image &);
-       void get_level_size(unsigned, unsigned &, unsigned &);
+       unsigned get_n_levels() const;
+       void get_level_size(unsigned, unsigned &, unsigned &) const;
+
+public:
+       virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
+       virtual UInt64 get_data_size() const;
+       virtual void unload();
 };
 
 } // namespace GL