Make better use of matrix operations in Camera

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

diff --git a/source/texture.cpp b/source/texture.cpp
index e4d4ebf2ce138c6d716d9bdf9e497d3976c3e029..aeea2818debfaaf03345da191b95d7cf39053dc9 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,7 +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 "ext_texture_filter_anisotropic.h"
-#include "sgis_generate_mipmap.h"
 #include "texture.h"
 #include "texunit.h"
 
@@ -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);