#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;
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;
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);
}
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)
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)
{
{
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)
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));
{
obj.set_zenith_direction(Vector3(x, y, z));
}
+#pragma GCC diagnostic pop
} // namespace GL
} // namespace Msp