Get rid of the generic Texture::parameter method

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

diff --git a/source/texture.cpp b/source/texture.cpp
index 40f18d45eff1f0c8d10d2363d8ea2a6123bbc650..eca0334795ad838c109bad4ed0aa06cf3e06577e 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -38,10 +38,110 @@ istream &operator>>(istream &in, TextureFilter &tf)
 }
 
 
+Texture::Texture(GLenum t):
+       target(t),
+       min_filter(NEAREST_MIPMAP_LINEAR),
+       mag_filter(LINEAR),
+       wrap_s(REPEAT),
+       wrap_t(REPEAT),
+       wrap_r(REPEAT),
+       gen_mipmap(false),
+       compare(false),
+       cmp_func(LEQUAL),
+       dirty_params(0)
+{
+       glGenTextures(1, &id);
+}
+
+Texture::~Texture()
+{
+       glDeleteTextures(1, &id);
+}
+
+void Texture::update_parameter(int mask) const
+{
+       if(TexUnit::current().get_texture()==this)
+       {
+               if(mask&MIN_FILTER)
+                       glTexParameteri(target, GL_TEXTURE_MIN_FILTER, min_filter);
+               if(mask&MAG_FILTER)
+                       glTexParameteri(target, GL_TEXTURE_MAG_FILTER, mag_filter);
+               if(mask&WRAP_S)
+                       glTexParameteri(target, GL_TEXTURE_WRAP_S, wrap_s);
+               if(mask&WRAP_T)
+                       glTexParameteri(target, GL_TEXTURE_WRAP_T, wrap_t);
+               if(mask&WRAP_R)
+                       glTexParameteri(target, GL_TEXTURE_WRAP_R, wrap_r);
+               if(mask&GENERATE_MIPMAP)
+                       glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, gen_mipmap);
+               if(mask&COMPARE)
+                       glTexParameteri(target, GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
+               if(mask&cmp_func)
+                       glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC, cmp_func);
+       }
+       else
+               dirty_params |= mask;
+}
+
+void Texture::set_min_filter(TextureFilter f)
+{
+       min_filter = f;
+       update_parameter(MIN_FILTER);
+}
+
+void Texture::set_mag_filter(TextureFilter f)
+{
+       mag_filter = f;
+       update_parameter(MAG_FILTER);
+}
+
+void Texture::set_wrap(TextureWrap w)
+{
+       set_wrap_s(w);
+       set_wrap_t(w);
+       set_wrap_r(w);
+}
+
+void Texture::set_wrap_s(TextureWrap w)
+{
+       wrap_s = w;
+       update_parameter(WRAP_S);
+}
+
+void Texture::set_wrap_t(TextureWrap w)
+{
+       wrap_t = w;
+       update_parameter(WRAP_T);
+}
+
+void Texture::set_wrap_r(TextureWrap w)
+{
+       wrap_r = w;
+       update_parameter(WRAP_R);
+}
+
+void Texture::set_generate_mipmap(bool gm)
+{
+       gen_mipmap = gm;
+       update_parameter(GENERATE_MIPMAP);
+}
+
+void Texture::set_compare_enabled(bool c)
+{
+       compare = c;
+       update_parameter(COMPARE);
+}
+
+void Texture::set_compare_func(Predicate f)
+{
+       cmp_func = f;
+       update_parameter(COMPARE_FUNC);
+}
+
 void Texture::bind() const
 {
        if(!target)
-               throw InvalidState("Attempt to bind a texture without target");
+               throw InvalidState("Attempt to bind a texture without target (should never happen)");
 
        const Texture *cur = TexUnit::current().get_texture();
        if(cur!=this)
@@ -50,8 +150,15 @@ void Texture::bind() const
                        glDisable(cur->target);
                if(!cur || cur->target!=target)
                        glEnable(target);
+
                glBindTexture(target, id);
                TexUnit::current().set_texture(this);
+
+               if(dirty_params)
+               {
+                       update_parameter(dirty_params);
+                       dirty_params = 0;
+               }
        }
 }
 
@@ -61,23 +168,9 @@ void Texture::bind_to(unsigned i) const
        bind();
 }
 
-void Texture::parameter(GLenum param, int value)
-{
-       maybe_bind();
-
-       glTexParameteri(target, param, value);
-}
-
-void Texture::parameter(GLenum param, float value)
-{
-       maybe_bind();
-
-       glTexParameterf(target, param, value);
-}
-
-Texture::~Texture()
+const Texture *Texture::current()
 {
-       glDeleteTextures(1, &id);
+       return TexUnit::current().get_texture();
 }
 
 void Texture::unbind()
@@ -97,18 +190,6 @@ void Texture::unbind_from(unsigned i)
        unbind();
 }
 
-Texture::Texture():
-       target(0)
-{
-       glGenTextures(1, &id);
-}
-
-void Texture::maybe_bind() const
-{
-       if(TexUnit::current().get_texture()!=this)
-               bind();
-}
-
 
 Texture::Loader::Loader(Texture &t):
        DataFile::ObjectLoader<Texture>(t)
@@ -130,7 +211,7 @@ void Texture::Loader::mag_filter(TextureFilter f)
 
 void Texture::Loader::generate_mipmap(bool gm)
 {
-       obj.parameter(GL_GENERATE_MIPMAP_SGIS, gm);
+       obj.set_generate_mipmap(gm);
 }
 
 } // namespace GL