X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=aeea2818debfaaf03345da191b95d7cf39053dc9;hb=7857d9df8852071e404a63988f6ad3ddb8f70916;hp=dc69732fe2f33dafff253b51359898bbcaf1c260;hpb=020811d96d5c823686e5c2b0a392b95d1a321f05;p=libs%2Fgl.git diff --git a/source/texture.cpp b/source/texture.cpp index dc69732f..aeea2818 100644 --- a/source/texture.cpp +++ b/source/texture.cpp @@ -1,11 +1,7 @@ -/* $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 "texture.h" #include "texunit.h" @@ -14,27 +10,35 @@ 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); + 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())); } @@ -66,6 +70,8 @@ void Texture::update_parameter(int mask) const 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) @@ -76,7 +82,7 @@ void Texture::update_parameter(int mask) const 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&cmp_func) + if(mask&COMPARE_FUNC) glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC, cmp_func); } else @@ -95,6 +101,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); @@ -122,6 +144,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); } @@ -140,9 +164,6 @@ void Texture::set_compare_func(Predicate f) void Texture::bind() 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) { @@ -194,14 +215,25 @@ void Texture::unbind_from(unsigned i) Texture::Loader::Loader(Texture &t): DataFile::ObjectLoader(t) { - add("min_filter", &Loader::min_filter); - add("mag_filter", &Loader::mag_filter); + 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_min_filter(f); + obj.set_filter(f); +} + +void Texture::Loader::generate_mipmap(bool gm) +{ + obj.set_generate_mipmap(gm); } void Texture::Loader::mag_filter(TextureFilter f) @@ -209,9 +241,34 @@ void Texture::Loader::mag_filter(TextureFilter f) obj.set_mag_filter(f); } -void Texture::Loader::generate_mipmap(bool gm) +void Texture::Loader::max_anisotropy(float a) { - obj.set_generate_mipmap(gm); + 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