X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=c8a1371c5b0a7724effdeb33ec7f529e70372a47;hb=6afbace895a7bbcf216ab8e48280ea0303ab5892;hp=eca0334795ad838c109bad4ed0aa06cf3e06577e;hpb=7e9e15a12fb398798f2719545cc8553354c1e389;p=libs%2Fgl.git

diff --git a/source/texture.cpp b/source/texture.cpp
index eca03347..c8a1371c 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,11 +1,6 @@
-/* $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 "sgis_generate_mipmap.h"
 #include "texture.h"
 #include "texunit.h"
 
@@ -14,27 +9,35 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-istream &operator>>(istream &in, TextureFilter &tf)
+void operator>>(const LexicalConverter &c, TextureFilter &tf)
 {
-	string str;
-	in>>str;
-
-	if(str=="NEAREST")
+	if(c.get()=="NEAREST")
 		tf = NEAREST;
-	else if(str=="LINEAR")
+	else if(c.get()=="LINEAR")
 		tf = LINEAR;
-	else if(str=="NEAREST_MIPMAP_NEAREST")
+	else if(c.get()=="NEAREST_MIPMAP_NEAREST")
 		tf = NEAREST_MIPMAP_NEAREST;
-	else if(str=="NEAREST_MIPMAP_LINEAR")
+	else if(c.get()=="NEAREST_MIPMAP_LINEAR")
 		tf = NEAREST_MIPMAP_LINEAR;
-	else if(str=="LINEAR_MIPMAP_NEAREST")
+	else if(c.get()=="LINEAR_MIPMAP_NEAREST")
 		tf = LINEAR_MIPMAP_NEAREST;
-	else if(str=="LINEAR_MIPMAP_LINEAR")
+	else if(c.get()=="LINEAR_MIPMAP_LINEAR")
 		tf = LINEAR_MIPMAP_LINEAR;
 	else
-		in.setstate(ios_base::failbit);
+		throw lexical_error(format("conversion of '%s' to TextureFilter", c.get()));
+}
 
-	return in;
+
+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()));
 }
 
 
@@ -60,7 +63,7 @@ Texture::~Texture()
 
 void Texture::update_parameter(int mask) const
 {
-	if(TexUnit::current().get_texture()==this)
+	if(current()==this)
 	{
 		if(mask&MIN_FILTER)
 			glTexParameteri(target, GL_TEXTURE_MIN_FILTER, min_filter);
@@ -76,7 +79,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
@@ -122,6 +125,8 @@ void Texture::set_wrap_r(TextureWrap w)
 
 void Texture::set_generate_mipmap(bool gm)
 {
+	if(gm)
+		static Require _req(SGIS_generate_mipmap);
 	gen_mipmap = gm;
 	update_parameter(GENERATE_MIPMAP);
 }
@@ -140,9 +145,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 +196,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 +215,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