Add a geometry flag to ProgramBuilder

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

diff --git a/source/texture2d.h b/source/texture2d.h
index dce58a7873213e772381582e490c11363f8557b6..030fe408ad0a2b08bcdc448fe1f305703c3d8dce 100644 (file)
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -3,8 +3,7 @@
 
 #include <string>
 #include <msp/graphics/image.h>
-#include "datatype.h"
-#include "pixelformat.h"
+#include "resource.h"
 #include "texture.h"
 
 namespace Msp {
@@ -12,8 +11,8 @@ 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
 {
@@ -33,13 +32,16 @@ public:
        };
 
 private:
+       class AsyncLoader;
+
        PixelFormat ifmt;
        unsigned width;
        unsigned height;
        unsigned allocated;
 
 public:
-       Texture2D();
+       Texture2D(ResourceManager * = 0);
+       virtual ~Texture2D();
 
        /** Defines storage structure for the texture.  Must be called before an
        image can be uploaded.  Once storage is defined, it can't be changed. */
@@ -60,21 +62,31 @@ 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. */
+       /// 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. */
+       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 &, bool, bool);
+
+public:
        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 &, const Resources * = 0);
+       virtual UInt64 get_data_size() const;
+       virtual void unload();
 };
 
 } // namespace GL