+#include <msp/datafile/collection.h>
#include <msp/gl/extensions/arb_texture_cube_map.h>
#include <msp/io/memory.h>
#include <msp/strings/format.h>
if(w!=h)
throw incompatible_data("TextureCube::image");
- PixelFormat f = storage_pixelformat_from_graphics(img.get_format());
- if(srgb)
- f = get_srgb_pixelformat(f);
- storage(f, w);
+ storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
}
else if(w!=size || h!=size)
throw incompatible_data("TextureCube::image");
image(face, 0, fmt, UNSIGNED_BYTE, img.get_data());
}
+void TextureCube::image(const Graphics::Image &img, bool srgb)
+{
+ unsigned w = img.get_width();
+ unsigned h = img.get_height();
+
+ if(h!=w*6)
+ throw incompatible_data("TextureCube::image");
+ h /= 6;
+
+ PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+ if(size==0)
+ storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+ else if(w!=size || h!=size)
+ throw incompatible_data("TextureCube::image");
+
+ PixelStore pstore = PixelStore::from_image(img);
+ BindRestore _bind_ps(pstore);
+
+ const char *cdata = reinterpret_cast<const char *>(img.get_data());
+ unsigned face_size = img.get_stride()*size;
+ for(unsigned i=0; i<6; ++i)
+ image(enumerate_faces(i), 0, fmt, UNSIGNED_BYTE, cdata+i*face_size);
+}
+
unsigned TextureCube::get_level_size(unsigned level)
{
return size>>level;
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;