Implement loading functionality for texture classes that were missing it

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

diff --git a/source/texture2d.h b/source/texture2d.h
index 7504f321d218543ea151700ed819cdd0eb9cb96d..674c778f9782116dce94ef4c663e1dda89931953 100644 (file)
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -3,8 +3,6 @@
 
 #include <string>
 #include <msp/graphics/image.h>
-#include "datatype.h"
-#include "pixelformat.h"
 #include "resource.h"
 #include "texture.h"
 
@@ -27,7 +25,6 @@ public:
        private:
                void init();
 
-               void image_data(const std::string &);
                void raw_data(const std::string &);
                void storage(PixelFormat, unsigned, unsigned);
                void storage_b(PixelFormat, unsigned, unsigned, unsigned);
@@ -43,6 +40,7 @@ private:
 
 public:
        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. */
@@ -63,16 +61,13 @@ public:
        void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht,
                PixelFormat fmt, DataType type, const void *data);
 
-       /// 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.
 
        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);
+       virtual void image(const Graphics::Image &, bool srgb = false);
 
 private:
        void image(const Graphics::Image &, bool, bool);