Split reflection data from Program to a separate struct

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

diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index 87e4898df21a48d07f9cf7346f3926d9b5523d87..2291a2023471ca4c960b1dd922bbff6896b0aa98 100644 (file)
--- a/source/effects/environmentmap.cpp
+++ b/source/effects/environmentmap.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <cmath>
+#include <msp/strings/format.h>
 #include "environmentmap.h"
 #include "mesh.h"
 #include "renderer.h"
@@ -48,7 +49,7 @@ void EnvironmentMap::init(unsigned s, PixelFormat f, unsigned l)
        depth_buf.storage(DEPTH_COMPONENT32F, size, size, 1);
        for(unsigned i=0; i<6; ++i)
        {
-               TextureCubeFace face = TextureCube::enumerate_faces(i);
+               TextureCubeFace face = static_cast<TextureCubeFace>(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);
@@ -75,7 +76,7 @@ void EnvironmentMap::init(unsigned s, PixelFormat f, unsigned l)
                LinAl::Matrix<float, 3, 3> face_matrices[6];
                for(unsigned i=0; i<6; ++i)
                {
-                       GL::TextureCubeFace face = GL::TextureCube::enumerate_faces(i);
+                       GL::TextureCubeFace face = static_cast<TextureCubeFace>(i);
                        GL::Vector3 columns[3];
                        columns[0] = GL::TextureCube::get_s_direction(face);
                        columns[1] = GL::TextureCube::get_t_direction(face);
@@ -139,7 +140,6 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
        {
                faces[i].camera.set_position(center);
                renderer.set_framebuffer(&faces[i].fbo);
-               renderer.clear();
                renderer.set_camera(faces[i].camera);
                renderer.render(environment);
        }