X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.cpp;h=2291a2023471ca4c960b1dd922bbff6896b0aa98;hb=1b23728908f5ec9beb08b2b70737c3903745fddc;hp=8770aba5f2e1fcf19a5de76599c0a5f77a7afb71;hpb=91d87a3ecae2b21a87829442d82e65f071009e92;p=libs%2Fgl.git

diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index 8770aba5..2291a202 100644
--- 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);
 	}
@@ -186,7 +186,7 @@ void EnvironmentMap::set_debug_name(const string &name)
 #ifdef DEBUG
 	env_tex.set_debug_name(name+"/environment.texcb");
 	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]));