X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Flighting.h;h=226dee1c05a740e27a23d53baec2e4416e4a558a;hb=a8383f1163cd020e2ce2c030e93defd2f9909a1d;hp=ca214fc829601c9c26fa05e73e9e6d37f08d46be;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/materials/lighting.h b/source/materials/lighting.h
index ca214fc8..226dee1c 100644
--- a/source/materials/lighting.h
+++ b/source/materials/lighting.h
@@ -21,16 +21,22 @@ class Lighting
 public:
 	class Loader: public DataFile::ObjectLoader<Lighting>
 	{
+	private:
+		static ActionMap shared_actions;
+
 	public:
 		Loader(Lighting &);
 
 	private:
+		virtual void init_actions();
+
 		void ambient(float, float, float);
 		void fog_color(float, float, float);
 		void fog_density(float);
 		void fog_half_distance(float);
 		void horizon_angle(float);
-		void light(unsigned);
+		void light();
+		void light_index(unsigned);
 		void sky_color(float, float, float);
 		void zenith_direction(float, float, float);
 	};
@@ -75,15 +81,21 @@ public:
 	distance is 50%. */
 	void set_fog_half_distance(float);
 
-	/** Attaches a light source. */
-	void attach(unsigned, const Light &);
+	/** Attaches a light source.  If the light was already attached, does
+	nothing. */
+	void attach(const Light &);
 
-	/** Detaches a light source. */
-	void detach(unsigned);
+	/** Detaches a light source.  If the light was not attached, does nothing. */
+	void detach(const Light &);
+
+	DEPRECATED void attach(unsigned, const Light &l) { attach(l); }
+	DEPRECATED void detach(unsigned);
 
 	/** Returns an attached light.  If no light is attached at that index, null
 	is returned. */
-	const Light *get_attached_light(unsigned) const;
+	DEPRECATED const Light *get_attached_light(unsigned) const;
+
+	const std::vector<const Light *> &get_attached_lights() const { return lights; }
 
 	/** Updates a ProgramData object with the uniforms for the Lighting,
 	including all attached light sources.  A view matrix must be passed in. */