X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Flighting.cpp;h=4c22ba3c01e70b01d68852f31f411799fce2f91f;hb=1b23728908f5ec9beb08b2b70737c3903745fddc;hp=eeb4f30ee8e4ca0796ded102bfaf44049f1063c5;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git diff --git a/source/materials/lighting.cpp b/source/materials/lighting.cpp index eeb4f30e..4c22ba3c 100644 --- a/source/materials/lighting.cpp +++ b/source/materials/lighting.cpp @@ -1,10 +1,13 @@ #include #include +#include +#include +#include +#include #include "error.h" #include "light.h" #include "lighting.h" #include "matrix.h" -#include "misc.h" using namespace std; @@ -12,42 +15,42 @@ namespace Msp { namespace GL { Lighting::Lighting(): - ambient(0.2), zenith_direction(0, 0, 1), - horizon_angle(Geometry::Angle::zero()), - fog_color(0.0f, 0.0f, 0.0f, 0.0f), - fog_density(0.0f) -{ } - -Lighting::~Lighting() + horizon_angle(Geometry::Angle::zero()) { - for(vector::iterator i=owned_data.begin(); i!=owned_data.end(); ++i) - delete *i; + set_ambient(0.2f); + set_fog_color(Color(0.0f, 0.0f, 0.0f, 0.0f)); + set_fog_density(0.0f); } void Lighting::set_ambient(const Color &a) { ambient = a; + shdata.uniform("ambient_color", ambient); } void Lighting::set_sky_color(const Color &s) { sky_color = s; + shdata.uniform("sky_color", sky_color); } void Lighting::set_zenith_direction(const Vector3 &d) { zenith_direction = d; + shdata.uniform("world_zenith_dir", zenith_direction); } void Lighting::set_horizon_angle(const Geometry::Angle &a) { horizon_angle = a; + shdata.uniform("horizon_limit", horizon_angle.radians()); } void Lighting::set_fog_color(const Color &c) { fog_color = c; + shdata.uniform("fog_color", fog_color); } void Lighting::set_fog_density(float d) @@ -56,6 +59,7 @@ void Lighting::set_fog_density(float d) throw invalid_argument("Lighting::set_fog_density"); fog_density = d; + shdata.uniform("fog_density", fog_density); } void Lighting::set_fog_half_distance(float d) @@ -63,12 +67,17 @@ void Lighting::set_fog_half_distance(float d) set_fog_density(-log(pow(0.5, 1.0/d))); } -void Lighting::attach(unsigned i, const Light &l) +void Lighting::attach(const Light &l) { - if(i>=lights.size()) - lights.resize(i+1); + if(find_member(lights, &l, &AttachedLight::light)==lights.end()) + lights.push_back(&l); +} - lights[i] = &l; +void Lighting::detach(const Light &l) +{ + auto i = find_member(lights, &l, &AttachedLight::light); + if(i!=lights.end()) + lights.erase(i); } void Lighting::detach(unsigned i) @@ -76,48 +85,83 @@ void Lighting::detach(unsigned i) if(i>=lights.size()) return; - lights[i] = 0; + detach(*lights[i].light); } const Light *Lighting::get_attached_light(unsigned i) const { - return i(0, 0)*zenith_direction); - shdata.uniform("horizon_limit", horizon_angle.radians()); - shdata.uniform("fog_color", fog_color); - shdata.uniform("fog_density", fog_density); + sd.uniform("ambient_color", ambient); + sd.uniform("sky_color", sky_color); + sd.uniform("world_zenith_dir", zenith_direction); + sd.uniform("horizon_limit", horizon_angle.radians()); + sd.uniform("fog_color", fog_color); + sd.uniform("fog_density", fog_density); - // For backwards compatibility - shdata.uniform("eye_sky_dir", view_matrix.block<3, 3>(0, 0)*zenith_direction); + for(unsigned i=0; iupdate_shader_data(sd, i); +} +const ProgramData &Lighting::get_shader_data() const +{ for(unsigned i=0; iupdate_shader_data(shdata, view_matrix, i); + if(lights[i].light->get_generation()!=lights[i].generation) + { + lights[i].light->update_shader_data(shdata, i); + lights[i].generation = lights[i].light->get_generation(); + } + + return shdata; } +void Lighting::set_debug_name(const string &name) +{ +#ifdef DEBUG + shdata.set_debug_name(name+" [UBO]"); +#else + (void)name; +#endif +} + + +DataFile::Loader::ActionMap Lighting::Loader::shared_actions; Lighting::Loader::Loader(Lighting &l): - DataFile::ObjectLoader(l) + CollectionObjectLoader(l, 0) +{ + set_actions(shared_actions); +} + +Lighting::Loader::Loader(Lighting &l, Collection &c): + CollectionObjectLoader(l, &c) +{ + set_actions(shared_actions); +} + +void Lighting::Loader::init_actions() { add("ambient", &Loader::ambient); 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); + + // 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.ambient = Color(r, g, b); + obj.set_ambient(Color(r, g, b)); } void Lighting::Loader::fog_color(float r, float g, float b) @@ -135,19 +179,34 @@ 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::from_degrees(a)); } +#pragma GCC diagnostic pop -void Lighting::Loader::light(unsigned i) +void Lighting::Loader::light(const string &name) +{ + obj.attach(get_collection().get(name)); +} + +void Lighting::Loader::light_inline() { RefPtr lgt = new Light; load_sub(*lgt); - obj.attach(i, *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)); @@ -157,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