Use base pixelformat when loading texture data

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

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index ef9d25297a4285c5ec630cd65e3237c6cddbf471..d5453c182e128b13e201cb87d7b738e38caefd00 100644 (file)
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -1,6 +1,9 @@
-#include "arb_texture_cube_map.h"
+#include <msp/gl/extensions/arb_texture_cube_map.h>
+#include <msp/io/memory.h>
+#include <msp/strings/format.h>
 #include "bindable.h"
 #include "error.h"
+#include "pixelstore.h"
 #include "texturecube.h"
 
 using namespace std;
@@ -56,7 +59,7 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
        if(s==0)
                throw out_of_range("TextureCube::image");
 
-       Bind _bind(this, true);
+       BindRestore _bind(this);
        glTexImage2D(face, level, ifmt, s, s, 0, fmt, type, data);
 
        // XXX Allocation should be tracked per-face, but we'll run out of bits
@@ -68,6 +71,27 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
        }
 }
 
+void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
+{
+       unsigned w = img.get_width();
+       unsigned h = img.get_height();
+       PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+       if(size==0)
+       {
+               if(w==h)
+                       storage(storage_pixelformat_from_graphics(img.get_format()), w);
+               else
+                       throw incompatible_data("TextureCube::image");
+       }
+       else if(w!=size || h!=size)
+               throw incompatible_data("TextureCube::image");
+
+       PixelStore pstore = PixelStore::from_image(img);
+       BindRestore _bind_ps(pstore);
+
+       image(face, 0, fmt, UNSIGNED_BYTE, img.get_data());
+}
+
 unsigned TextureCube::get_level_size(unsigned level)
 {
        return size>>level;
@@ -139,5 +163,53 @@ Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsig
        return fv+s*sv+t*tv;
 }
 
+
+TextureCube::Loader::Loader(TextureCube &t):
+       DataFile::DerivedObjectLoader<TextureCube, Texture::Loader>(t)
+{
+       add("image_data", &Loader::image_data);
+       add("raw_data", &Loader::raw_data);
+       add("storage", &Loader::storage);
+}
+
+void TextureCube::Loader::image_data(TextureCubeFace face, const string &data)
+{
+       Graphics::Image img;
+       IO::Memory mem(data.data(), data.size());
+       img.load_io(mem);
+
+       obj.image(face, img);
+}
+
+void TextureCube::Loader::raw_data(TextureCubeFace face, const string &data)
+{
+       obj.image(face, 0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+}
+
+void TextureCube::Loader::storage(PixelFormat fmt, unsigned s)
+{
+       obj.storage(fmt, s);
+}
+
+
+void operator>>(const LexicalConverter &conv, TextureCubeFace &face)
+{
+       const string &str = conv.get();
+       if(str=="POSITIVE_X")
+               face = POSITIVE_X;
+       else if(str=="NEGATIVE_X")
+               face = NEGATIVE_X;
+       else if(str=="POSITIVE_Y")
+               face = POSITIVE_Y;
+       else if(str=="NEGATIVE_Y")
+               face = NEGATIVE_Y;
+       else if(str=="POSITIVE_Z")
+               face = POSITIVE_Z;
+       else if(str=="NEGATIVE_Z")
+               face = NEGATIVE_Z;
+       else
+               throw lexical_error(format("conversion of '%s' to TextureCubeFace", str));
+}
+
 } // namespace GL
 } // namespace Msp