Get rid of the typedefs for fundamental types

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

diff --git a/source/texture2d.h b/source/texture2d.h
index 251561b99490c5ca93166bd9679e121a3fbc92d2..012718528af72592039831c2a27c69b6a58aa728 100644 (file)
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -9,6 +9,8 @@ Distributed under the LGPL
 #define MSP_GL_TEXTURE2D_H_
 
 #include <string>
+#include <msp/gbase/image.h>
+#include "datatype.h"
 #include "pixelformat.h"
 #include "texture.h"
 
@@ -20,10 +22,21 @@ 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, unsigned);
+       };
+
 private:
        PixelFormat ifmt;
-       sizei width;
-       sizei height;
+       unsigned width;
+       unsigned height;
        int border;
 
 public:
@@ -33,20 +46,20 @@ public:
        Defines the texture storage.  This function may only be successfully called
        once.
        */
-       void storage(PixelFormat fmt, sizei wd, sizei ht, int brd);
+       void storage(PixelFormat fmt, unsigned wd, unsigned 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);
+       void image(int 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(int level, int x, int y, sizei wd, sizei ht, PixelFormat fmt, GLenum type, const void *data);
+       void sub_image(int 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
@@ -54,8 +67,11 @@ public:
        */
        void load_image(const std::string &fn);
 
-       sizei get_width() const  { return width; }
-       sizei get_height() const { return height; }
+       unsigned get_width() const  { return width; }
+       unsigned get_height() const { return height; }
+
+private:
+       void image(const Graphics::Image &);
 };
 
 } // namespace GL