X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.cpp;h=d9812c49bc0943d508b2f50ee4b5348c8dcd3fde;hb=7db40551e9197142b0b6cb7fd883b325684bb8c2;hp=0216ffc22aad0ca7b31c0527b437d3c616d828a4;hpb=9a63244c1342337915c4610401a24c09fa72cc3d;p=libs%2Fgl.git

diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index 0216ffc2..d9812c49 100644
--- a/source/effects/environmentmap.cpp
+++ b/source/effects/environmentmap.cpp
@@ -23,19 +23,22 @@ EnvironmentMap::EnvironmentMap(Resources &resources, unsigned s, Renderable &r,
 	depth_buf.storage(DEPTH_COMPONENT32F, size, size);
 	for(unsigned i=0; i<6; ++i)
 	{
-		fbo[i].attach(COLOR_ATTACHMENT0, env_tex, TextureCube::enumerate_faces(i), 0);
-		fbo[i].attach(DEPTH_ATTACHMENT, depth_buf);
-		fbo[i].require_complete();
+		TextureCubeFace face = TextureCube::enumerate_faces(i);
+		faces[i].fbo.attach(COLOR_ATTACHMENT0, env_tex, face, 0);
+		faces[i].fbo.attach(DEPTH_ATTACHMENT, depth_buf);
+		faces[i].fbo.require_complete();
+		faces[i].camera.set_look_direction(TextureCube::get_face_direction(face));
+		faces[i].camera.set_up_direction(TextureCube::get_t_direction(face));
+		faces[i].camera.set_field_of_view(Geometry::Angle<float>::right());
+		faces[i].camera.set_aspect_ratio(1);
+		faces[i].camera.set_depth_clip(0.1, 100);
 	}
-
-	camera.set_field_of_view(Geometry::Angle<float>::right());
-	camera.set_aspect_ratio(1);
-	camera.set_depth_clip(0.1, 100);
 }
 
 void EnvironmentMap::set_depth_clip(float n, float f)
 {
-	camera.set_depth_clip(n, f);
+	for(unsigned i=0; i<6; ++i)
+		faces[i].camera.set_depth_clip(n, f);
 }
 
 void EnvironmentMap::set_update_interval(unsigned i)
@@ -74,17 +77,15 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
 	Renderer::Exclude exclude1(renderer, renderable);
 	Renderer::Exclude exclude2(renderer, *this);
 
-	camera.set_position(matrix->column(3).slice<3>(0));
+	Vector3 center = matrix->column(3).slice<3>(0);
 
-	BindRestore bind_fbo(fbo[0]);
+	BindRestore bind_fbo(faces[0].fbo);
 	for(unsigned i=0; i<6; ++i)
 	{
-		TextureCubeFace face = TextureCube::enumerate_faces(i);
-		fbo[i].bind();
-		fbo[i].clear();
-		camera.set_look_direction(TextureCube::get_face_direction(face));
-		camera.set_up_direction(TextureCube::get_t_direction(face));
-		renderer.set_camera(camera);
+		faces[i].camera.set_position(center);
+		faces[i].fbo.bind();
+		faces[i].fbo.clear();
+		renderer.set_camera(faces[i].camera);
 		renderer.render(environment);
 	}
 }
@@ -99,21 +100,17 @@ void EnvironmentMap::finish_frame()
 	}
 }
 
-void EnvironmentMap::render(Renderer &renderer, const Tag &tag) const
+void EnvironmentMap::render(Renderer &renderer, 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_sampler(sampler, unit);
-	Bind _bind_env(env_tex, unit);
-
 	const Matrix &camera_matrix = renderer.get_camera()->get_object_matrix();
 	shdata.uniform("env_eye_matrix", camera_matrix.block<3, 3>(0, 0));
 
+	renderer.set_texture("environment_map", &env_tex, &sampler);
 	renderer.add_shader_data(shdata);
 	renderer.render(renderable, tag);
 }