Support for anisotropic texture filtering

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

diff --git a/source/texture.cpp b/source/texture.cpp
index c2ea8ff7b854c95cf6bee17e5bfd43aed772f710..e4d4ebf2ce138c6d716d9bdf9e497d3976c3e029 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,4 +1,7 @@
-#include "except.h"
+#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"
 
@@ -7,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()));
 }
 
 
@@ -40,7 +38,7 @@ void operator>>(const LexicalConverter &c, TextureWrap &tw)
        else if(c.get()=="MIRRORED_REPEAT")
                tw = MIRRORED_REPEAT;
        else
-               throw LexicalError("Invalid input in TextureWrap conversion");
+               throw lexical_error(format("conversion of '%s' to TextureWrap", c.get()));
 }
 
 
@@ -72,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)
@@ -101,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);
@@ -128,6 +138,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);
 }
@@ -146,9 +158,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)
        {
@@ -200,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);
@@ -219,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);