X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=cf08ac6371ceeacad9f362a49b3970d887e3398f;hb=946266e823c07025f115b5e4f5523b496dcb393e;hp=47b6ba37abb300f8fae19a83be1ace593001362f;hpb=2508306f82675546be3c98e1eb556bae62ed2ccd;p=libs%2Fgl.git diff --git a/source/texture.cpp b/source/texture.cpp index 47b6ba37..cf08ac63 100644 --- a/source/texture.cpp +++ b/source/texture.cpp @@ -1,11 +1,9 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - -#include "except.h" +#include +#include +#include +#include "error.h" +#include "resourcemanager.h" +#include "resources.h" #include "texture.h" #include "texunit.h" @@ -14,123 +12,299 @@ using namespace std; namespace Msp { namespace GL { -istream &operator>>(istream &in, TextureFilter &tf) -{ - string str; - in>>str; - - if(str=="NEAREST") - tf=NEAREST; - else if(str=="LINEAR") - tf=LINEAR; - else if(str=="NEAREST_MIPMAP_NEAREST") - tf=NEAREST_MIPMAP_NEAREST; - else if(str=="NEAREST_MIPMAP_LINEAR") - tf=NEAREST_MIPMAP_LINEAR; - else if(str=="LINEAR_MIPMAP_NEAREST") - tf=LINEAR_MIPMAP_NEAREST; - else if(str=="LINEAR_MIPMAP_LINEAR") - tf=LINEAR_MIPMAP_LINEAR; +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 - in.setstate(ios_base::failbit); + throw lexical_error(format("conversion of '%s' to TextureFilter", c.get())); +} + - return in; +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())); } -void Texture::bind() const +Texture::Texture(GLenum t, ResourceManager *m): + id(0), + 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(m) + set_manager(m); + else + glGenTextures(1, &id); +} + +Texture::~Texture() { - if(!target) - throw InvalidState("Attempt to bind a texture without target"); + while(TexUnit *unit = TexUnit::find_unit(this)) + unbind_from(unit->get_index()); - const Texture *cur=TexUnit::current().get_texture(); - if(cur!=this) + if(id) + glDeleteTextures(1, &id); +} + +void Texture::update_parameter(int mask) const +{ + if(TexUnit::current().get_texture()!=this) { - if(cur && cur->target!=target) - glDisable(cur->target); - if(!cur || cur->target!=target) - glEnable(target); - glBindTexture(target, id); - TexUnit::current().set_texture(this); + TexUnit *unit = TexUnit::find_unit(this); + if(!unit) + { + dirty_params |= mask; + return; + } + + unit->bind(); } + + 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::bind_to(unsigned i) const +void Texture::set_min_filter(TextureFilter f) { - TexUnit::activate(i); - bind(); + 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_filter(TextureFilter f) +{ + set_min_filter(f); + set_mag_filter(f==NEAREST ? NEAREST : LINEAR); } -void Texture::parameter(GLenum param, float value) +void Texture::set_max_anisotropy(float a) { - maybe_bind(); + 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); +} - glTexParameterf(target, param, value); +void Texture::set_wrap(TextureWrap w) +{ + set_wrap_s(w); + set_wrap_t(w); + set_wrap_r(w); } -Texture::~Texture() +void Texture::set_wrap_s(TextureWrap w) { - glDeleteTextures(1, &id); + wrap_s = w; + update_parameter(WRAP_S); } -void Texture::unbind() +void Texture::set_wrap_t(TextureWrap w) { - const Texture *cur=TexUnit::current().get_texture(); - if(!cur) - return; + wrap_t = w; + update_parameter(WRAP_T); +} - glBindTexture(cur->target, 0); - glDisable(cur->target); - TexUnit::current().set_texture(0); +void Texture::set_wrap_r(TextureWrap w) +{ + wrap_r = w; + update_parameter(WRAP_R); } -void Texture::unbind_from(unsigned i) +void Texture::set_generate_mipmap(bool gm) { - TexUnit::activate(i); - unbind(); + if(gm) + static Require _req(SGIS_generate_mipmap); + gen_mipmap = gm; + update_parameter(GENERATE_MIPMAP); } -Texture::Texture(): - target(0) +void Texture::set_compare_enabled(bool c) { - glGenTextures(1, &id); + compare = c; + update_parameter(COMPARE); } -void Texture::maybe_bind() const +void Texture::set_compare_func(Predicate f) { - if(TexUnit::current().get_texture()!=this) - bind(); + cmp_func = f; + update_parameter(COMPARE_FUNC); +} + +void Texture::bind_to(unsigned i) const +{ + if(!id) + { + if(manager) + manager->resource_used(*this); + if(!id) + { + unbind_from(i); + return; + } + } + + TexUnit &unit = TexUnit::get_unit(i); + const Texture *cur = unit.get_texture(); + if(unit.set_texture(this)) + { + if(manager) + manager->resource_used(*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): - tex(t) + DataFile::CollectionObjectLoader(t, 0) { - add("min_filter", &Loader::min_filter); - add("mag_filter", &Loader::mag_filter); + init(); +} + +Texture::Loader::Loader(Texture &t, Collection &c): + DataFile::CollectionObjectLoader(t, &c) +{ + init(); +} + +void Texture::Loader::init() +{ + if(Resources *res = dynamic_cast(coll)) + srgb = res->get_srgb_conversion(); + else + srgb = false; + + 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::min_filter(TextureFilter f) +void Texture::Loader::filter(TextureFilter f) +{ + obj.set_filter(f); +} + +void Texture::Loader::generate_mipmap(bool gm) { - tex.set_min_filter(f); + obj.set_generate_mipmap(gm); } void Texture::Loader::mag_filter(TextureFilter f) { - tex.set_mag_filter(f); + obj.set_mag_filter(f); } -void Texture::Loader::generate_mipmap(bool gm) +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) { - tex.parameter(GL_GENERATE_MIPMAP_SGIS, gm); + obj.set_wrap_t(w); } } // namespace GL