X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flighting.cpp;h=239bdc19d0d03fdb9d0bcfaf58902d4c12abf4f6;hb=50a0c7fd661fe6bfa3f929ad66e47cfab4a0fb87;hp=44a01a5e6ab6ade990bd324d0ea7a0f97a5c8e85;hpb=42ace9ac1350d3ae009bdd2fb335ac1e57d1b36b;p=libs%2Fgl.git

diff --git a/source/lighting.cpp b/source/lighting.cpp
index 44a01a5e..239bdc19 100644
--- a/source/lighting.cpp
+++ b/source/lighting.cpp
@@ -1,19 +1,21 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#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;
+
 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)
@@ -21,12 +23,29 @@ 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>=lights.size())
 		lights.resize(i+1);
 
 	lights[i] = &l;
+	if(current()==this)
+		l.bind_to(i);
 }
 
 void Lighting::detach(unsigned i)
@@ -35,14 +54,32 @@ void Lighting::detach(unsigned i)
 		return;
 
 	lights[i] = 0;
+	if(current()==this)
+		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", 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);
 }
 
 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;
 
-	enable(LIGHTING);
+	enable(GL_LIGHTING);
 	glLightModelfv(GL_LIGHT_MODEL_AMBIENT, &ambient.r);
 	for(unsigned i=0; i<lights.size(); ++i)
 		if(lights[i])
@@ -57,11 +94,9 @@ void Lighting::unbind()
 
 	for(unsigned i=0; i<old->lights.size(); ++i)
 		if(old->lights[i])
-		{
-			Light::activate(i);
-			Light::unbind();
-		}
-	disable(LIGHTING);
+			Light::unbind_from(i);
+
+	disable(GL_LIGHTING);
 }
 
 } // namespace GL