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 7ce039acb6df2278ff8c2df8c289e63cfd290820..eca0334795ad838c109bad4ed0aa06cf3e06577e 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -20,17 +20,17 @@ istream &operator>>(istream &in, TextureFilter &tf)
        in>>str;
 
        if(str=="NEAREST")
-               tf=NEAREST;
+               tf = NEAREST;
        else if(str=="LINEAR")
-               tf=LINEAR;
+               tf = LINEAR;
        else if(str=="NEAREST_MIPMAP_NEAREST")
-               tf=NEAREST_MIPMAP_NEAREST;
+               tf = NEAREST_MIPMAP_NEAREST;
        else if(str=="NEAREST_MIPMAP_LINEAR")
-               tf=NEAREST_MIPMAP_LINEAR;
+               tf = NEAREST_MIPMAP_LINEAR;
        else if(str=="LINEAR_MIPMAP_NEAREST")
-               tf=LINEAR_MIPMAP_NEAREST;
+               tf = LINEAR_MIPMAP_NEAREST;
        else if(str=="LINEAR_MIPMAP_LINEAR")
-               tf=LINEAR_MIPMAP_LINEAR;
+               tf = LINEAR_MIPMAP_LINEAR;
        else
                in.setstate(ios_base::failbit);
 
@@ -38,42 +38,144 @@ istream &operator>>(istream &in, TextureFilter &tf)
 }
 
 
-void Texture::bind() const
+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)
 {
-       if(!target)
-               throw InvalidState("Attempt to bind a texture without target");
+       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;
+}
 
-       const Texture *cur=TexUnit::current().get_texture();
-       if(cur && cur->target!=target)
-               glDisable(cur->target);
-       if(!cur || cur->target!=target)
-               glEnable(target);
-       glBindTexture(target, id);
-       TexUnit::current().set_texture(this);
+void Texture::set_min_filter(TextureFilter f)
+{
+       min_filter = f;
+       update_parameter(MIN_FILTER);
 }
 
-void Texture::parameter(GLenum param, int value)
+void Texture::set_mag_filter(TextureFilter f)
 {
-       maybe_bind();
+       mag_filter = f;
+       update_parameter(MAG_FILTER);
+}
 
-       glTexParameteri(target, param, value);
+void Texture::set_wrap(TextureWrap w)
+{
+       set_wrap_s(w);
+       set_wrap_t(w);
+       set_wrap_r(w);
 }
 
-void Texture::parameter(GLenum param, float value)
+void Texture::set_wrap_s(TextureWrap w)
 {
-       maybe_bind();
+       wrap_s = w;
+       update_parameter(WRAP_S);
+}
 
-       glTexParameterf(target, param, value);
+void Texture::set_wrap_t(TextureWrap w)
+{
+       wrap_t = w;
+       update_parameter(WRAP_T);
 }
 
-Texture::~Texture()
+void Texture::set_wrap_r(TextureWrap w)
 {
-       glDeleteTextures(1, &id);
+       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 (should never happen)");
+
+       const Texture *cur = TexUnit::current().get_texture();
+       if(cur!=this)
+       {
+               if(cur && cur->target!=target)
+                       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;
+               }
+       }
+}
+
+void Texture::bind_to(unsigned i) const
+{
+       TexUnit::activate(i);
+       bind();
+}
+
+const Texture *Texture::current()
+{
+       return TexUnit::current().get_texture();
 }
 
 void Texture::unbind()
 {
-       const Texture *cur=TexUnit::current().get_texture();
+       const Texture *cur = TexUnit::current().get_texture();
        if(!cur)
                return;
 
@@ -82,21 +184,15 @@ void Texture::unbind()
        TexUnit::current().set_texture(0);
 }
 
-Texture::Texture():
-       target(0)
-{
-       glGenTextures(1, &id);
-}
-
-void Texture::maybe_bind() const
+void Texture::unbind_from(unsigned i)
 {
-       if(TexUnit::current().get_texture()!=this)
-               bind();
+       TexUnit::activate(i);
+       unbind();
 }
 
 
 Texture::Loader::Loader(Texture &t):
-       tex(t)
+       DataFile::ObjectLoader<Texture>(t)
 {
        add("min_filter", &Loader::min_filter);
        add("mag_filter", &Loader::mag_filter);
@@ -105,17 +201,17 @@ Texture::Loader::Loader(Texture &t):
 
 void Texture::Loader::min_filter(TextureFilter f)
 {
-       tex.set_min_filter(f);
+       obj.set_min_filter(f);
 }
 
 void Texture::Loader::mag_filter(TextureFilter f)
 {
-       tex.set_mag_filter(f);
+       obj.set_mag_filter(f);
 }
 
 void Texture::Loader::generate_mipmap(bool gm)
 {
-       tex.parameter(GL_GENERATE_MIPMAP_SGIS, gm);
+       obj.set_generate_mipmap(gm);
 }
 
 } // namespace GL