X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.cpp;h=419f402b8d22287c89bfb89549190ed6a5ae8b07;hp=1cefde1be840649cab8dab4059366299116d5a10;hb=083a8227715fa32c841fc2b8126e4ab8d2840ba0;hpb=ce3658993ce2f6b7527a04a36a5e1af349c6f2e9 diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp index 1cefde1b..419f402b 100644 --- a/source/effects/environmentmap.cpp +++ b/source/effects/environmentmap.cpp @@ -1,6 +1,8 @@ #include #include +#include #include "environmentmap.h" +#include "error.h" #include "mesh.h" #include "renderer.h" #include "resources.h" @@ -10,58 +12,30 @@ using namespace std; namespace Msp { namespace GL { -EnvironmentMap::EnvironmentMap(unsigned s, Renderable &r, Renderable &e): - Effect(r), - environment(e), - irradiance_shprog(Resources::get_global().get("_envmap_irradiance.glsl.shader")), - specular_shprog(Resources::get_global().get("_envmap_specular.glsl.shader")), - fullscreen_mesh(Resources::get_global().get("_fullscreen_quad.mesh")), - sampler(Resources::get_global().get("_linear_clamp.samp")), - mip_sampler(Resources::get_global().get("_mip_clamp.samp")) -{ - init(s, RGB8, 1); -} - EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, Renderable &r, Renderable &e): - Effect(r), - environment(e), - irradiance_shprog(Resources::get_global().get("_envmap_irradiance.glsl.shader")), - specular_shprog(Resources::get_global().get("_envmap_specular.glsl.shader")), - fullscreen_mesh(Resources::get_global().get("_fullscreen_quad.mesh")), - sampler(Resources::get_global().get("_linear_clamp.samp")), - mip_sampler(Resources::get_global().get("_mip_clamp.samp")) -{ - init(s, f, 1); -} + EnvironmentMap(s, f, 1, r, e) +{ } EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable &r, Renderable &e): Effect(r), + size(s), environment(e), irradiance_shprog(Resources::get_global().get("_envmap_irradiance.glsl.shader")), specular_shprog(Resources::get_global().get("_envmap_specular.glsl.shader")), fullscreen_mesh(Resources::get_global().get("_fullscreen_quad.mesh")), sampler(Resources::get_global().get("_linear_clamp.samp")), mip_sampler(Resources::get_global().get("_mip_clamp.samp")) -{ - init(s, f, l); -} - -void EnvironmentMap::init(unsigned s, PixelFormat f, unsigned l) { 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); + depth_buf.storage(DEPTH_COMPONENT32F, size, size, 1); for(unsigned i=0; i<6; ++i) { - TextureCubeFace face = TextureCube::enumerate_faces(i); - faces[i].fbo.attach(COLOR_ATTACHMENT0, env_tex, face, 0); + TextureCubeFace face = static_cast(i); + faces[i].fbo.set_format((COLOR_ATTACHMENT,f, DEPTH_ATTACHMENT,DEPTH_COMPONENT32F)); + faces[i].fbo.attach(COLOR_ATTACHMENT, env_tex, face, 0); faces[i].fbo.attach(DEPTH_ATTACHMENT, depth_buf); faces[i].camera.set_look_direction(TextureCube::get_face_direction(face)); faces[i].camera.set_up_direction(TextureCube::get_t_direction(face)); @@ -71,18 +45,22 @@ void EnvironmentMap::init(unsigned s, PixelFormat f, unsigned l) } irradiance.storage(f, size/4, 1); - irradiance_fbo.attach_layered(COLOR_ATTACHMENT0, irradiance); + irradiance_fbo.set_format((COLOR_ATTACHMENT,f)); + irradiance_fbo.attach_layered(COLOR_ATTACHMENT, irradiance); if(l>1) { specular_fbos.resize(l-1); for(unsigned i=1; i face_matrices[6]; for(unsigned i=0; i<6; ++i) { - GL::TextureCubeFace face = GL::TextureCube::enumerate_faces(i); + GL::TextureCubeFace face = static_cast(i); GL::Vector3 columns[3]; columns[0] = GL::TextureCube::get_s_direction(face); columns[1] = GL::TextureCube::get_t_direction(face); @@ -98,6 +76,12 @@ void EnvironmentMap::init(unsigned s, PixelFormat f, unsigned l) shdata.uniform("env_world_matrix", LinAl::SquareMatrix::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) { for(unsigned i=0; i<6; ++i) @@ -132,21 +116,26 @@ void EnvironmentMap::setup_frame(Renderer &renderer) update_delay = update_interval-1; environment.setup_frame(renderer); - const Matrix *matrix = renderable.get_matrix(); - if(!matrix) - return; + Vector3 center; + if(use_fixed_pos) + center = fixed_position; + else + { + const Matrix *matrix = renderable.get_matrix(); + if(!matrix) + return; + + center = matrix->column(3).slice<3>(0); + } Renderer::Push push(renderer); Renderer::Exclude exclude1(renderer, renderable); Renderer::Exclude exclude2(renderer, *this); - Vector3 center = matrix->column(3).slice<3>(0); - for(unsigned i=0; i<6; ++i) { faces[i].camera.set_position(center); renderer.set_framebuffer(&faces[i].fbo); - renderer.clear(); renderer.set_camera(faces[i].camera); renderer.render(environment); } @@ -177,7 +166,7 @@ void EnvironmentMap::finish_frame() void EnvironmentMap::render(Renderer &renderer, Tag tag) const { - if(!enabled_passes.count(tag)) + if(!enabled_methods.count(tag)) return renderer.render(renderable, tag); Renderer::Push _push_rend(renderer); @@ -191,16 +180,16 @@ void EnvironmentMap::render(Renderer &renderer, Tag tag) const 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 *face_names[] = { "X+", "X-", "Y+", "Y-", "Z+", "Z-" }; + static const char *const face_names[] = { "X+", "X-", "Y+", "Y-", "Z+", "Z-" }; for(unsigned i=0; i<6; ++i) { faces[i].fbo.set_debug_name(format("%s [FBO:%s]", name, face_names[i])); 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); + + 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