X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fenvironmentmap.cpp;h=ae98719f16c623f81cc0045bcd4d040f82884129;hb=922fac753e31d97fc88daa166e93e4c5572bd2ba;hp=8a1dfe399acfae7260c79aa33022a2662337f7b9;hpb=60ca0094db80ea88ad546c98866f73a8d152e02b;p=libs%2Fgl.git

diff --git a/source/environmentmap.cpp b/source/environmentmap.cpp
index 8a1dfe39..ae98719f 100644
--- a/source/environmentmap.cpp
+++ b/source/environmentmap.cpp
@@ -28,7 +28,6 @@ EnvironmentMap::EnvironmentMap(unsigned s, Renderable &r, Renderable &e):
 	camera.set_aspect(1);
 	camera.set_depth_clip(0.1, 100);
 
-	shdata.uniform("environment", 4);
 }
 
 void EnvironmentMap::setup_frame() const
@@ -52,6 +51,7 @@ void EnvironmentMap::setup_frame() const
 		camera.set_up_direction(env_tex.get_t_direction(face));
 		Renderer env_renderer(&camera);
 		env_renderer.exclude(renderable);
+		env_renderer.exclude(*this);
 		env_renderer.render(environment);
 	}
 	Framebuffer::unbind();
@@ -72,6 +72,12 @@ void EnvironmentMap::render(Renderer &renderer, const Tag &tag) const
 	if(!enabled_passes.count(tag))
 		return renderer.render(renderable, tag);
 
+	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 &view_matrix = renderer.get_camera()->get_matrix();
 	// XXX The camera should maybe have store its own object matrix
 	float env_mdata[9];
@@ -86,15 +92,8 @@ void EnvironmentMap::render(Renderer &renderer, const Tag &tag) const
 	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);
 	renderer.add_shader_data(shdata);
 	renderer.render(renderable, tag);
-
-	env_tex.unbind_from(4);
-	TexUnit::activate(0);
 }
 
 } // namespace GL