X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Flighting.cpp;h=3057d20d77baaccd1e00804ad37521868ff5c342;hb=adc26a2e141a2853b6c5025130c46a46cece4b84;hp=20c812fe58cfd3e6ee7434bef5f10707db67f01c;hpb=5008778dbb1840bf7c6d479800d2b932f8386fb2;p=libs%2Fgl.git

diff --git a/source/materials/lighting.cpp b/source/materials/lighting.cpp
index 20c812fe..3057d20d 100644
--- a/source/materials/lighting.cpp
+++ b/source/materials/lighting.cpp
@@ -17,6 +17,14 @@ Lighting::Lighting()
 	set_ambient(0.2f);
 	set_fog_color(Color(0.0f, 0.0f, 0.0f, 0.0f));
 	set_fog_density(0.0f);
+
+	for(unsigned i=0; i<8; ++i)
+	{
+		string base = format("light_sources[%d]", i);
+		shdata.uniform(base+".position", Vector4(0, 0, 1, 0));
+		shdata.uniform(base+".color", 0.0f, 0.0f, 0.0f);
+		shdata.uniform(base+".type", 0);
+	}
 }
 
 void Lighting::set_ambient(const Color &a)
@@ -55,7 +63,16 @@ void Lighting::detach(const Light &l)
 {
 	auto i = find_member(lights, &l, &AttachedLight::light);
 	if(i!=lights.end())
+	{
 		lights.erase(i);
+		shdata.uniform(format("light_sources[%d].enabled", lights.size()), 0);
+	}
+}
+
+int Lighting::find_light_index(const Light &l) const
+{
+	auto i = find_member(lights, &l, &AttachedLight::light);
+	return (i!=lights.end() ? i-lights.begin() : -1);
 }
 
 const ProgramData &Lighting::get_shader_data() const
@@ -82,12 +99,6 @@ void Lighting::set_debug_name(const string &name)
 
 DataFile::Loader::ActionMap Lighting::Loader::shared_actions;
 
-Lighting::Loader::Loader(Lighting &l):
-	CollectionObjectLoader<Lighting>(l, 0)
-{
-	set_actions(shared_actions);
-}
-
 Lighting::Loader::Loader(Lighting &l, Collection &c):
 	CollectionObjectLoader<Lighting>(l, &c)
 {
@@ -131,8 +142,9 @@ void Lighting::Loader::light(const string &name)
 
 void Lighting::Loader::light_inline()
 {
-	RefPtr<Light> lgt = new Light;
-	load_sub(*lgt);
+	Light::GenericLoader ldr(get_collection());
+	load_sub_with(ldr);
+	RefPtr<Light> lgt = ldr.get_object();
 	get_collection().add(format("%s/%d.light", FS::basename(get_source()), obj.lights.size()), lgt.get());
 	obj.attach(*lgt.release());
 }