X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Flighting.h;h=92a4bcf8d9478a93074bd318f03c1ad77e905a91;hb=160e9eea29bd10034733d59507fa1bcca36be401;hp=2a8756c3e567442758a9372932d7e958c7214ee6;hpb=3b0cb993f410b05fc6309d41aa292f4e57c35519;p=libs%2Fgl.git

diff --git a/source/materials/lighting.h b/source/materials/lighting.h
index 2a8756c3..92a4bcf8 100644
--- a/source/materials/lighting.h
+++ b/source/materials/lighting.h
@@ -4,7 +4,6 @@
 #include <vector>
 #include <msp/geometry/angle.h>
 #include "color.h"
-#include "gl.h"
 #include "programdata.h"
 
 namespace Msp {
@@ -44,18 +43,25 @@ public:
 	};
 
 private:
+	struct AttachedLight
+	{
+		const Light *light;
+		mutable unsigned generation;
+
+		AttachedLight(const Light *l): light(l), generation(0) { }
+	};
+
 	Color ambient;
 	Color sky_color;
 	Vector3 zenith_direction;
 	Geometry::Angle<float> horizon_angle;
 	Color fog_color;
 	float fog_density;
-	std::vector<const Light *> lights;
-	std::vector<Light *> owned_data;
+	std::vector<AttachedLight> lights;
+	mutable ProgramData shdata;
 
 public:
 	Lighting();
-	~Lighting();
 
 	/** Sets the ambient lighting color.  Affects all surfaces in the scene. */
 	void set_ambient(const Color &);
@@ -63,15 +69,15 @@ public:
 	const Color &get_ambient() const { return ambient; }
 
 	/** Sets the color of the sky at zenith.  Has no effect without shaders. */
-	void set_sky_color(const Color &);
+	DEPRECATED void set_sky_color(const Color &);
 
 	/** Sets the direction of the zenith.  Defaults to positive Z axis.  Has no
 	effect without shaders. */
-	void set_zenith_direction(const Vector3 &);
+	DEPRECATED void set_zenith_direction(const Vector3 &);
 
 	/** Sets the angle where skylight cuts off, counted from the true horizon.
 	Has no effect without shaders. */
-	void set_horizon_angle(const Geometry::Angle<float> &);
+	DEPRECATED void set_horizon_angle(const Geometry::Angle<float> &);
 
 	/** Sets the fog color, which is blended into distant surfaces. */
 	void set_fog_color(const Color &);
@@ -97,11 +103,13 @@ public:
 	is returned. */
 	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. */
-	void update_shader_data(ProgramData &, const Matrix &) const;
+	DEPRECATED void update_shader_data(ProgramData &, const Matrix &) const;
+
+	const ProgramData &get_shader_data() const;
+
+	void set_debug_name(const std::string &);
 };
 
 } // namespace GL