X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=8935933f995117322069ad1652b6b1d9ffc87d0c;hb=12ac9bec8e03029c1042fd7732a2cfc04c9a9584;hp=fbf86a43b77fe79dc2f81120a98b516aeea05b85;hpb=a80b074c70ec991f27114efd13686038cf42c493;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index fbf86a43..8935933f 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -5,8 +5,8 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include "bindable.h"
 #include "except.h"
-#include "ilwrap.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -15,65 +15,61 @@ namespace Msp {
 namespace GL {
 
 Texture2D::Texture2D():
+	Texture(GL_TEXTURE_2D),
 	width(0),
 	height(0)
-{
-	target=GL_TEXTURE_2D;
-	bind();
-}
+{ }
 
-void Texture2D::storage(PixelFormat fmt, sizei wd, sizei ht, int brd)
+void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, int brd)
 {
 	if(width>0)
 		throw InvalidState("Texture storage may only be specified once");
 	if(wd==0 || ht==0)
 		throw InvalidParameterValue("Invalid texture dimensions");
 
-	ifmt=fmt;
-	width=wd;
-	height=ht;
-	border=brd;
+	ifmt = fmt;
+	width = wd;
+	height = ht;
+	border = brd;
 }
 
-void Texture2D::image(int level, PixelFormat fmt, GLenum type, const void *data)
+void Texture2D::image(int level, PixelFormat fmt, DataType type, const void *data)
 {
 	if(width==0)
 		throw InvalidState("Texture storage has not been specified");
 
-	maybe_bind();
-
+	Bind _bind(this, true);
 	glTexImage2D(target, level, ifmt, width, height, border, fmt, type, data);
 }
 
-void Texture2D::sub_image(int level, int x, int y, sizei wd, sizei ht, PixelFormat fmt, GLenum type, const void *data)
+void Texture2D::sub_image(int level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
 {
 	if(width==0)
 		throw InvalidState("Texture storage has not been specified");
 
-	maybe_bind();
-
+	Bind _bind(this, true);
 	glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
 }
 
 void Texture2D::load_image(const string &fn)
 {
-	Image img;
+	Graphics::Image img;
 	img.load_file(fn);
 
 	image(img);
 }
 
-void Texture2D::image(const Image &img)
+void Texture2D::image(const Graphics::Image &img)
 {
-	unsigned w=img.get_width();
-	unsigned h=img.get_height();
-	PixelFormat fmt=img.get_format();
+	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, 0);
 	else if(w!=width || h!=height)
 		throw IncompatibleData("Image does not match texture storage");
 
-	image(0, fmt, GL_UNSIGNED_BYTE, img.get_data());
+	image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
 
@@ -81,14 +77,27 @@ Texture2D::Loader::Loader(Texture2D &t):
 	Texture::Loader(t)
 {
 	add("image_data", &Loader::image_data);
+	add("raw_data", &Loader::raw_data);
+	add("storage", &Loader::storage);
 }
 
 void Texture2D::Loader::image_data(const string &data)
 {
-	Image img;
-	img.load_lump(data.data(), data.size());
+	Graphics::Image img;
+	img.load_memory(data.data(), data.size());
+
+	static_cast<Texture2D &>(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());
+}
 
-	static_cast<Texture2D &>(tex).image(img);
+void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigned b)
+{
+	static_cast<Texture2D &>(obj).storage(fmt, w, h, b);
 }
 
 } // namespace GL