X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.h;h=fa1612e142d1dca596fe58a59e03491d74b0fc70;hb=5172d32d67595ea0b70184fadcfcb8e023cccbc8;hp=1da27199aa21ebea2704862527d920de982721c7;hpb=50e504e2171295d5922ddf87b358e0024db3ce40;p=libs%2Fgl.git

diff --git a/source/material.h b/source/material.h
index 1da27199..fa1612e1 100644
--- a/source/material.h
+++ b/source/material.h
@@ -8,7 +8,8 @@ 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 "bindable.h"
 #include "color.h"
 
 namespace Msp {
@@ -18,17 +19,13 @@ namespace GL {
 Stores OpenGL material properties.  Since OpenGL does not support material
 objects, application of material is done with several calls to glMaterial.
 */
-class Material
+class Material: public Bindable<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);
@@ -59,8 +56,6 @@ public:
 	void bind() const;
 
 	static void unbind();
-private:
-	static const Material *current;
 };
 
 } // namespace GL