Remove the deprecated ProgramBuilder class

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

diff --git a/source/texturecube.h b/source/texturecube.h
index 077b58ac59f48d6e1bc688564b9787a5086d5b28..ae305153fec6860a8f37e3128f037214f07d5e25 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,53 +42,77 @@ 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);
+               void storage_levels(PixelFormat, unsigned, unsigned);
        };
 
 private:
-       PixelFormat ifmt;
        unsigned size;
+       unsigned levels;
+       /* Lowest six bits track allocation status of faces on the base level.  Bit
+       seven is set if the entire base level is allocated. */
        unsigned allocated;
 
+       static TextureCubeFace face_order[6];
        static Vector3 directions[6];
+       static unsigned orientations[12];
 
 public:
        TextureCube();
 
-       /** Defines storage structure for the texture.  Must be called before an
-       image can be uploaded.  Once storage is defined, it can't be changed. */
-       void storage(PixelFormat fmt, unsigned size);
+       /** Defines storage structure for the texture.  If lv is zero, the number
+       of mipmap levels is automatically determined from storage dimensions.
+
+       Must be called before an image can be uploaded.  Once storage is defined,
+       it can't be changed. */
+       void storage(PixelFormat fmt, unsigned size, unsigned lv = 0);
+
+       DEPRECATED void storage(PixelComponents c, unsigned s, unsigned l = 0)
+       { storage(make_pixelformat(c, UNSIGNED_BYTE), s, l); }
 
        /** Allocates storage for the cube faces.  The contents are initially
        undefined.  If storage has already been allocated, does nothing. */
        void allocate(unsigned level);
 
-       /** Uploads image data to a face.  Storage must be defined beforehand.  The
-       image data must have dimensions and format compatible with the defined
+       /** Updates the contents of a face.  Storage must be defined beforehand.
+       The image data must have dimensions and format matching the defined
        storage. */
-       void image(TextureCubeFace face, unsigned level,
-               PixelFormat fmt, DataType type, const void *data);
+       void image(TextureCubeFace face, unsigned level, const void *data);
+
+       DEPRECATED void image(TextureCubeFace face, unsigned level,
+               PixelComponents comp, DataType type, const void *data);
 
-       /** Updates a rectangular region of a face.  Storage must be defined and
-       allocated beforehand.  The update region must be fully inside the texture.
-       The data format must be compatible with the defined storage. */
-       void sub_image(TextureCubeFace face, unsigned level,
+       /** Updates a rectangular region of a face.  Storage must be defined
+       beforehand.  The image data must be in a format mathing the defined storage
+       and the update region must be fully inside the face. */
+       void sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned w, unsigned h, const void *data);
+
+       DEPRECATED void sub_image(TextureCubeFace face, unsigned level,
                int x, int y, unsigned w, unsigned h,
-               PixelFormat fmt, DataType type, const void *data);
+               PixelComponents comp, DataType type, const void *data);
+
+       void image(TextureCubeFace, const Graphics::Image &);
+
+       DEPRECATED void image(TextureCubeFace, const Graphics::Image &, bool);
 
-       void image(TextureCubeFace, const Graphics::Image &, bool = false);
+       virtual void image(const Graphics::Image &, unsigned = 0);
+       using Texture::image;
 
        unsigned get_size() const { return size; }
 private:
-       unsigned get_level_size(unsigned);
+       unsigned get_n_levels() const;
+       unsigned get_level_size(unsigned) const;
 
 public:
        /** Translates indices into face constants.  Valid indices are between 0
        and 5, inclusive. */
        static TextureCubeFace enumerate_faces(unsigned);
 
+       static unsigned get_face_index(TextureCubeFace);
+
        /** Returns a vector pointing out of the face. */
        static const Vector3 &get_face_direction(TextureCubeFace);
 
@@ -102,6 +124,10 @@ public:
 
        /** Returns a vector pointing to the center a texel. */
        Vector3 get_texel_direction(TextureCubeFace, unsigned, unsigned);
+
+       virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
+       virtual UInt64 get_data_size() const;
+       virtual void unload() { }
 };
 
 void operator>>(const LexicalConverter &, TextureCubeFace &);