]> git.tdb.fi Git - libs/gl.git/blobdiff - source/texture.cpp
Check the flat qualifier from the correct member
[libs/gl.git] / source / texture.cpp
diff --git a/source/texture.cpp b/source/texture.cpp
deleted file mode 100644 (file)
index f6b5f8e..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-#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 "texture.h"
-#include "texunit.h"
-
-using namespace std;
-
-namespace Msp {
-namespace GL {
-
-void operator>>(const LexicalConverter &c, TextureFilter &tf)
-{
-       if(c.get()=="NEAREST")
-               tf = NEAREST;
-       else if(c.get()=="LINEAR")
-               tf = LINEAR;
-       else if(c.get()=="NEAREST_MIPMAP_NEAREST")
-               tf = NEAREST_MIPMAP_NEAREST;
-       else if(c.get()=="NEAREST_MIPMAP_LINEAR")
-               tf = NEAREST_MIPMAP_LINEAR;
-       else if(c.get()=="LINEAR_MIPMAP_NEAREST")
-               tf = LINEAR_MIPMAP_NEAREST;
-       else if(c.get()=="LINEAR_MIPMAP_LINEAR")
-               tf = LINEAR_MIPMAP_LINEAR;
-       else
-               throw lexical_error(format("conversion of '%s' to TextureFilter", c.get()));
-}
-
-
-void operator>>(const LexicalConverter &c, TextureWrap &tw)
-{
-       if(c.get()=="REPEAT")
-               tw = REPEAT;
-       else if(c.get()=="CLAMP_TO_EDGE")
-               tw = CLAMP_TO_EDGE;
-       else if(c.get()=="MIRRORED_REPEAT")
-               tw = MIRRORED_REPEAT;
-       else
-               throw lexical_error(format("conversion of '%s' to TextureWrap", c.get()));
-}
-
-
-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&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)
-                       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&COMPARE_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_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)
-               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);
-       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)
-{
-       if(gm)
-               static Require _req(SGIS_generate_mipmap);
-       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_to(unsigned i) const
-{
-       TexUnit &unit = TexUnit::get_unit(i);
-       const Texture *cur = unit.get_texture();
-       if(unit.set_texture(this))
-       {
-               unit.bind();
-               if(cur && cur->target!=target)
-                       glDisable(cur->target);
-               if(!cur || cur->target!=target)
-                       glEnable(target);
-               glBindTexture(target, id);
-
-               if(dirty_params)
-               {
-                       update_parameter(dirty_params);
-                       dirty_params = 0;
-               }
-       }
-}
-
-const Texture *Texture::current(unsigned i)
-{
-       return TexUnit::get_unit(i).get_texture();
-}
-
-void Texture::unbind_from(unsigned i)
-{
-       TexUnit &unit = TexUnit::get_unit(i);
-       const Texture *cur = unit.get_texture();
-       if(unit.set_texture(0))
-       {
-               unit.bind();
-               glBindTexture(cur->target, 0);
-               glDisable(cur->target);
-       }
-}
-
-
-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);
-       add("min_filter", &Loader::min_filter);
-       add("wrap",       &Loader::wrap);
-       add("wrap_r",     &Loader::wrap_r);
-       add("wrap_s",     &Loader::wrap_s);
-       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);
-}
-
-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);
-}
-
-void Texture::Loader::wrap(TextureWrap w)
-{
-       obj.set_wrap(w);
-}
-
-void Texture::Loader::wrap_r(TextureWrap w)
-{
-       obj.set_wrap_r(w);
-}
-
-void Texture::Loader::wrap_s(TextureWrap w)
-{
-       obj.set_wrap_s(w);
-}
-
-void Texture::Loader::wrap_t(TextureWrap w)
-{
-       obj.set_wrap_t(w);
-}
-
-} // namespace GL
-} // namespace Msp