Inherit Loaders from the ObjectLoader classes

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

diff --git a/source/texture2d.h b/source/texture2d.h
index 30eab26c47d648cd91bbc6ec7aab4c542ec7322e..5784645b03356d5baebc2ecb75c4e17585a34472 100644 (file)
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -9,15 +9,13 @@ Distributed under the LGPL
 #define MSP_GL_TEXTURE2D_H_
 
 #include <string>
-#include <msp/datafile/loader.h>
+#include <msp/gbase/image.h>
 #include "pixelformat.h"
 #include "texture.h"
 
 namespace Msp {
 namespace GL {
 
-class Image;
-
 /**
 Two-dimensional texture class.  This is the most common type of texture.
 */
@@ -54,13 +52,13 @@ public:
        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, sizei wd, sizei ht, PixelFormat fmt, DataType type, const void *data);
 
        /**
        Loads an image from a file and uploads it to the texture.  If storage() has
@@ -72,7 +70,7 @@ public:
        sizei get_height() const { return height; }
 
 private:
-       void image(const Image &);
+       void image(const Graphics::Image &);
 };
 
 } // namespace GL