#include <msp/gl/extensions/sgis_generate_mipmap.h>
#include <msp/strings/format.h>
#include "error.h"
+#include "resources.h"
#include "texture.h"
#include "texunit.h"
void Texture::update_parameter(int mask) const
{
- if(TexUnit::current().get_texture()==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&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);
+ 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)
Texture::Loader::Loader(Texture &t):
- DataFile::ObjectLoader<Texture>(t)
+ DataFile::CollectionObjectLoader<Texture>(t, 0)
{
+ init();
+}
+
+Texture::Loader::Loader(Texture &t, Collection &c):
+ DataFile::CollectionObjectLoader<Texture>(t, &c)
+{
+ init();
+}
+
+void Texture::Loader::init()
+{
+ if(Resources *res = dynamic_cast<Resources *>(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);