X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.cpp;h=bf09085ba862db8b06aac7606dd05a0f41ec0454;hp=a82731e1e218a1514d9a930a776a2ac08a6a90d1;hb=c8520aa336e92f2eaf9a38c3430c608520a90324;hpb=6b9338845dfee441cd18ad6c633e4feef8ad14e1 diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp index a82731e1..bf09085b 100644 --- a/source/effects/environmentmap.cpp +++ b/source/effects/environmentmap.cpp @@ -1,70 +1,41 @@ #include #include +#include #include "environmentmap.h" #include "mesh.h" #include "renderer.h" #include "resources.h" -#include "texunit.h" 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].fbo.require_complete(); faces[i].camera.set_look_direction(TextureCube::get_face_direction(face)); faces[i].camera.set_up_direction(TextureCube::get_t_direction(face)); faces[i].camera.set_field_of_view(Geometry::Angle::right()); @@ -73,18 +44,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); @@ -100,6 +75,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) @@ -134,27 +115,31 @@ 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); - - BindRestore bind_fbo(faces[0].fbo); for(unsigned i=0; i<6; ++i) { faces[i].camera.set_position(center); - faces[i].fbo.bind(); - faces[i].fbo.clear(); + renderer.set_framebuffer(&faces[i].fbo); renderer.set_camera(faces[i].camera); renderer.render(environment); } - irradiance_fbo.bind(); + renderer.set_framebuffer(&irradiance_fbo); renderer.set_shader_program(&irradiance_shprog, &prefilter_shdata); renderer.set_texture("environment_map", &env_tex, &sampler); fullscreen_mesh.draw(renderer); @@ -163,7 +148,7 @@ void EnvironmentMap::setup_frame(Renderer &renderer) for(unsigned i=0; i(i+1)/specular_fbos.size())); - specular_fbos[i].bind(); + renderer.set_framebuffer(&specular_fbos[i]); fullscreen_mesh.draw(renderer); } } @@ -191,5 +176,28 @@ void EnvironmentMap::render(Renderer &renderer, Tag tag) const renderer.render(renderable, tag); } +void EnvironmentMap::set_debug_name(const string &name) +{ +#ifdef DEBUG + 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) + { + 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.tex"); + irradiance_fbo.set_debug_name(name+" [FBO:irradiance]"); + for(unsigned i=0; i