X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.cpp;h=b9a7124ccd93f786b7e03d816184d483f7de18ec;hp=419f402b8d22287c89bfb89549190ed6a5ae8b07;hb=0fa506250545acb83bc86f1734826544d6f1eda6;hpb=791f266553f0e6c6fc006d96eb9bc2967beb7012

diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index 419f402b..b9a7124c 100644
--- a/source/effects/environmentmap.cpp
+++ b/source/effects/environmentmap.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <cmath>
+#include <msp/core/raii.h>
 #include <msp/strings/format.h>
 #include "environmentmap.h"
 #include "error.h"
@@ -116,6 +117,8 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
 	update_delay = update_interval-1;
 	environment.setup_frame(renderer);
 
+	SetFlag set_in(in_setup_frame);
+
 	Vector3 center;
 	if(use_fixed_pos)
 		center = fixed_position;
@@ -129,15 +132,13 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
 	}
 
 	Renderer::Push push(renderer);
-	Renderer::Exclude exclude1(renderer, renderable);
-	Renderer::Exclude exclude2(renderer, *this);
 
 	for(unsigned i=0; i<6; ++i)
 	{
 		faces[i].camera.set_position(center);
 		renderer.set_framebuffer(&faces[i].fbo);
 		renderer.set_camera(faces[i].camera);
-		renderer.render(environment);
+		environment.render(renderer);
 	}
 
 	renderer.set_framebuffer(&irradiance_fbo);
@@ -166,15 +167,17 @@ void EnvironmentMap::finish_frame()
 
 void EnvironmentMap::render(Renderer &renderer, Tag tag) const
 {
+	if(in_setup_frame)
+		return;
 	if(!enabled_methods.count(tag))
-		return renderer.render(renderable, tag);
+		return renderable.render(renderer, tag);
 
 	Renderer::Push _push_rend(renderer);
 
 	renderer.set_texture("environment_map", &env_tex, &mip_sampler);
 	renderer.set_texture("irradiance_map", &irradiance, &sampler);
 	renderer.add_shader_data(shdata);
-	renderer.render(renderable, tag);
+	renderable.render(renderer, tag);
 }
 
 void EnvironmentMap::set_debug_name(const string &name)