Bind ProgramData to a Program upon construction

[libs/gl.git] / source / material.h

diff --git a/source/material.h b/source/material.h
index 1da27199aa21ebea2704862527d920de982721c7..fa1612e142d1dca596fe58a59e03491d74b0fc70 100644 (file)
--- 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