X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flighting.cpp;h=2ba1edc5560e00889ecd31fa01592f121a68a993;hb=70663ae97d5b70a6b468e07dd7e73475a175dc9b;hp=517530a2f128854f964f673411f11eedfc97df87;hpb=f136af6873d7409daffe262b14f632af986bd7dc;p=libs%2Fgl.git

diff --git a/source/lighting.cpp b/source/lighting.cpp
index 517530a2..2ba1edc5 100644
--- a/source/lighting.cpp
+++ b/source/lighting.cpp
@@ -2,6 +2,7 @@
 #include "light.h"
 #include "lighting.h"
 #include "lightunit.h"
+#include "matrix.h"
 #include "misc.h"
 
 using namespace std;
@@ -10,7 +11,9 @@ namespace Msp {
 namespace GL {
 
 Lighting::Lighting():
-	ambient(0.2)
+	ambient(0.2),
+	sky_direction(0, 0, 1),
+	horizon_angle(Geometry::Angle<float>::zero())
 { }
 
 void Lighting::set_ambient(const Color &a)
@@ -18,6 +21,21 @@ void Lighting::set_ambient(const Color &a)
 	ambient = a;
 }
 
+void Lighting::set_sky_color(const Color &s)
+{
+	sky_color = s;
+}
+
+void Lighting::set_sky_direction(const Vector3 &d)
+{
+	sky_direction = d;
+}
+
+void Lighting::set_horizon_angle(const Geometry::Angle<float> &a)
+{
+	horizon_angle = a;
+}
+
 void Lighting::attach(unsigned i, const Light &l)
 {
 	if(i>=LightUnit::get_n_units())
@@ -41,6 +59,18 @@ void Lighting::detach(unsigned i)
 		Light::unbind_from(i);
 }
 
+void Lighting::update_shader_data(ProgramData &shdata, const Matrix &view_matrix) const
+{
+	shdata.uniform("ambient_color", ambient);
+	shdata.uniform("sky_color", sky_color);
+	shdata.uniform("eye_sky_dir", Vector3(view_matrix*Vector4(sky_direction, 0.0f)));
+	shdata.uniform("horizon_limit", horizon_angle.radians());
+
+	for(unsigned i=0; i<lights.size(); ++i)
+		if(lights[i])
+			lights[i]->update_shader_data(shdata, view_matrix, i);
+}
+
 void Lighting::bind() const
 {
 	if(!set_current(this))