X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=d22f189bdcad4cc0a3c0e2f7edb0d55f30c5adaf;hb=2e7f19b895424c3a77940e648639f8df2b395d0f;hp=dc69732fe2f33dafff253b51359898bbcaf1c260;hpb=020811d96d5c823686e5c2b0a392b95d1a321f05;p=libs%2Fgl.git

diff --git a/source/texture.cpp b/source/texture.cpp
index dc69732f..d22f189b 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,11 +1,5 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "except.h"
+#include <msp/strings/format.h>
+#include "error.h"
 #include "texture.h"
 #include "texunit.h"
 
@@ -38,6 +32,19 @@ istream &operator>>(istream &in, TextureFilter &tf)
 }
 
 
+void operator>>(const LexicalConverter &c, TextureWrap &tw)
+{
+	if(c.get()=="REPEAT")
+		tw = REPEAT;
+	else if(c.get()=="CLAMP_TO_EDGE")
+		tw = CLAMP_TO_EDGE;
+	else if(c.get()=="MIRRORED_REPEAT")
+		tw = MIRRORED_REPEAT;
+	else
+		throw lexical_error(format("conversion of '%s' to TextureWrap", c.get()));
+}
+
+
 Texture::Texture(GLenum t):
 	target(t),
 	min_filter(NEAREST_MIPMAP_LINEAR),
@@ -76,7 +83,7 @@ void Texture::update_parameter(int mask) const
 			glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, gen_mipmap);
 		if(mask&COMPARE)
 			glTexParameteri(target, GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
-		if(mask&cmp_func)
+		if(mask&COMPARE_FUNC)
 			glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC, cmp_func);
 	}
 	else
@@ -140,9 +147,6 @@ void Texture::set_compare_func(Predicate f)
 
 void Texture::bind() const
 {
-	if(!target)
-		throw InvalidState("Attempt to bind a texture without target (should never happen)");
-
 	const Texture *cur = TexUnit::current().get_texture();
 	if(cur!=this)
 	{
@@ -194,14 +198,18 @@ void Texture::unbind_from(unsigned i)
 Texture::Loader::Loader(Texture &t):
 	DataFile::ObjectLoader<Texture>(t)
 {
-	add("min_filter", &Loader::min_filter);
-	add("mag_filter", &Loader::mag_filter);
 	add("generate_mipmap", &Loader::generate_mipmap);
+	add("mag_filter", &Loader::mag_filter);
+	add("min_filter", &Loader::min_filter);
+	add("wrap",       &Loader::wrap);
+	add("wrap_r",     &Loader::wrap_r);
+	add("wrap_s",     &Loader::wrap_s);
+	add("wrap_t",     &Loader::wrap_t);
 }
 
-void Texture::Loader::min_filter(TextureFilter f)
+void Texture::Loader::generate_mipmap(bool gm)
 {
-	obj.set_min_filter(f);
+	obj.set_generate_mipmap(gm);
 }
 
 void Texture::Loader::mag_filter(TextureFilter f)
@@ -209,9 +217,29 @@ void Texture::Loader::mag_filter(TextureFilter f)
 	obj.set_mag_filter(f);
 }
 
-void Texture::Loader::generate_mipmap(bool gm)
+void Texture::Loader::min_filter(TextureFilter f)
 {
-	obj.set_generate_mipmap(gm);
+	obj.set_min_filter(f);
+}
+
+void Texture::Loader::wrap(TextureWrap w)
+{
+	obj.set_wrap(w);
+}
+
+void Texture::Loader::wrap_r(TextureWrap w)
+{
+	obj.set_wrap_r(w);
+}
+
+void Texture::Loader::wrap_s(TextureWrap w)
+{
+	obj.set_wrap_s(w);
+}
+
+void Texture::Loader::wrap_t(TextureWrap w)
+{
+	obj.set_wrap_t(w);
 }
 
 } // namespace GL