X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Flight.h;h=396e276da94f519bfd59c2c1c4c80b8c37ae1efc;hp=b775a71188c690ce17d9c78aac0d9d6ac7dce933;hb=05d70b38a546f35a7687cae6ae3fcd6ab78898b2;hpb=47cfca889482f00093ee6fdeaf4f478dc5ea90f2

diff --git a/source/light.h b/source/light.h
index b775a711..396e276d 100644
--- a/source/light.h
+++ b/source/light.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 #include "color.h"
-#include "vector.h"
+#include "placeable.h"
 
 namespace Msp {
 namespace GL {
@@ -24,7 +24,7 @@ Pipeline::Pass.
 
 Lights do not cast shadows by themselves.  See ShadowMap for that.
 */
-class Light
+class Light: public Placeable
 {
 private:
 	enum ParameterMask
@@ -42,6 +42,7 @@ private:
 	Color specular;
 	Vector4 position;
 	Vector3 spot_dir;
+	Vector3 direction;
 	float spot_exp;
 	Geometry::Angle<float> spot_cutoff;
 	float attenuation[3];
@@ -52,6 +53,7 @@ public:
 
 private:
 	void update_parameter(int, int = -1) const;
+	void update_matrix();
 
 public:
 	/** Sets the diffuse (direction-independent) color of the Light.  Provided
@@ -65,6 +67,10 @@ public:
 	const Color &get_diffuse() const { return diffuse; }
 	const Color &get_specular() const { return specular; }
 
+	/** Sets the postion and orientation of the Light from a matrix.  Negative Z
+	axis is used as the spot direction, other axes are ignored. */
+	virtual void set_matrix(const Matrix &);
+
 	/** Sets the position of the Light.  For a directional light, set the xyz
 	components to a vector pointing towards the light and the w component to 0. */
 	void set_position(const Vector4 &);