X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flighting.cpp;h=a927d622fade9b0c81a916f51ef31bce079bf825;hb=0071618b8eb3553948a2601b6f9e28bd7d2cd817;hp=7f662c72d9ccf55bdb0e5e8831706b9781709360;hpb=9fff9eb832db3b64416ae49bbdc826f33e3ceb19;p=libs%2Fgl.git

diff --git a/source/lighting.cpp b/source/lighting.cpp
index 7f662c72..a927d622 100644
--- a/source/lighting.cpp
+++ b/source/lighting.cpp
@@ -1,4 +1,5 @@
 #include <stdexcept>
+#include <msp/gl/extensions/msp_legacy_features.h>
 #include "error.h"
 #include "light.h"
 #include "lighting.h"
@@ -57,11 +58,16 @@ void Lighting::detach(unsigned i)
 		Light::unbind_from(i);
 }
 
+const Light *Lighting::get_attached_light(unsigned i) const
+{
+	return i<lights.size() ? lights[i] : 0;
+}
+
 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("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)
@@ -71,6 +77,7 @@ void Lighting::update_shader_data(ProgramData &shdata, 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");