X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=96da77d1b9aba0400805461f0706c84d017ab60e;hb=a1eb8711ba225bb4423868c50369ad5592465171;hp=8c8ad3784e4a0a32faad55b49a25dca54fd9c2fb;hpb=edd2a01b3c696df8630ac6a97e9b55a95fe7e112;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 8c8ad378..96da77d1 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,5 +1,8 @@
+#include <msp/io/memory.h>
 #include "bindable.h"
 #include "error.h"
+#include "pixelstore.h"
+#include "resources.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -20,6 +23,7 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
 		throw invalid_operation("Texture2D::storage");
 	if(wd==0 || ht==0)
 		throw invalid_argument("Texture2D::storage");
+	require_pixelformat(fmt);
 
 	ifmt = fmt;
 	width = wd;
@@ -43,7 +47,7 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	unsigned h = height;
 	get_level_size(level, w, h);
 
-	Bind _bind(this, true);
+	BindRestore _bind(this);
 	glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
 
 	allocated |= 1<<level;
@@ -61,28 +65,36 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 
 	allocate(level);
 
-	Bind _bind(this, true);
+	BindRestore _bind(this);
 	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(fmt, 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");
 
+	PixelStore pstore = PixelStore::from_image(img);
+	BindRestore _bind_ps(pstore);
+
 	image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
@@ -100,6 +112,17 @@ void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
 
 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);
@@ -110,18 +133,21 @@ Texture2D::Loader::Loader(Texture2D &t):
 void Texture2D::Loader::image_data(const string &data)
 {
 	Graphics::Image img;
-	img.load_memory(data.data(), data.size());
+	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);
 }