X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Flighting.cpp;h=d8e5400626ae43eb26221ebd92bd748bb8043972;hp=cd04d1b4af153a981973c75e7eb8ff642d8f7545;hb=HEAD;hpb=d4b030f46c3a643e813cf31e3faa2b4f3662a160

diff --git a/source/materials/lighting.cpp b/source/materials/lighting.cpp
index cd04d1b4..d8e54006 100644
--- a/source/materials/lighting.cpp
+++ b/source/materials/lighting.cpp
@@ -18,12 +18,13 @@ Lighting::Lighting()
 	set_fog_color(Color(0.0f, 0.0f, 0.0f, 0.0f));
 	set_fog_density(0.0f);
 
-	for(unsigned i=0; i<8; ++i)
+	for(unsigned i=0; i<6; ++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+".enabled", 0);
+		shdata.uniform(base+".type", 0);
+		shdata.uniform(base+".attenuation", 1.0f, 0.0f, 0.0f);
 	}
 }
 
@@ -69,6 +70,12 @@ void Lighting::detach(const Light &l)
 	}
 }
 
+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
 {
 	for(unsigned i=0; i<lights.size(); ++i)
@@ -93,12 +100,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)
 {
@@ -142,10 +143,10 @@ void Lighting::Loader::light(const string &name)
 
 void Lighting::Loader::light_inline()
 {
-	RefPtr<Light> lgt = new Light;
-	load_sub(*lgt);
-	get_collection().add(format("%s/%d.light", FS::basename(get_source()), obj.lights.size()), lgt.get());
-	obj.attach(*lgt.release());
+	Light::GenericLoader ldr(get_collection());
+	load_sub_with(ldr);
+	Light *lgt = ldr.store_object(get_collection(), format("%s/%d.light", FS::basename(get_source()), obj.lights.size()));
+	obj.attach(*lgt);
 }
 
 } // namespace GL