Derive Camera and Light from Placeable

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

diff --git a/source/light.cpp b/source/light.cpp
index f74b3acb149071238d9053d41a400141854085d5..aeb17c5be4a604b79235ade3cd2423d34e83dfb0 100644 (file)
--- a/source/light.cpp
+++ b/source/light.cpp
@@ -63,6 +63,23 @@ void Light::update_parameter(int mask, int index) const
        }
 }
 
+void Light::update_matrix()
+{
+       Vector3 up_dir;
+       if(20*abs(direction.z)>abs(direction.x)+abs(direction.y))
+               up_dir.y = 1;
+       else
+               up_dir.z = 1;
+       Vector3 right_dir = normalize(cross(direction, up_dir));
+
+       Vector4 columns[4];
+       columns[0] = compose(right_dir, 0.0f);
+       columns[1] = compose(cross(right_dir, direction), 0.0f);
+       columns[2] = compose(-direction, 0.0f);
+       columns[3] = position;
+       matrix = Matrix::from_columns(columns);
+}
+
 void Light::set_diffuse(const Color &c)
 {
        diffuse = c;
@@ -75,16 +92,32 @@ void Light::set_specular(const Color &c)
        update_parameter(SPECULAR);
 }
 
+void Light::set_matrix(const Matrix &m)
+{
+       Placeable::set_matrix(m);
+       position = matrix.column(3);
+       spot_dir = normalize(-matrix.column(2).slice<3>(0));
+       direction = (position.w ? spot_dir : normalize(-position.slice<3>(0)));
+       update_parameter(POSITION|SPOT_DIR);
+       update_matrix();
+}
+
 void Light::set_position(const Vector4 &p)
 {
        position = p;
        update_parameter(POSITION);
+       if(!position.w)
+               direction = normalize(-position.slice<3>(0));
+       update_matrix();
 }
 
 void Light::set_spot_direction(const Vector3 &d)
 {
        spot_dir = normalize(d);
+       if(position.w)
+               direction = spot_dir;
        update_parameter(SPOT_DIR);
+       update_matrix();
 }
 
 void Light::set_spot_exponent(float e)