X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Flight.h;h=31dc3c0db709285c7f918820752b9c668d2ddcbf;hp=b775a71188c690ce17d9c78aac0d9d6ac7dce933;hb=42c1534d95e1551c37e64a1dae288e8b75e8d8ba;hpb=47cfca889482f00093ee6fdeaf4f478dc5ea90f2

diff --git a/source/light.h b/source/light.h
index b775a711..31dc3c0d 100644
--- a/source/light.h
+++ b/source/light.h
@@ -2,8 +2,9 @@
 #define MSP_GL_LIGHT_H_
 
 #include <vector>
+#include <msp/datafile/objectloader.h>
 #include "color.h"
-#include "vector.h"
+#include "placeable.h"
 
 namespace Msp {
 namespace GL {
@@ -24,8 +25,24 @@ Pipeline::Pass.
 
 Lights do not cast shadows by themselves.  See ShadowMap for that.
 */
-class Light
+class Light: public Placeable
 {
+public:
+	class Loader: public DataFile::ObjectLoader<Light>
+	{
+	public:
+		Loader(Light &);
+
+	private:
+		void attenuation(float, float, float);
+		void diffuse(float, float, float);
+		void position(float, float, float, float);
+		void specular(float, float, float);
+		void spot_direction(float, float, float);
+		void spot_exponent(float);
+		void spot_cutoff(float);
+	};
+
 private:
 	enum ParameterMask
 	{
@@ -42,6 +59,7 @@ private:
 	Color specular;
 	Vector4 position;
 	Vector3 spot_dir;
+	Vector3 direction;
 	float spot_exp;
 	Geometry::Angle<float> spot_cutoff;
 	float attenuation[3];
@@ -52,6 +70,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 +84,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 &);