X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=aec1bc92da90b9b84f8882991f9b6bf4a24d84c2;hb=47abe7c9e1633ca65f910a4db340724117a6f6e5;hp=f4e7d705d142332652396160bb144009aa6c0364;hpb=10b5a32fef9f63254a54378a879142793975efe0;p=libs%2Fgl.git diff --git a/source/texture.cpp b/source/texture.cpp index f4e7d705..aec1bc92 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,27 +12,22 @@ using namespace std; namespace Msp { namespace GL { -istream &operator>>(istream &in, TextureFilter &tf) +void operator>>(const LexicalConverter &c, TextureFilter &tf) { - string str; - in>>str; - - if(str=="NEAREST") + if(c.get()=="NEAREST") tf = NEAREST; - else if(str=="LINEAR") + else if(c.get()=="LINEAR") tf = LINEAR; - else if(str=="NEAREST_MIPMAP_NEAREST") + else if(c.get()=="NEAREST_MIPMAP_NEAREST") tf = NEAREST_MIPMAP_NEAREST; - else if(str=="NEAREST_MIPMAP_LINEAR") + else if(c.get()=="NEAREST_MIPMAP_LINEAR") tf = NEAREST_MIPMAP_LINEAR; - else if(str=="LINEAR_MIPMAP_NEAREST") + else if(c.get()=="LINEAR_MIPMAP_NEAREST") tf = LINEAR_MIPMAP_NEAREST; - else if(str=="LINEAR_MIPMAP_LINEAR") + else if(c.get()=="LINEAR_MIPMAP_LINEAR") tf = LINEAR_MIPMAP_LINEAR; else - in.setstate(ios_base::failbit); - - return in; + throw lexical_error(format("conversion of '%s' to TextureFilter", c.get())); } @@ -47,11 +40,12 @@ void operator>>(const LexicalConverter &c, TextureWrap &tw) else if(c.get()=="MIRRORED_REPEAT") tw = MIRRORED_REPEAT; else - throw LexicalError("Invalid input in TextureWrap conversion"); + throw lexical_error(format("conversion of '%s' to TextureWrap", c.get())); } -Texture::Texture(GLenum t): +Texture::Texture(GLenum t, ResourceManager *m): + id(0), target(t), min_filter(NEAREST_MIPMAP_LINEAR), mag_filter(LINEAR), @@ -63,37 +57,50 @@ Texture::Texture(GLenum t): cmp_func(LEQUAL), dirty_params(0) { - glGenTextures(1, &id); + if(m) + set_manager(m); + else + glGenTextures(1, &id); } Texture::~Texture() { - glDeleteTextures(1, &id); + if(id) + glDeleteTextures(1, &id); } 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) @@ -108,6 +115,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); @@ -135,6 +158,8 @@ void Texture::set_wrap_r(TextureWrap w) void Texture::set_generate_mipmap(bool gm) { + if(gm) + static Require _req(SGIS_generate_mipmap); gen_mipmap = gm; update_parameter(GENERATE_MIPMAP); } @@ -151,21 +176,21 @@ void Texture::set_compare_func(Predicate f) update_parameter(COMPARE_FUNC); } -void Texture::bind() const +void Texture::bind_to(unsigned i) 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) + 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); - TexUnit::current().set_texture(this); if(dirty_params) { @@ -175,38 +200,45 @@ void Texture::bind() const } } -void Texture::bind_to(unsigned i) const +const Texture *Texture::current(unsigned i) { - TexUnit::activate(i); - bind(); + return TexUnit::get_unit(i).get_texture(); } -const Texture *Texture::current() +void Texture::unbind_from(unsigned i) { - return TexUnit::current().get_texture(); + 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); + } } -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); +Texture::Loader::Loader(Texture &t): + DataFile::CollectionObjectLoader(t, 0) +{ + init(); } -void Texture::unbind_from(unsigned i) +Texture::Loader::Loader(Texture &t, Collection &c): + DataFile::CollectionObjectLoader(t, &c) { - TexUnit::activate(i); - unbind(); + init(); } - -Texture::Loader::Loader(Texture &t): - DataFile::ObjectLoader(t) +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); @@ -216,6 +248,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); @@ -226,6 +263,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);