Refactor AnimationPlayer ticking

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

diff --git a/source/environmentmap.cpp b/source/environmentmap.cpp
index 8a1dfe399acfae7260c79aa33022a2662337f7b9..b55dd2c7c6cca956d000a4823859b102b9513086 100644 (file)
--- a/source/environmentmap.cpp
+++ b/source/environmentmap.cpp
@@ -25,24 +25,31 @@ EnvironmentMap::EnvironmentMap(unsigned s, Renderable &r, Renderable &e):
 
        // XXX Make the depth range configurable
        camera.set_field_of_view(Geometry::Angle<float>::right());
-       camera.set_aspect(1);
+       camera.set_aspect_ratio(1);
        camera.set_depth_clip(0.1, 100);
 
-       shdata.uniform("environment", 4);
 }
 
-void EnvironmentMap::setup_frame() const
+void EnvironmentMap::setup_frame(Renderer &renderer)
 {
        if(rendered)
                return;
 
        rendered = true;
-       renderable.setup_frame();
-       environment.setup_frame();
+       renderable.setup_frame(renderer);
+       environment.setup_frame(renderer);
 
        const Matrix *matrix = renderable.get_matrix();
-       Vector3 position = (*matrix)*Vector3();
-       camera.set_position(position);
+       if(!matrix)
+               return;
+
+       Renderer::Push push(renderer);
+       Renderer::Exclude exclude1(renderer, renderable);
+       Renderer::Exclude exclude2(renderer, *this);
+
+       camera.set_position(matrix->column(3).slice<3>(0));
+
+       BindRestore bind_fbo(fbo[0]);
        for(unsigned i=0; i<6; ++i)
        {
                TextureCubeFace face = TextureCube::enumerate_faces(i);
@@ -50,14 +57,12 @@ 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.exclude(renderable);
-               env_renderer.render(environment);
+               renderer.set_camera(camera);
+               renderer.render(environment);
        }
-       Framebuffer::unbind();
 }
 
-void EnvironmentMap::finish_frame() const
+void EnvironmentMap::finish_frame()
 {
        if(rendered)
        {
@@ -72,29 +77,17 @@ void EnvironmentMap::render(Renderer &renderer, const Tag &tag) const
        if(!enabled_passes.count(tag))
                return renderer.render(renderable, tag);
 
-       const Matrix &view_matrix = renderer.get_camera()->get_matrix();
-       // XXX The camera should maybe have store its own object matrix
-       float env_mdata[9];
-       env_mdata[0] = view_matrix[0];
-       env_mdata[1] = view_matrix[4];
-       env_mdata[2] = view_matrix[8];
-       env_mdata[3] = view_matrix[1];
-       env_mdata[4] = view_matrix[5];
-       env_mdata[5] = view_matrix[9];
-       env_mdata[6] = view_matrix[2];
-       env_mdata[7] = view_matrix[6];
-       env_mdata[8] = view_matrix[10];
-       shdata.uniform_matrix3("env_eye_matrix", env_mdata);
-
-       env_tex.bind_to(4);
-       TexUnit::activate(0);
-
        Renderer::Push _push_rend(renderer);
+
+       unsigned unit = renderer.allocate_effect_texunit();
+       shdata.uniform("environment", static_cast<int>(unit));
+       Bind _bind_env(env_tex, unit);
+
+       const Matrix &camera_matrix = renderer.get_camera()->get_object_matrix();
+       shdata.uniform("env_eye_matrix", camera_matrix.block<3, 3>(0, 0));
+
        renderer.add_shader_data(shdata);
        renderer.render(renderable, tag);
-
-       env_tex.unbind_from(4);
-       TexUnit::activate(0);
 }
 
 } // namespace GL