X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.cpp;h=a59c14315faf20a6b7ac0ac107835ed59176e9cc;hp=315390b1ca81664c47a2a5c940ef445ee94faa97;hb=HEAD;hpb=f19366d32cc29287a2730cfba90893e407754081 diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp index 315390b1..a59c1431 100644 --- a/source/effects/environmentmap.cpp +++ b/source/effects/environmentmap.cpp @@ -1,7 +1,9 @@ #include #include +#include #include #include "environmentmap.h" +#include "error.h" #include "mesh.h" #include "renderer.h" #include "resources.h" @@ -11,12 +13,13 @@ using namespace std; namespace Msp { namespace GL { -EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, Renderable &r, Renderable &e): - EnvironmentMap(s, f, 1, r, e) +EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, Renderable &c, Renderable &e): + EnvironmentMap(s, f, 1, c, e) { } -EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable &r, Renderable &e): - Effect(r), +EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable &c, Renderable &e): + Effect(c), + size(s), environment(e), irradiance_shprog(Resources::get_global().get("_envmap_irradiance.glsl.shader")), specular_shprog(Resources::get_global().get("_envmap_specular.glsl.shader")), @@ -27,11 +30,6 @@ EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable if(!l || (1U<<(l-1))>=s) throw invalid_argument("EnvironmentMap::EnvironmentMap"); - size = s; - rendered = false; - update_interval = 1; - update_delay = 0; - env_tex.storage(f, size, l); depth_buf.storage(DEPTH_COMPONENT32F, size, size, 1); for(unsigned i=0; i<6; ++i) @@ -54,10 +52,10 @@ EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable if(l>1) { specular_fbos.resize(l-1); - for(unsigned i=1; i face_matrices[6]; @@ -76,7 +74,13 @@ EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable prefilter_shdata.uniform("roughness", 1.0f); } - shdata.uniform("env_world_matrix", LinAl::SquareMatrix::identity()); + shdata.uniform("env_world_matrix", LinAl::Matrix::identity()); +} + +void EnvironmentMap::set_fixed_position(const Vector3 &p) +{ + fixed_position = p; + use_fixed_pos = true; } void EnvironmentMap::set_depth_clip(float n, float f) @@ -102,7 +106,7 @@ void EnvironmentMap::setup_frame(Renderer &renderer) return; rendered = true; - renderable.setup_frame(renderer); + content.setup_frame(renderer); if(update_delay) { @@ -113,33 +117,41 @@ void EnvironmentMap::setup_frame(Renderer &renderer) update_delay = update_interval-1; environment.setup_frame(renderer); - const Matrix *matrix = renderable.get_matrix(); - if(!matrix) - return; + SetFlag set_in(in_setup_frame); - Renderer::Push push(renderer); - Renderer::Exclude exclude1(renderer, renderable); - Renderer::Exclude exclude2(renderer, *this); + Vector3 center; + if(use_fixed_pos) + center = fixed_position; + else + { + const Matrix *matrix = content.get_matrix(); + if(!matrix) + return; - Vector3 center = matrix->column(3).slice<3>(0); + center = matrix->column(3).slice<3>(0); + } + + Renderer::Push push(renderer); for(unsigned i=0; i<6; ++i) { faces[i].camera.set_position(center); renderer.set_framebuffer(&faces[i].fbo); renderer.set_camera(faces[i].camera); - renderer.render(environment); + environment.render(renderer); } + renderer.set_pipeline_key(this); renderer.set_framebuffer(&irradiance_fbo); renderer.set_shader_program(&irradiance_shprog, &prefilter_shdata); - renderer.set_texture("environment_map", &env_tex, &sampler); + renderer.set_texture("environment_map", &env_tex, 0, &sampler); fullscreen_mesh.draw(renderer); renderer.set_shader_program(&specular_shprog); for(unsigned i=0; i(i+1)/specular_fbos.size())); + renderer.set_pipeline_key(this, 1+i); renderer.set_framebuffer(&specular_fbos[i]); fullscreen_mesh.draw(renderer); } @@ -150,28 +162,30 @@ void EnvironmentMap::finish_frame() if(rendered) { rendered = false; - renderable.finish_frame(); + content.finish_frame(); environment.finish_frame(); } } void EnvironmentMap::render(Renderer &renderer, Tag tag) const { - if(!enabled_passes.count(tag)) - return renderer.render(renderable, tag); + if(in_setup_frame) + return; + if(!is_enabled_for_method(tag)) + return content.render(renderer, tag); Renderer::Push _push_rend(renderer); renderer.set_texture("environment_map", &env_tex, &mip_sampler); renderer.set_texture("irradiance_map", &irradiance, &sampler); renderer.add_shader_data(shdata); - renderer.render(renderable, tag); + content.render(renderer, tag); } void EnvironmentMap::set_debug_name(const string &name) { #ifdef DEBUG - env_tex.set_debug_name(name+"/environment.texcb"); + env_tex.set_debug_name(name+"/environment.tex"); depth_buf.set_debug_name(name+"/environment_depth.rbuf"); static const char *const face_names[] = { "X+", "X-", "Y+", "Y-", "Z+", "Z-" }; for(unsigned i=0; i<6; ++i) @@ -180,7 +194,7 @@ void EnvironmentMap::set_debug_name(const string &name) faces[i].camera.set_debug_name(format("%s/%s.camera", name, face_names[i])); } - irradiance.set_debug_name(name+"/irradiance.texcb"); + irradiance.set_debug_name(name+"/irradiance.tex"); irradiance_fbo.set_debug_name(name+" [FBO:irradiance]"); for(unsigned i=0; i &renderables) const +{ + Renderable *content = get_item(renderables, content_name); + Renderable *environment = get_item(renderables, environment_name); + if(!content || !environment) + throw invalid_operation("EnvironmentMap::Template::create"); + + RefPtr env_map = new EnvironmentMap(size, format, roughness_levels, *content, *environment); + if(use_fixed_position) + env_map->set_fixed_position(fixed_position); + env_map->set_depth_clip(near_clip, far_clip); + + create_base(*env_map); + + return env_map.release(); +} + + +DataFile::Loader::ActionMap EnvironmentMap::Template::Loader::shared_actions; + +EnvironmentMap::Template::Loader::Loader(Template &t, Collection &c): + DerivedObjectLoader(t, c) +{ + set_actions(shared_actions); +} + +void EnvironmentMap::Template::Loader::init_actions() +{ + Effect::Template::Loader::init_actions(); + add("depth_clip", &Template::near_clip, &Template::far_clip); + add("environment", &Template::environment_name); + add("fixed_position", &Loader::fixed_position); + add("format", &Template::format); + add("roughness_levels", &Template::roughness_levels); + add("size", &Template::size); +} + +void EnvironmentMap::Template::Loader::fixed_position(float x, float y, float z) +{ + obj.fixed_position = Vector3(x, y, z); + obj.use_fixed_position = true; +} + } // namespace GL } // namespace Msp