Fix some incorrect whitespace

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

diff --git a/source/material.h b/source/material.h
index fa1612e142d1dca596fe58a59e03491d74b0fc70..f244636859ccc6bb7ab417e5ebe7b498f6925ff5 100644 (file)
--- a/source/material.h
+++ b/source/material.h
@@ -1,10 +1,3 @@
-/* $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_
 
@@ -19,14 +12,14 @@ 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: public Bindable<Material>
+class Material: public BindableWithDefault<Material>
 {
 public:
        class Loader: public DataFile::ObjectLoader<Material>
        {
        public:
                Loader(Material &);
-       
+
        private:
                void ambient(float, float, float, float);
                void diffuse(float, float, float, float);
@@ -35,6 +28,15 @@ public:
        };
 
 private:
+       enum ParameterMask
+       {
+               AMBIENT = 1,
+               DIFFUSE = 2,
+               SPECULAR = 4,
+               EMISSION = 8,
+               SHININESS = 16
+       };
+
        Color ambient;
        Color diffuse;
        Color specular;
@@ -43,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);
@@ -54,8 +61,6 @@ public:
        const Color &get_emission() const { return emission; }
        float get_shininess() const { return shininess; }
        void bind() const;
-
-       static void unbind();
 };
 
 } // namespace GL