Use the same Renderer to render all faces of EnvironmentMap

[libs/gl.git] / source / environmentmap.cpp

diff --git a/source/environmentmap.cpp b/source/environmentmap.cpp
index c789fe48d0f4c449f628778aac0b1c32f4ecac18..ec406d157681baec5689ef07538f44f6e6f2dd82 100644 (file)
--- a/source/environmentmap.cpp
+++ b/source/environmentmap.cpp
@@ -39,6 +39,7 @@ void EnvironmentMap::setup_frame() const
        renderable.setup_frame();
        environment.setup_frame();
 
+       Renderer env_renderer(0);
        const Matrix *matrix = renderable.get_matrix();
        Vector3 position = (*matrix)*Vector3();
        camera.set_position(position);
@@ -49,8 +50,9 @@ void EnvironmentMap::setup_frame() const
                fbo[i].clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
                camera.set_look_direction(env_tex.get_face_direction(face));
                camera.set_up_direction(env_tex.get_t_direction(face));
-               Renderer env_renderer(&camera);
+               env_renderer.begin(&camera);
                env_renderer.exclude(renderable);
+               env_renderer.exclude(*this);
                env_renderer.render(environment);
        }
        Framebuffer::unbind();
@@ -75,7 +77,7 @@ void EnvironmentMap::render(Renderer &renderer, const Tag &tag) const
 
        unsigned unit = renderer.allocate_effect_texunit();
        shdata.uniform("environment", static_cast<int>(unit));
-       env_tex.bind_to(unit);
+       Bind _bind_env(env_tex, unit);
 
        const Matrix &view_matrix = renderer.get_camera()->get_matrix();
        // XXX The camera should maybe have store its own object matrix
@@ -93,8 +95,6 @@ void EnvironmentMap::render(Renderer &renderer, const Tag &tag) const
 
        renderer.add_shader_data(shdata);
        renderer.render(renderable, tag);
-
-       env_tex.unbind_from(unit);
 }
 
 } // namespace GL