X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fenvironmentmap.cpp;h=f61d2c40ed9a45507fcf5e87f1db4adf9ce54181;hb=f159ebc4120fb057c9d59efb0e5c7c36bff6f40a;hp=be0bf4109f9c64e6f27796ab1c5b865385624fd1;hpb=6fd9b09f47ff6a07bd5ca7f9e8887db3486bfcb1;p=libs%2Fgl.git

diff --git a/source/environmentmap.cpp b/source/environmentmap.cpp
index be0bf410..f61d2c40 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
@@ -72,6 +71,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,13 +91,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);
-
-	Renderer::Push _push_rend(renderer);
 	renderer.add_shader_data(shdata);
 	renderer.render(renderable, tag);
-
-	env_tex.unbind_from(4);
 }
 
 } // namespace GL