X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=f6b5f8e4be06f6e0706de648d9a8f30da78bff56;hb=6fd9b09f47ff6a07bd5ca7f9e8887db3486bfcb1;hp=3bd1df67068123a256b7ff7b8067c71f8ff7a1ca;hpb=619aae12e01f25e79626a94c973927e5599e99a5;p=libs%2Fgl.git

diff --git a/source/texture.cpp b/source/texture.cpp
index 3bd1df67..f6b5f8e4 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -64,7 +64,7 @@ Texture::~Texture()
 
 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);
@@ -101,6 +101,12 @@ 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)
@@ -156,18 +162,18 @@ void Texture::set_compare_func(Predicate f)
 	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)
 		{
@@ -177,38 +183,28 @@ void Texture::bind() const
 	}
 }
 
-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);
@@ -219,6 +215,11 @@ Texture::Loader::Loader(Texture &t):
 	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);