X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture.cpp;h=c2ea8ff7b854c95cf6bee17e5bfd43aed772f710;hp=e897ba92a138ab8282e013ce5bb74938bc74b734;hb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;hpb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909 diff --git a/source/texture.cpp b/source/texture.cpp index e897ba92..c2ea8ff7 100644 --- a/source/texture.cpp +++ b/source/texture.cpp @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include "except.h" #include "texture.h" #include "texunit.h" @@ -20,17 +13,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,20 +31,140 @@ istream &operator>>(istream &in, TextureFilter &tf) } +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 LexicalError("Invalid input in TextureWrap conversion"); +} + + +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(current()==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); + } + 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_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) +{ + 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"); + throw InvalidState("Attempt to bind a texture without target (should never happen)"); - const Texture *cur=TexUnit::current().get_texture(); + 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; + } } } @@ -61,28 +174,14 @@ void Texture::bind_to(unsigned i) const bind(); } -void Texture::parameter(GLenum param, int value) -{ - maybe_bind(); - - glTexParameteri(target, param, value); -} - -void Texture::parameter(GLenum param, float value) +const Texture *Texture::current() { - maybe_bind(); - - glTexParameterf(target, param, value); -} - -Texture::~Texture() -{ - glDeleteTextures(1, &id); + 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; @@ -97,25 +196,27 @@ void Texture::unbind_from(unsigned i) unbind(); } -Texture::Texture(): - target(0) + +Texture::Loader::Loader(Texture &t): + DataFile::ObjectLoader(t) { - glGenTextures(1, &id); + 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::maybe_bind() const +void Texture::Loader::generate_mipmap(bool gm) { - if(TexUnit::current().get_texture()!=this) - bind(); + obj.set_generate_mipmap(gm); } - -Texture::Loader::Loader(Texture &t): - DataFile::ObjectLoader(t) +void Texture::Loader::mag_filter(TextureFilter f) { - add("min_filter", &Loader::min_filter); - add("mag_filter", &Loader::mag_filter); - add("generate_mipmap", &Loader::generate_mipmap); + obj.set_mag_filter(f); } void Texture::Loader::min_filter(TextureFilter f) @@ -123,14 +224,24 @@ void Texture::Loader::min_filter(TextureFilter f) obj.set_min_filter(f); } -void Texture::Loader::mag_filter(TextureFilter f) +void Texture::Loader::wrap(TextureWrap w) { - obj.set_mag_filter(f); + obj.set_wrap(w); } -void Texture::Loader::generate_mipmap(bool gm) +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.parameter(GL_GENERATE_MIPMAP_SGIS, gm); + obj.set_wrap_t(w); } } // namespace GL