Add a shortcut for specifying both texture filters

[libs/gl.git] / source / texture.cpp

diff --git a/source/texture.cpp b/source/texture.cpp
index 57b1b78dee6de407837b3b78d2bf980d189845e6..aeea2818debfaaf03345da191b95d7cf39053dc9 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,6 +1,7 @@
+#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 "extension.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,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);
@@ -126,7 +145,7 @@ void Texture::set_wrap_r(TextureWrap w)
 void Texture::set_generate_mipmap(bool gm)
 {
        if(gm)
-               static RequireExtension _ext("GL_SGIS_generate_mipmap");
+               static Require _req(SGIS_generate_mipmap);
        gen_mipmap = gm;
        update_parameter(GENERATE_MIPMAP);
 }
@@ -196,6 +215,8 @@ void Texture::unbind_from(unsigned i)
 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);
@@ -205,6 +226,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);
@@ -215,6 +241,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);