X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flighting.h;h=572b2c896ba89a4eb322aae9d03d8d4cd8420de6;hb=df20a7e137542a4156cc5ffa8118d59de6b68547;hp=931d06d3daf8d2e72aede2af04452b0d0a2e740a;hpb=bbd21944fae06f134625b2f5595c3aab36c3aa9e;p=libs%2Fgl.git

diff --git a/source/lighting.h b/source/lighting.h
index 931d06d3..572b2c89 100644
--- a/source/lighting.h
+++ b/source/lighting.h
@@ -17,19 +17,38 @@ class Light;
 Encapsulates global lighting parameters and any number of individual light
 sources.
 */
-class Lighting: public Bindable<Lighting>
+class Lighting
 {
+public:
+	class Loader: public DataFile::ObjectLoader<Lighting>
+	{
+	public:
+		Loader(Lighting &);
+
+	private:
+		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 sky_color(float, float, float);
+		void zenith_direction(float, float, float);
+	};
+
 private:
 	Color ambient;
 	Color sky_color;
-	Vector3 sky_direction;
+	Vector3 zenith_direction;
 	Geometry::Angle<float> horizon_angle;
 	Color fog_color;
 	float fog_density;
 	std::vector<const Light *> lights;
+	std::vector<Light *> owned_data;
 
 public:
 	Lighting();
+	~Lighting();
 
 	/** Sets the ambient lighting color.  Affects all surfaces in the scene. */
 	void set_ambient(const Color &);
@@ -39,9 +58,9 @@ public:
 	/** Sets the color of the sky at zenith.  Has no effect without shaders. */
 	void set_sky_color(const Color &);
 
-	/** Sets the direction of the sky.  Defaults to positive Z axis.  Has no
+	/** Sets the direction of the zenith.  Defaults to positive Z axis.  Has no
 	effect without shaders. */
-	void set_sky_direction(const Vector3 &);
+	void set_zenith_direction(const Vector3 &);
 
 	/** Sets the angle where skylight cuts off, counted from the true horizon.
 	Has no effect without shaders. */
@@ -57,8 +76,7 @@ public:
 	distance is 50%. */
 	void set_fog_half_distance(float);
 
-	/** Attaches a light source.  If the attachment index is greater than
-	LightUnit::get_n_units, the Lighting can't be bound for legacy mode. */
+	/** Attaches a light source. */
 	void attach(unsigned, const Light &);
 
 	/** Detaches a light source. */
@@ -71,10 +89,6 @@ public:
 	/** 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;
-
-	void bind() const;
-
-	static void unbind();
 };
 
 } // namespace GL