Add inline data items to the collection

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

diff --git a/source/materials/lighting.cpp b/source/materials/lighting.cpp
index b19ebab014c56379fc77fd3abf246d6d1381e215..699aabc02c7daa8679d60b2ab6fd8eaf8d99723b 100644 (file)
--- 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"
@@ -21,12 +22,6 @@ Lighting::Lighting():
        set_fog_density(0.0f);
 }
 
-Lighting::~Lighting()
-{
-       for(vector<Light *>::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
-               delete *i;
-}
-
 void Lighting::set_ambient(const Color &a)
 {
        ambient = a;
@@ -153,14 +148,14 @@ 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("light", &Loader::light_inline);
-       add("sky_color", &Loader::sky_color);
-       add("zenith_direction", &Loader::zenith_direction);
 
        // Deprecated
+       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)
@@ -183,10 +178,13 @@ 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)
 {
@@ -197,8 +195,8 @@ 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_inline_index(unsigned)
@@ -206,6 +204,8 @@ 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));
@@ -215,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