X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.h;h=6614aeeae12cac4c51b0e9b91c320106b256eea1;hb=95e926ee2bb662fe8795546db4bdebd1a0aff85b;hp=b0c9cd0d3510c2e2d76612bea410f8b13670423a;hpb=530ace590ddb8024fbffc944d006aae7876a25f9;p=libs%2Fgl.git

diff --git a/source/material.h b/source/material.h
index b0c9cd0d..6614aeea 100644
--- a/source/material.h
+++ b/source/material.h
@@ -1,14 +1,14 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
 #ifndef MSP_GL_MATERIAL_H_
 #define MSP_GL_MATERIAL_H_
 
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "color.h"
 
 namespace Msp {
@@ -21,14 +21,10 @@ objects, application of material is done with several calls to glMaterial.
 class Material
 {
 public:
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::ObjectLoader<Material>
 	{
-	private:
-		Material &mat;
-
 	public:
 		Loader(Material &);
-		Material &get_object() const { return mat; }
 	
 	private:
 		void ambient(float, float, float, float);
@@ -56,7 +52,11 @@ public:
 	const Color &get_specular() const { return specular; }
 	const Color &get_emission() const { return emission; }
 	float get_shininess() const { return shininess; }
-	void apply() const;
+	void bind() const;
+
+	static void unbind();
+private:
+	static const Material *current;
 };
 
 } // namespace GL