-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "except.h"
+#include <msp/gl/extensions/ext_texture_filter_anisotropic.h>
+#include <msp/gl/extensions/sgis_generate_mipmap.h>
+#include <msp/strings/format.h>
+#include "error.h"
#include "texture.h"
#include "texunit.h"
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()));
}
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)
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);
void Texture::set_generate_mipmap(bool gm)
{
+ if(gm)
+ static Require _req(SGIS_generate_mipmap);
gen_mipmap = gm;
update_parameter(GENERATE_MIPMAP);
}
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)
{
Texture::Loader::Loader(Texture &t):
DataFile::ObjectLoader<Texture>(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)
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