Cosmetic tweaks

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

diff --git a/source/texturecube.h b/source/texturecube.h
index fe343c7390630de1ad6fdc9a1f3a2cbc3ebfcdda..fd4670469fd1ab0500b607a35e723fe7e9205b65 100644 (file)
--- a/source/texturecube.h
+++ b/source/texturecube.h
@@ -1,12 +1,10 @@
 #ifndef MSP_GL_TEXTURECUBE_H_
 #define MSP_GL_TEXTURECUBE_H_
 
+#include <msp/gl/extensions/arb_texture_cube_map.h>
 #include <msp/graphics/image.h>
-#include "datatype.h"
-#include "pixelformat.h"
 #include "texture.h"
 #include "vector.h"
-#include <msp/gl/extensions/arb_texture_cube_map.h>
 
 namespace Msp {
 namespace GL {
@@ -44,6 +42,7 @@ public:
        private:
                void init();
 
+               void external_image(TextureCubeFace, const std::string &);
                void image_data(TextureCubeFace, const std::string &);
                void raw_data(TextureCubeFace, const std::string &);
                void storage(PixelFormat, unsigned);
@@ -82,6 +81,8 @@ public:
 
        void image(TextureCubeFace, const Graphics::Image &, bool = false);
 
+       virtual void image(const Graphics::Image &, bool = false);
+
        unsigned get_size() const { return size; }
 private:
        unsigned get_level_size(unsigned);
@@ -103,7 +104,7 @@ public:
        /** Returns a vector pointing to the center a texel. */
        Vector3 get_texel_direction(TextureCubeFace, unsigned, unsigned);
 
-       virtual AsyncLoader *load(IO::Seekable &) { return 0; }
+       virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
        virtual UInt64 get_data_size() const;
        virtual void unload() { }
 };