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

diff --git a/source/texture.cpp b/source/texture.cpp
index d22f189b..f6b5f8e4 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,3 +1,5 @@
+#include <msp/gl/extensions/ext_texture_filter_anisotropic.h>
+#include <msp/gl/extensions/sgis_generate_mipmap.h>
 #include <msp/strings/format.h>
 #include "error.h"
 #include "texture.h"
@@ -8,27 +10,22 @@ 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);
-
-	return in;
+		throw lexical_error(format("conversion of '%s' to TextureFilter", c.get()));
 }
 
 
@@ -67,12 +64,14 @@ Texture::~Texture()
 
 void Texture::update_parameter(int mask) const
 {
-	if(current()==this)
+	if(TexUnit::current().get_texture()==this)
 	{
 		if(mask&MIN_FILTER)
 			glTexParameteri(target, GL_TEXTURE_MIN_FILTER, min_filter);
 		if(mask&MAG_FILTER)
 			glTexParameteri(target, GL_TEXTURE_MAG_FILTER, mag_filter);
+		if(mask&MAX_ANISOTROPY)
+			glTexParameteri(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, max_anisotropy);
 		if(mask&WRAP_S)
 			glTexParameteri(target, GL_TEXTURE_WRAP_S, wrap_s);
 		if(mask&WRAP_T)
@@ -102,6 +101,22 @@ void Texture::set_mag_filter(TextureFilter f)
 	update_parameter(MAG_FILTER);
 }
 
+void Texture::set_filter(TextureFilter f)
+{
+	set_min_filter(f);
+	set_mag_filter(f==NEAREST ? NEAREST : LINEAR);
+}
+
+void Texture::set_max_anisotropy(float a)
+{
+	if(a<1.0f)
+		throw invalid_argument("Texture::set_max_anisotropy");
+	else if(a>1.0f)
+		static Require _req(EXT_texture_filter_anisotropic);
+	max_anisotropy = a;
+	update_parameter(MAX_ANISOTROPY);
+}
+
 void Texture::set_wrap(TextureWrap w)
 {
 	set_wrap_s(w);
@@ -129,6 +144,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);
 }
@@ -145,18 +162,18 @@ void Texture::set_compare_func(Predicate f)
 	update_parameter(COMPARE_FUNC);
 }
 
-void Texture::bind() const
+void Texture::bind_to(unsigned i) const
 {
-	const Texture *cur = TexUnit::current().get_texture();
-	if(cur!=this)
+	TexUnit &unit = TexUnit::get_unit(i);
+	const Texture *cur = unit.get_texture();
+	if(unit.set_texture(this))
 	{
+		unit.bind();
 		if(cur && cur->target!=target)
 			glDisable(cur->target);
 		if(!cur || cur->target!=target)
 			glEnable(target);
-
 		glBindTexture(target, id);
-		TexUnit::current().set_texture(this);
 
 		if(dirty_params)
 		{
@@ -166,38 +183,29 @@ void Texture::bind() const
 	}
 }
 
-void Texture::bind_to(unsigned i) const
-{
-	TexUnit::activate(i);
-	bind();
-}
-
-const Texture *Texture::current()
+const Texture *Texture::current(unsigned i)
 {
-	return TexUnit::current().get_texture();
-}
-
-void Texture::unbind()
-{
-	const Texture *cur = TexUnit::current().get_texture();
-	if(!cur)
-		return;
-
-	glBindTexture(cur->target, 0);
-	glDisable(cur->target);
-	TexUnit::current().set_texture(0);
+	return TexUnit::get_unit(i).get_texture();
 }
 
 void Texture::unbind_from(unsigned i)
 {
-	TexUnit::activate(i);
-	unbind();
+	TexUnit &unit = TexUnit::get_unit(i);
+	const Texture *cur = unit.get_texture();
+	if(unit.set_texture(0))
+	{
+		unit.bind();
+		glBindTexture(cur->target, 0);
+		glDisable(cur->target);
+	}
 }
 
 
 Texture::Loader::Loader(Texture &t):
 	DataFile::ObjectLoader<Texture>(t)
 {
+	add("filter", &Loader::filter);
+	add("max_anisotropy", &Loader::max_anisotropy);
 	add("generate_mipmap", &Loader::generate_mipmap);
 	add("mag_filter", &Loader::mag_filter);
 	add("min_filter", &Loader::min_filter);
@@ -207,6 +215,11 @@ Texture::Loader::Loader(Texture &t):
 	add("wrap_t",     &Loader::wrap_t);
 }
 
+void Texture::Loader::filter(TextureFilter f)
+{
+	obj.set_filter(f);
+}
+
 void Texture::Loader::generate_mipmap(bool gm)
 {
 	obj.set_generate_mipmap(gm);
@@ -217,6 +230,11 @@ void Texture::Loader::mag_filter(TextureFilter f)
 	obj.set_mag_filter(f);
 }
 
+void Texture::Loader::max_anisotropy(float a)
+{
+	obj.set_max_anisotropy(a);
+}
+
 void Texture::Loader::min_filter(TextureFilter f)
 {
 	obj.set_min_filter(f);