X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Flighting.cpp;h=4c22ba3c01e70b01d68852f31f411799fce2f91f;hb=1b23728908f5ec9beb08b2b70737c3903745fddc;hp=b19ebab014c56379fc77fd3abf246d6d1381e215;hpb=a275d25eccad43716c5dcf91f8bc4af2a53c0445;p=libs%2Fgl.git

diff --git a/source/materials/lighting.cpp b/source/materials/lighting.cpp
index b19ebab0..4c22ba3c 100644
--- a/source/materials/lighting.cpp
+++ b/source/materials/lighting.cpp
@@ -1,11 +1,13 @@
 #include <stdexcept>
 #include <cmath>
 #include <msp/core/algorithm.h>
+#include <msp/datafile/collection.h>
+#include <msp/fs/utils.h>
+#include <msp/strings/format.h>
 #include "error.h"
 #include "light.h"
 #include "lighting.h"
 #include "matrix.h"
-#include "misc.h"
 
 using namespace std;
 
@@ -21,12 +23,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;
@@ -79,7 +75,7 @@ void Lighting::attach(const Light &l)
 
 void Lighting::detach(const Light &l)
 {
-	vector<AttachedLight>::iterator i = find_member(lights, &l, &AttachedLight::light);
+	auto i = find_member(lights, &l, &AttachedLight::light);
 	if(i!=lights.end())
 		lights.erase(i);
 }
@@ -153,14 +149,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 +179,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 +196,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 +205,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 +216,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