X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=40f18d45eff1f0c8d10d2363d8ea2a6123bbc650;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hp=7ce039acb6df2278ff8c2df8c289e63cfd290820;hpb=a80b074c70ec991f27114efd13686038cf42c493;p=libs%2Fgl.git

diff --git a/source/texture.cpp b/source/texture.cpp
index 7ce039ac..40f18d45 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -20,17 +20,17 @@ istream &operator>>(istream &in, TextureFilter &tf)
 	in>>str;
 
 	if(str=="NEAREST")
-		tf=NEAREST;
+		tf = NEAREST;
 	else if(str=="LINEAR")
-		tf=LINEAR;
+		tf = LINEAR;
 	else if(str=="NEAREST_MIPMAP_NEAREST")
-		tf=NEAREST_MIPMAP_NEAREST;
+		tf = NEAREST_MIPMAP_NEAREST;
 	else if(str=="NEAREST_MIPMAP_LINEAR")
-		tf=NEAREST_MIPMAP_LINEAR;
+		tf = NEAREST_MIPMAP_LINEAR;
 	else if(str=="LINEAR_MIPMAP_NEAREST")
-		tf=LINEAR_MIPMAP_NEAREST;
+		tf = LINEAR_MIPMAP_NEAREST;
 	else if(str=="LINEAR_MIPMAP_LINEAR")
-		tf=LINEAR_MIPMAP_LINEAR;
+		tf = LINEAR_MIPMAP_LINEAR;
 	else
 		in.setstate(ios_base::failbit);
 
@@ -43,13 +43,22 @@ void Texture::bind() const
 	if(!target)
 		throw InvalidState("Attempt to bind a texture without target");
 
-	const Texture *cur=TexUnit::current().get_texture();
-	if(cur && cur->target!=target)
-		glDisable(cur->target);
-	if(!cur || cur->target!=target)
-		glEnable(target);
-	glBindTexture(target, id);
-	TexUnit::current().set_texture(this);
+	const Texture *cur = TexUnit::current().get_texture();
+	if(cur!=this)
+	{
+		if(cur && cur->target!=target)
+			glDisable(cur->target);
+		if(!cur || cur->target!=target)
+			glEnable(target);
+		glBindTexture(target, id);
+		TexUnit::current().set_texture(this);
+	}
+}
+
+void Texture::bind_to(unsigned i) const
+{
+	TexUnit::activate(i);
+	bind();
 }
 
 void Texture::parameter(GLenum param, int value)
@@ -73,7 +82,7 @@ Texture::~Texture()
 
 void Texture::unbind()
 {
-	const Texture *cur=TexUnit::current().get_texture();
+	const Texture *cur = TexUnit::current().get_texture();
 	if(!cur)
 		return;
 
@@ -82,6 +91,12 @@ void Texture::unbind()
 	TexUnit::current().set_texture(0);
 }
 
+void Texture::unbind_from(unsigned i)
+{
+	TexUnit::activate(i);
+	unbind();
+}
+
 Texture::Texture():
 	target(0)
 {
@@ -96,7 +111,7 @@ void Texture::maybe_bind() const
 
 
 Texture::Loader::Loader(Texture &t):
-	tex(t)
+	DataFile::ObjectLoader<Texture>(t)
 {
 	add("min_filter", &Loader::min_filter);
 	add("mag_filter", &Loader::mag_filter);
@@ -105,17 +120,17 @@ Texture::Loader::Loader(Texture &t):
 
 void Texture::Loader::min_filter(TextureFilter f)
 {
-	tex.set_min_filter(f);
+	obj.set_min_filter(f);
 }
 
 void Texture::Loader::mag_filter(TextureFilter f)
 {
-	tex.set_mag_filter(f);
+	obj.set_mag_filter(f);
 }
 
 void Texture::Loader::generate_mipmap(bool gm)
 {
-	tex.parameter(GL_GENERATE_MIPMAP_SGIS, gm);
+	obj.parameter(GL_GENERATE_MIPMAP_SGIS, gm);
 }
 
 } // namespace GL