X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Flighting.cpp;h=699aabc02c7daa8679d60b2ab6fd8eaf8d99723b;hp=bcf2bb0e2645772555b2f1bbc2eaa4b6ea3959b2;hb=3ac3a51c623271da815c8ee60c484445871753bf;hpb=a8383f1163cd020e2ce2c030e93defd2f9909a1d

diff --git a/source/materials/lighting.cpp b/source/materials/lighting.cpp
index bcf2bb0e..699aabc0 100644
--- a/source/materials/lighting.cpp
+++ b/source/materials/lighting.cpp
@@ -1,6 +1,7 @@
 #include <stdexcept>
 #include <cmath>
 #include <msp/core/algorithm.h>
+#include <msp/fs/utils.h>
 #include "error.h"
 #include "light.h"
 #include "lighting.h"
@@ -13,42 +14,42 @@ namespace Msp {
 namespace GL {
 
 Lighting::Lighting():
-	ambient(0.2),
 	zenith_direction(0, 0, 1),
-	horizon_angle(Geometry::Angle<float>::zero()),
-	fog_color(0.0f, 0.0f, 0.0f, 0.0f),
-	fog_density(0.0f)
-{ }
-
-Lighting::~Lighting()
+	horizon_angle(Geometry::Angle<float>::zero())
 {
-	for(vector<Light *>::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
-		delete *i;
+	set_ambient(0.2f);
+	set_fog_color(Color(0.0f, 0.0f, 0.0f, 0.0f));
+	set_fog_density(0.0f);
 }
 
 void Lighting::set_ambient(const Color &a)
 {
 	ambient = a;
+	shdata.uniform("ambient_color", ambient);
 }
 
 void Lighting::set_sky_color(const Color &s)
 {
 	sky_color = s;
+	shdata.uniform("sky_color", sky_color);
 }
 
 void Lighting::set_zenith_direction(const Vector3 &d)
 {
 	zenith_direction = d;
+	shdata.uniform("world_zenith_dir", zenith_direction);
 }
 
 void Lighting::set_horizon_angle(const Geometry::Angle<float> &a)
 {
 	horizon_angle = a;
+	shdata.uniform("horizon_limit", horizon_angle.radians());
 }
 
 void Lighting::set_fog_color(const Color &c)
 {
 	fog_color = c;
+	shdata.uniform("fog_color", fog_color);
 }
 
 void Lighting::set_fog_density(float d)
@@ -57,6 +58,7 @@ void Lighting::set_fog_density(float d)
 		throw invalid_argument("Lighting::set_fog_density");
 
 	fog_density = d;
+	shdata.uniform("fog_density", fog_density);
 }
 
 void Lighting::set_fog_half_distance(float d)
@@ -66,13 +68,13 @@ void Lighting::set_fog_half_distance(float d)
 
 void Lighting::attach(const Light &l)
 {
-	if(find(lights, &l)==lights.end())
+	if(find_member(lights, &l, &AttachedLight::light)==lights.end())
 		lights.push_back(&l);
 }
 
 void Lighting::detach(const Light &l)
 {
-	vector<const Light *>::iterator i = find(lights, &l);
+	vector<AttachedLight>::iterator i = find_member(lights, &l, &AttachedLight::light);
 	if(i!=lights.end())
 		lights.erase(i);
 }
@@ -82,36 +84,60 @@ void Lighting::detach(unsigned i)
 	if(i>=lights.size())
 		return;
 
-	detach(*lights[i]);
+	detach(*lights[i].light);
 }
 
 const Light *Lighting::get_attached_light(unsigned i) const
 {
-	return i<lights.size() ? lights[i] : 0;
+	return i<lights.size() ? lights[i].light : 0;
 }
 
-void Lighting::update_shader_data(ProgramData &shdata, const Matrix &view_matrix) const
+void Lighting::update_shader_data(ProgramData &sd, const Matrix &) const
 {
-	shdata.uniform("ambient_color", ambient);
-	shdata.uniform("sky_color", sky_color);
-	shdata.uniform("eye_zenith_dir", view_matrix.block<3, 3>(0, 0)*zenith_direction);
-	shdata.uniform("horizon_limit", horizon_angle.radians());
-	shdata.uniform("fog_color", fog_color);
-	shdata.uniform("fog_density", fog_density);
+	sd.uniform("ambient_color", ambient);
+	sd.uniform("sky_color", sky_color);
+	sd.uniform("world_zenith_dir", zenith_direction);
+	sd.uniform("horizon_limit", horizon_angle.radians());
+	sd.uniform("fog_color", fog_color);
+	sd.uniform("fog_density", fog_density);
 
-	// For backwards compatibility
-	shdata.uniform("eye_sky_dir", view_matrix.block<3, 3>(0, 0)*zenith_direction);
+	for(unsigned i=0; i<lights.size(); ++i)
+		if(lights[i].light)
+			lights[i].light->update_shader_data(sd, i);
+}
 
+const ProgramData &Lighting::get_shader_data() const
+{
 	for(unsigned i=0; i<lights.size(); ++i)
-		if(lights[i])
-			lights[i]->update_shader_data(shdata, view_matrix, i);
+		if(lights[i].light->get_generation()!=lights[i].generation)
+		{
+			lights[i].light->update_shader_data(shdata, i);
+			lights[i].generation = lights[i].light->get_generation();
+		}
+
+	return shdata;
+}
+
+void Lighting::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+	shdata.set_debug_name(name+" [UBO]");
+#else
+	(void)name;
+#endif
 }
 
 
 DataFile::Loader::ActionMap Lighting::Loader::shared_actions;
 
 Lighting::Loader::Loader(Lighting &l):
