X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.cpp;h=614b1252b26ba7b2177bf40c3cb9803e4b052a9f;hb=bdcae47bf2f4e49d2d9e4ba15e6f17171ce5fa0c;hp=419f402b8d22287c89bfb89549190ed6a5ae8b07;hpb=083a8227715fa32c841fc2b8126e4ab8d2840ba0;p=libs%2Fgl.git

diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index 419f402b..614b1252 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"
@@ -12,12 +13,12 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, Renderable &r, Renderable &e):
-	EnvironmentMap(s, f, 1, r, e)
+EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, Renderable &c, Renderable &e):
+	EnvironmentMap(s, f, 1, c, e)
 { }
 
-EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable &r, Renderable &e):
-	Effect(r),
+EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable &c, Renderable &e):
+	Effect(c),
 	size(s),
 	environment(e),
 	irradiance_shprog(Resources::get_global().get<Program>("_envmap_irradiance.glsl.shader")),
@@ -105,7 +106,7 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
 		return;
 
 	rendered = true;
-	renderable.setup_frame(renderer);
+	content.setup_frame(renderer);
 
 	if(update_delay)
 	{
@@ -116,12 +117,14 @@ 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;
 	else
 	{
-		const Matrix *matrix = renderable.get_matrix();
+		const Matrix *matrix = content.get_matrix();
 		if(!matrix)
 			return;
 
@@ -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);
@@ -159,22 +160,24 @@ void EnvironmentMap::finish_frame()
 	if(rendered)
 	{
 		rendered = false;
-		renderable.finish_frame();
+		content.finish_frame();
 		environment.finish_frame();
 	}
 }
 
 void EnvironmentMap::render(Renderer &renderer, Tag tag) const
 {
-	if(!enabled_methods.count(tag))
-		return renderer.render(renderable, tag);
+	if(in_setup_frame)
+		return;
+	if(!is_enabled_for_method(tag))
+		return content.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);
+	content.render(renderer, tag);
 }
 
 void EnvironmentMap::set_debug_name(const string &name)