Check the flat qualifier from the correct member

[libs/gl.git] / source / materials / lighting.cpp

diff --git a/source/materials/lighting.cpp b/source/materials/lighting.cpp
index 113735040ed22ccfa50ea3f71f2448249a857b16..d8e5400626ae43eb26221ebd92bd748bb8043972 100644 (file)
--- 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);
        }
 }
 
@@ -99,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)
 {
@@ -148,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