-	DataFile::ObjectLoader<Lighting>(l)
+	CollectionObjectLoader<Lighting>(l, 0)
+{
+	set_actions(shared_actions);
+}
+
+Lighting::Loader::Loader(Lighting &l, Collection &c):
+	CollectionObjectLoader<Lighting>(l, &c)
 {
 	set_actions(shared_actions);
 }
@@ -122,18 +148,19 @@ void Lighting::Loader::init_actions()
 	add("fog_color", &Loader::fog_color);
 	add("fog_density", &Loader::fog_density);
 	add("fog_half_distance", &Loader::fog_half_distance);
-	add("horizon_angle", &Loader::horizon_angle);
 	add("light", &Loader::light);
-	add("sky_color", &Loader::sky_color);
-	add("zenith_direction", &Loader::zenith_direction);
+	add("light", &Loader::light_inline);
 
 	// Deprecated
-	add("light", &Loader::light_index);
+	add("horizon_angle", &Loader::horizon_angle);
+	add("light", &Loader::light_inline_index);
+	add("sky_color", &Loader::sky_color);
+	add("zenith_direction", &Loader::zenith_direction);
 }
 
 void Lighting::Loader::ambient(float r, float g, float b)
 {
-	obj.ambient = Color(r, g, b);
+	obj.set_ambient(Color(r, g, b));
 }
 
 void Lighting::Loader::fog_color(float r, float g, float b)
@@ -151,24 +178,34 @@ void Lighting::Loader::fog_half_distance(float d)
 	obj.set_fog_half_distance(d);
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 void Lighting::Loader::horizon_angle(float a)
 {
 	obj.set_horizon_angle(Geometry::Angle<float>::from_degrees(a));
 }
+#pragma GCC diagnostic pop
+
+void Lighting::Loader::light(const string &name)
+{
+	obj.attach(get_collection().get<Light>(name));
+}
 
-void Lighting::Loader::light()
+void Lighting::Loader::light_inline()
 {
 	RefPtr<Light> lgt = new Light;
 	load_sub(*lgt);
-	obj.attach(*lgt);
-	obj.owned_data.push_back(lgt.release());
+	get_collection().add(format("%s/%d.light", FS::basename(get_source()), obj.lights.size()), lgt.get());
+	obj.attach(*lgt.release());
 }
 
-void Lighting::Loader::light_index(unsigned)
+void Lighting::Loader::light_inline_index(unsigned)
 {
 	light_inline();
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 void Lighting::Loader::sky_color(float r, float g, float b)
 {
 	obj.set_sky_color(Color(r, g, b));
@@ -178,6 +215,7 @@ void Lighting::Loader::zenith_direction(float x, float y, float z)
 {
 	obj.set_zenith_direction(Vector3(x, y, z));
 }
+#pragma GCC diagnostic pop
 
 } // namespace GL
 } // namespace Msp