X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.cpp;h=310834f3554a50619dcc404f066a269ca952d666;hb=50e504e2171295d5922ddf87b358e0024db3ce40;hp=f165c744fcdf06277c362977954b800c06e6e6df;hpb=5c59a04e253bf7868796fc0dc8e9768ad1988b33;p=libs%2Fgl.git

diff --git a/source/material.cpp b/source/material.cpp
index f165c744..310834f3 100644
--- a/source/material.cpp
+++ b/source/material.cpp
@@ -1,10 +1,11 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include "gl.h"
 #include "material.h"
 
 namespace Msp {
@@ -43,15 +44,26 @@ void Material::set_shininess(float s)
 	shininess=s;
 }
 
-void Material::apply() const
+void Material::bind() const
 {
-	glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, &ambient.r);
-	glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, &diffuse.r);
-	glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &specular.r);
-	glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, &emission.r);
-	glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess);
+	if(current!=this)
+	{
+		glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, &ambient.r);
+		glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, &diffuse.r);
+		glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &specular.r);
+		glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, &emission.r);
+		glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess);
+		current=this;
+	}
 }
 
+void Material::unbind()
+{
+	current=0;
+}
+
+const Material *Material::current=0;
+
 
 Material::Loader::Loader(Material &m):
 	mat(m)