Always update program uniforms if uniform names have changed

[libs/gl.git] / source / lighting.cpp

diff --git a/source/lighting.cpp b/source/lighting.cpp
index 515733a6b253e13a69f2b8a117680a73f487e6cf..239bdc19d0d03fdb9d0bcfaf58902d4c12abf4f6 100644 (file)
--- a/source/lighting.cpp
+++ b/source/lighting.cpp
@@ -1,7 +1,10 @@
 #include <stdexcept>
+#include <msp/gl/extensions/msp_legacy_features.h>
+#include "error.h"
 #include "light.h"
 #include "lighting.h"
 #include "lightunit.h"
+#include "matrix.h"
 #include "misc.h"
 
 using namespace std;
@@ -10,7 +13,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,11 +23,23 @@ void Lighting::set_ambient(const Color &a)
        ambient = a;
 }
 
-void Lighting::attach(unsigned i, const Light &l)
+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)
 {
-       if(i>=LightUnit::get_n_units())
-               throw out_of_range("Lighting::attach");
+       horizon_angle = a;
+}
 
+void Lighting::attach(unsigned i, const Light &l)
+{
        if(i>=lights.size())
                lights.resize(i+1);
 
@@ -41,9 +58,13 @@ void Lighting::detach(unsigned i)
                Light::unbind_from(i);
 }
 
-void Lighting::update_shader_data(const Matrix &view_matrix)
+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", view_matrix.block<3, 3>(0, 0)*sky_direction);
+       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);
@@ -51,6 +72,10 @@ void Lighting::update_shader_data(const Matrix &view_matrix)
 
 void Lighting::bind() const
 {
+       static Require _req(MSP_legacy_features);
+       if(lights.size()>LightUnit::get_n_units())
+               throw invalid_operation("Lighting::bind");
+
        if(!set_current(this))
                return;