Always bind textures in a specific texture unit

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

diff --git a/source/material.h b/source/material.h
index 1da27199aa21ebea2704862527d920de982721c7..3a65f339344787512f59597c1483a3596ec4376c 100644 (file)
--- a/source/material.h
+++ b/source/material.h
@@ -1,14 +1,8 @@
-/* $Id$
-
-This file is part of libmspgl
-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 "bindable.h"
 #include "color.h"
 
 namespace Msp {
@@ -18,17 +12,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 BindableWithDefault<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);
@@ -57,10 +47,6 @@ public:
        const Color &get_emission() const { return emission; }
        float get_shininess() const { return shininess; }
        void bind() const;
-
-       static void unbind();
-private:
-       static const Material *current;
 };
 
 } // namespace GL