Drop Id tags and copyright notices from files

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

diff --git a/source/texture2d.h b/source/texture2d.h
index ef6261cb98678d7efdfb24f0934e06453f0cbc0e..5395fefd33355f2aa08a3080e286d1b5edc8d5d8 100644 (file)
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -2,23 +2,74 @@
 #define MSP_GL_TEXTURE2D_H_
 
 #include <string>
+#include <msp/gbase/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.
+*/
 class Texture2D: public Texture
 {
+public:
+       class Loader: public Texture::Loader
+       {
+       public:
+               Loader(Texture2D &);
+       private:
+               void image_data(const std::string &);
+               void raw_data(const std::string &);
+               void storage(PixelFormat, unsigned, unsigned);
+               void storage_b(PixelFormat, unsigned, unsigned, unsigned);
+       };
+
+private:
+       PixelFormat ifmt;
+       unsigned width;
+       unsigned height;
+       unsigned allocated;
+
 public:
        Texture2D();
-       void image(int, int, sizei, sizei, int, GLenum, GLenum, void *);
-       void image(int, sizei, sizei, TextureFormat, void *);
-       void image(const std::string &);
-       sizei get_width() const  { return width_; }
-       sizei get_height() const { return height_; }
+
+       /**
+       Defines the texture storage.  This function may only be successfully called
+       once.
+       */
+       void storage(PixelFormat fmt, unsigned wd, unsigned ht);
+
+       /** Allocates texture storage.  If storage has already been allocated, this
+       function 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. */
+       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);
+
+       /**
+       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);
+
+       unsigned get_width() const  { return width; }
+       unsigned get_height() const { return height; }
+
 private:
-       sizei width_;
-       sizei height_;
+       void image(const Graphics::Image &);
+       void require_storage();
+       void get_level_size(unsigned, unsigned &, unsigned &);
 };
 
 } // namespace GL