Add some utility functions for textures

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

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 743eb986247eb95318c98490179b3fdb95683980..65b1845eaf9ca5f1bb82f9886ada4ed0eed46472 100644 (file)
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -1,3 +1,4 @@
+#include <msp/datafile/collection.h>
 #include <msp/gl/extensions/arb_texture_cube_map.h>
 #include <msp/io/memory.h>
 #include <msp/strings/format.h>
@@ -36,6 +37,9 @@ void TextureCube::storage(PixelFormat fmt, unsigned sz)
                throw invalid_operation("TextureCube::storage");
        if(sz==0)
                throw invalid_argument("TextureCube::storage");
+
+       if(MSP_sized_internal_formats)
+               fmt = get_sized_pixelformat(fmt);
        require_pixelformat(fmt);
 
        ifmt = fmt;
@@ -71,11 +75,21 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
        {
                // TODO Only do this once all faces are created
                auto_generate_mipmap();
-               for(; s; s>>=1, ++level) ;
-               allocated |= (1<<level)-1;
+               allocated |= (1<<get_n_levels())-1;
        }
 }
 
+void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
+{
+       if(size==0)
+               throw invalid_operation("TextureCube::sub_image");
+
+       allocate(level);
+
+       BindRestore _bind(this);
+       glTexSubImage2D(face, level, x, y, wd, ht, fmt, type, data);
+}
+
 void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)
 {
        unsigned w = img.get_width();
@@ -121,7 +135,14 @@ void TextureCube::image(const Graphics::Image &img, bool srgb)
                image(enumerate_faces(i), 0, fmt, UNSIGNED_BYTE, cdata+i*face_size);
 }
 
-unsigned TextureCube::get_level_size(unsigned level)
+unsigned TextureCube::get_n_levels() const
+{
+       unsigned n = 0;
+       for(unsigned s=size; s; s>>=1, ++n) ;
+       return n;
+}
+
+unsigned TextureCube::get_level_size(unsigned level) const
 {
        return size>>level;
 }
@@ -212,11 +233,21 @@ TextureCube::Loader::Loader(TextureCube &t, Collection &c):
 
 void TextureCube::Loader::init()
 {
+       add("external_image", &Loader::external_image);
        add("image_data", &Loader::image_data);
        add("raw_data", &Loader::raw_data);
        add("storage", &Loader::storage);
 }
 
+void TextureCube::Loader::external_image(TextureCubeFace face, const string &fn)
+{
+       Graphics::Image img;
+       RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
+       img.load_io(*io);
+
+       obj.image(face, img, srgb);
+}
+
 void TextureCube::Loader::image_data(TextureCubeFace face, const string &data)
 {
        Graphics::Image img;