#include <msp/strings/format.h>
#include "bindable.h"
#include "error.h"
+#include "pixelstore.h"
#include "texturecube.h"
using namespace std;
TextureCube::TextureCube():
Texture(GL_TEXTURE_CUBE_MAP),
+ ifmt(RGB),
size(0),
allocated(0)
{
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
}
}
-void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
+void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)
{
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(fmt, w);
- else
+ 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);
}
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());
}
return fv+s*sv+t*tv;
}
+UInt64 TextureCube::get_data_size() const
+{
+ return id ? size*size*6*get_pixel_size(ifmt) : 0;
+}
+
TextureCube::Loader::Loader(TextureCube &t):
DataFile::DerivedObjectLoader<TextureCube, Texture::Loader>(t)
+{
+ init();
+}
+
+TextureCube::Loader::Loader(TextureCube &t, Collection &c):
+ DataFile::DerivedObjectLoader<TextureCube, Texture::Loader>(t, c)
+{
+ init();
+}
+
+void TextureCube::Loader::init()
{
add("image_data", &Loader::image_data);
add("raw_data", &Loader::raw_data);
IO::Memory mem(data.data(), data.size());
img.load_io(mem);
- obj.image(face, img);
+ obj.image(face, img, srgb);
}
void TextureCube::Loader::raw_data(TextureCubeFace face, const string &data)
{
- obj.image(face, 0, obj.ifmt, UNSIGNED_BYTE, data.data());
+ obj.image(face, 0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
}
void TextureCube::Loader::storage(PixelFormat fmt, unsigned s)
{
+ if(srgb)
+ fmt = get_srgb_pixelformat(fmt);
obj.storage(fmt, s);
}