#include "bindable.h"
#include "error.h"
#include "pixelstore.h"
+#include "resources.h"
#include "texture2d.h"
using namespace std;
glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
}
-void Texture2D::load_image(const string &fn)
+void Texture2D::load_image(const string &fn, bool srgb)
{
Graphics::Image img;
img.load_file(fn);
- image(img);
+ image(img, srgb);
}
-void Texture2D::image(const Graphics::Image &img)
+void Texture2D::image(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(width==0)
- storage(storage_pixelformat_from_graphics(img.get_format()), w, h);
+ {
+ PixelFormat f = storage_pixelformat_from_graphics(img.get_format());
+ if(srgb)
+ f = get_srgb_pixelformat(f);
+ storage(f, w, h);
+ }
else if(w!=width || h!=height)
throw incompatible_data("Texture2D::image");
Texture2D::Loader::Loader(Texture2D &t):
DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>(t)
+{
+ init();
+}
+
+Texture2D::Loader::Loader(Texture2D &t, Collection &c):
+ DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>(t, c)
+{
+ init();
+}
+
+void Texture2D::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(img);
+ obj.image(img, srgb);
}
void Texture2D::Loader::raw_data(const string &data)
{
- obj.image(0, obj.ifmt, UNSIGNED_BYTE, data.data());
+ obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
}
void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
{
+ if(srgb)
+ fmt = get_srgb_pixelformat(fmt);
obj.storage(fmt, w, h);
}