X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=fe8b7be9a3e4fbb56dda02464bfb0541d8e131ce;hb=6924ea10c4111b11eab51f0e1aa5b4a6438da7d3;hp=c8a1371c5b0a7724effdeb33ec7f529e70372a47;hpb=6afbace895a7bbcf216ab8e48280ea0303ab5892;p=libs%2Fgl.git diff --git a/source/texture.cpp b/source/texture.cpp index c8a1371c..fe8b7be9 100644 --- a/source/texture.cpp +++ b/source/texture.cpp @@ -1,6 +1,7 @@ +#include +#include #include #include "error.h" -#include "sgis_generate_mipmap.h" #include "texture.h" #include "texunit.h" @@ -63,27 +64,36 @@ Texture::~Texture() void Texture::update_parameter(int mask) const { - if(current()==this) + 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&COMPARE_FUNC) - glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC, cmp_func); + TexUnit *unit = TexUnit::find_unit(this); + if(!unit) + { + dirty_params |= mask; + return; + } + + unit->bind(); } - else - dirty_params |= mask; + + 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); } void Texture::set_min_filter(TextureFilter f) @@ -98,6 +108,22 @@ 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) + 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); @@ -143,18 +169,18 @@ void Texture::set_compare_func(Predicate f) update_parameter(COMPARE_FUNC); } -void Texture::bind() const +void Texture::bind_to(unsigned i) const { - const Texture *cur = TexUnit::current().get_texture(); - if(cur!=this) + 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); - TexUnit::current().set_texture(this); if(dirty_params) { @@ -164,38 +190,29 @@ void Texture::bind() const } } -void Texture::bind_to(unsigned i) const +const Texture *Texture::current(unsigned i) { - TexUnit::activate(i); - bind(); -} - -const Texture *Texture::current() -{ - return TexUnit::current().get_texture(); -} - -void Texture::unbind() -{ - const Texture *cur = TexUnit::current().get_texture(); - if(!cur) - return; - - glBindTexture(cur->target, 0); - glDisable(cur->target); - TexUnit::current().set_texture(0); + return TexUnit::get_unit(i).get_texture(); } void Texture::unbind_from(unsigned i) { - TexUnit::activate(i); - unbind(); + 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(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); @@ -205,6 +222,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); @@ -215,6 +237,11 @@ 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);