Better state tracking for bound objects

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

diff --git a/source/material.h b/source/material.h
index b0c9cd0d3510c2e2d76612bea410f8b13670423a..a787a6d3b7078ee60f706debaf2d62b903c4989f 100644 (file)
--- a/source/material.h
+++ b/source/material.h
@@ -1,14 +1,8 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  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);
@@ -38,6 +28,15 @@ public:
        };
 
 private:
+       enum ParameterMask
+       {
+               AMBIENT = 1,
+               DIFFUSE = 2,
+               SPECULAR = 4,
+               EMISSION = 8,
+               SHININESS = 16
+       };
+
        Color ambient;
        Color diffuse;
        Color specular;
@@ -46,6 +45,11 @@ private:
 
 public:
        Material();
+
+private:
+       void update_parameter(int) const;
+
+public:
        void set_ambient(const Color &a);
        void set_diffuse(const Color &d);
        void set_specular(const Color &s);
@@ -56,7 +60,7 @@ 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;
 };
 
 } // namespace GL