Use DevIL for loading images

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

diff --git a/source/texture2d.h b/source/texture2d.h
index e06ea920a1aff896f7c1c50ed1f87fac75e7b007..251561b99490c5ca93166bd9679e121a3fbc92d2 100644 (file)
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -9,23 +9,53 @@ Distributed under the LGPL
 #define MSP_GL_TEXTURE2D_H_
 
 #include <string>
+#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
 {
+private:
+       PixelFormat ifmt;
+       sizei width;
+       sizei height;
+       int border;
+
 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_; }
-private:
-       sizei width_;
-       sizei height_;
+
+       /**
+       Defines the texture storage.  This function may only be successfully called
+       once.
+       */
+       void storage(PixelFormat fmt, sizei wd, sizei ht, int brd);
+       
+       /**
+       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.
+       */
+       void image(int level, PixelFormat fmt, GLenum 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(int level, int x, int y, sizei wd, sizei ht, PixelFormat fmt, GLenum 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);
+
+       sizei get_width() const  { return width; }
+       sizei get_height() const { return height; }
 };
 
 } // namespace GL