Better state tracking for bound objects

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

diff --git a/source/light.h b/source/light.h
index 5871ec72d2ea65c3ef3d43721387d47bf86d1a64..1c6a52272f56db8597103093c99a3050602fa7b3 100644 (file)
--- a/source/light.h
+++ b/source/light.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_LIGHT_H_
 #define MSP_GL_LIGHT_H_
 
@@ -18,7 +11,17 @@ namespace GL {
 class Light
 {
 private:
-       Color ambient;
+       enum ParameterMask
+       {
+               DIFFUSE = 1,
+               SPECULAR = 2,
+               POSITION = 4,
+               SPOT_DIR = 8,
+               SPOT_EXP = 16,
+               SPOT_CUTOFF = 32,
+               ATTENUATION = 64
+       };
+
        Color diffuse;
        Color specular;
        Vector4 position;
@@ -27,16 +30,15 @@ private:
        float spot_cutoff;
        float attenuation[3];
 
-       static unsigned current_unit;
-       static std::vector<const Light *> current_lights;
-
 public:
        Light();
 
-       void set_ambient(const Color &c);
+private:
+       void update_parameter(int, int = -1) const;
+
+public:
        void set_diffuse(const Color &c);
        void set_specular(const Color &c);
-       const Color &get_ambient() const { return ambient; }
        const Color &get_diffuse() const { return diffuse; }
        const Color &get_specular() const { return specular; }
 
@@ -51,14 +53,12 @@ public:
        void set_attenuation(float, float, float);
        const float *get_attenuation() const { return attenuation; }
 
-       void bind() const;
+       void bind() const { return bind_to(0); }
        void bind_to(unsigned) const;
 
-       // Deprecated
-       void set_position(float x, float y, float z, float w) { set_position(Vector4(x, y, z, w)); }
-
-       static void activate(unsigned);
-       static void unbind();
+       static const Light *current(unsigned = 0);
+       static void unbind() { return unbind_from(0); }
+       static void unbind_from(unsigned);
 };
 
 } // namespace GL