X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=f4af7e7259bef9ccaf3319be8c56df51cd9881a0;hb=b30209f7d9c984ee03df779446fa4ad5f9334865;hp=b6b5954837c2e8b2ca4d35a801bd28f199e75757;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index b6b59548..f4af7e72 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,5 +1,7 @@
+#include <msp/io/memory.h>
 #include "bindable.h"
-#include "except.h"
+#include "error.h"
+#include "pixelstore.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -17,9 +19,10 @@ Texture2D::Texture2D():
 void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
 {
 	if(width>0)
-		throw InvalidState("Texture storage may only be specified once");
+		throw invalid_operation("Texture2D::storage");
 	if(wd==0 || ht==0)
-		throw InvalidParameterValue("Invalid texture dimensions");
+		throw invalid_argument("Texture2D::storage");
+	require_pixelformat(fmt);
 
 	ifmt = fmt;
 	width = wd;
@@ -36,13 +39,14 @@ void Texture2D::allocate(unsigned level)
 
 void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
 {
-	require_storage();
+	if(width==0 || height==0)
+		throw invalid_operation("Texture2D::image");
 
 	unsigned w = width;
 	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;
@@ -55,10 +59,12 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 
 void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
 {
-	require_storage();
+	if(width==0 || height==0)
+		throw invalid_operation("Texture2D::sub_image");
+
 	allocate(level);
 
-	Bind _bind(this, true);
+	BindRestore _bind(this);
 	glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
 }
 
@@ -76,17 +82,14 @@ void Texture2D::image(const Graphics::Image &img)
 	unsigned h = img.get_height();
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
-		storage(fmt, w, h);
+		storage(storage_pixelformat_from_graphics(img.get_format()), w, h);
 	else if(w!=width || h!=height)
-		throw IncompatibleData("Image does not match texture storage");
+		throw incompatible_data("Texture2D::image");
 
-	image(0, fmt, UNSIGNED_BYTE, img.get_data());
-}
+	PixelStore pstore = PixelStore::from_image(img);
+	BindRestore _bind_ps(pstore);
 
-void Texture2D::require_storage()
-{
-	if(width==0 || height==0)
-		throw InvalidState("Texture storage has not been specified");
+	image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
 void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
@@ -102,7 +105,7 @@ void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
 
 
 Texture2D::Loader::Loader(Texture2D &t):
-	Texture::Loader(t)
+	DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>(t)
 {
 	add("image_data", &Loader::image_data);
 	add("raw_data", &Loader::raw_data);
@@ -113,20 +116,20 @@ 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);
 
-	static_cast<Texture2D &>(obj).image(img);
+	obj.image(img);
 }
 
 void Texture2D::Loader::raw_data(const string &data)
 {
-	Texture2D &t2d = static_cast<Texture2D &>(obj);
-	t2d.image(0, t2d.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)
 {
-	static_cast<Texture2D &>(obj).storage(fmt, w, h);
+	obj.storage(fmt, w, h);
 }
 
 void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned)