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

diff --git a/source/material.cpp b/source/material.cpp
index 310834f3..0359ab3f 100644
--- a/source/material.cpp
+++ b/source/material.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "gl.h"
 #include "material.h"
 
@@ -21,52 +14,49 @@ Material::Material():
 
 void Material::set_ambient(const Color &a)
 {
-	ambient=a;
+	ambient = a;
 }
 
 void Material::set_diffuse(const Color &d)
 {
-	diffuse=d;
+	diffuse = d;
 }
 
 void Material::set_specular(const Color &s)
 {
-	specular=s;
+	specular = s;
 }
 
 void Material::set_emission(const Color &e)
 {
-	emission=e;
+	emission = e;
 }
 
 void Material::set_shininess(float s)
 {
-	shininess=s;
+	shininess = s;
 }
 
 void Material::bind() const
 {
-	if(current!=this)
+	if(set_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;
+	set_current(0);
 }
 
-const Material *Material::current=0;
-
 
 Material::Loader::Loader(Material &m):
-	mat(m)
+	DataFile::ObjectLoader<Material>(m)
 {
 	add("ambient",   &Loader::ambient);
 	add("diffuse",   &Loader::diffuse);
@@ -77,22 +67,22 @@ Material::Loader::Loader(Material &m):
 
 void Material::Loader::ambient(float r, float g, float b, float a)
 {
-	mat.ambient=GL::Color(r, g, b, a);
+	obj.ambient = GL::Color(r, g, b, a);
 }
 
 void Material::Loader::diffuse(float r, float g, float b, float a)
 {
-	mat.diffuse=GL::Color(r, g, b, a);
+	obj.diffuse = GL::Color(r, g, b, a);
 }
 
 void Material::Loader::specular(float r, float g, float b, float a)
 {
-	mat.specular=GL::Color(r, g, b, a);
+	obj.specular = GL::Color(r, g, b, a);
 }
 
 void Material::Loader::emission(float r, float g, float b, float a)
 {
-	mat.emission=GL::Color(r, g, b, a);
+	obj.emission = GL::Color(r, g, b, a);
 }
 
 } // namespace GL