Add a shortcut for specifying both texture filters

diff --git a/source/texture.cpp b/source/texture.cpp
index 3bd1df67068123a256b7ff7b8067c71f8ff7a1ca..aeea2818debfaaf03345da191b95d7cf39053dc9 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -101,6 +101,12 @@ 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)
@@ -209,6 +215,7 @@ 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);
@@ -219,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);

diff --git a/source/texture.h b/source/texture.h
index af0844c55e26938f00b2201e2f10abd576ece537..6b8117fe4f7d11b1c385e174cb343da29f48d909 100644 (file)
--- a/source/texture.h
+++ b/source/texture.h
@@ -71,6 +71,7 @@ protected:
        public:
                Loader(Texture &);
        private:
+               void filter(TextureFilter);
                void generate_mipmap(bool);
                void mag_filter(TextureFilter);
                void max_anisotropy(float);
@@ -118,6 +119,11 @@ protected:
 public:
        void set_min_filter(TextureFilter);
        void set_mag_filter(TextureFilter);
+
+       /** Sets filter for both minification and magnification.  Since mipmapping
+       is not applicable to magnification, LINEAR is used instead. */
+       void set_filter(TextureFilter);
+
        void set_max_anisotropy(float);
 
        /** Sets the wrapping mode for all coordinates. */