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);
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)
update_parameter(COMPARE_FUNC);
}
-void Texture::bind() const
+void Texture::bind_to(unsigned i) const
{
- 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))
{
+ 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)
{
}
}
-void Texture::bind_to(unsigned i) const
-{
- TexUnit::activate(i);
- bind();
-}
-
-const Texture *Texture::current()
+const Texture *Texture::current(unsigned i)
{
- return TexUnit::current().get_texture();
-}
-
-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);
+ return TexUnit::get_unit(i).get_texture();
}
void Texture::unbind_from(unsigned i)
{
- TexUnit::activate(i);
- unbind();
+ 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):
DataFile::ObjectLoader<Texture>(t)
{
+ add("filter", &Loader::filter);
add("max_anisotropy", &Loader::max_anisotropy);
add("generate_mipmap", &Loader::generate_mipmap);
add("mag_filter", &Loader::mag_filter);
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);