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

diff --git a/source/texture.cpp b/source/texture.cpp
index c8a1371c..e4d4ebf2 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,5 +1,6 @@
 #include <msp/strings/format.h>
 #include "error.h"
+#include "ext_texture_filter_anisotropic.h"
 #include "sgis_generate_mipmap.h"
 #include "texture.h"
 #include "texunit.h"
@@ -69,6 +70,8 @@ void Texture::update_parameter(int mask) const
 			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)
@@ -98,6 +101,16 @@ void Texture::set_mag_filter(TextureFilter f)
 	update_parameter(MAG_FILTER);
 }
 
+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);
@@ -196,6 +209,7 @@ void Texture::unbind_from(unsigned i)
 Texture::Loader::Loader(Texture &t):
 	DataFile::ObjectLoader<Texture>(t)
 {
+	add("max_anisotropy", &Loader::max_anisotropy);
 	add("generate_mipmap", &Loader::generate_mipmap);
 	add("mag_filter", &Loader::mag_filter);
 	add("min_filter", &Loader::min_filter);
@@ -215,6 +229,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);