X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fenvironmentmap.cpp;h=95e2c4394c809a8c05be4515159b2da4fdc02d84;hp=cbb097eaa6370e3b944a73124639b9ca72d5d42c;hb=698e78ecfa30cc3580050996bc236c3ebe65aa2a;hpb=d386eadfd08b556ecb05627a7ceca14652e8b1e5

diff --git a/source/environmentmap.cpp b/source/environmentmap.cpp
index cbb097ea..95e2c439 100644
--- a/source/environmentmap.cpp
+++ b/source/environmentmap.cpp
@@ -23,13 +23,17 @@ EnvironmentMap::EnvironmentMap(unsigned s, Renderable &r, Renderable &e):
 		fbo[i].require_complete();
 	}
 
-	// XXX Make the depth range configurable
 	camera.set_field_of_view(Geometry::Angle<float>::right());
-	camera.set_aspect(1);
+	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);
+}
+
 void EnvironmentMap::setup_frame(Renderer &renderer)
 {
 	if(rendered)
@@ -39,10 +43,17 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
 	renderable.setup_frame(renderer);
 	environment.setup_frame(renderer);
 
-	Renderer env_renderer(0);
 	const Matrix *matrix = renderable.get_matrix();
-	Vector3 position = (*matrix)*Vector3();
-	camera.set_position(position);
+	if(!matrix)
+		return;
+
+	Renderer::Push push(renderer);
+	Renderer::Exclude exclude1(renderer, renderable);
+	Renderer::Exclude exclude2(renderer, *this);
+
+	camera.set_position(matrix->column(3).slice<3>(0));
+
+	BindRestore bind_fbo(fbo[0]);
 	for(unsigned i=0; i<6; ++i)
 	{
 		TextureCubeFace face = TextureCube::enumerate_faces(i);
@@ -50,12 +61,9 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
 		fbo[i].clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
 		camera.set_look_direction(env_tex.get_face_direction(face));
 		camera.set_up_direction(env_tex.get_t_direction(face));
-		env_renderer.begin(&camera);
-		env_renderer.exclude(renderable);
-		env_renderer.exclude(*this);
-		env_renderer.render(environment);
+		renderer.set_camera(camera);
+		renderer.render(environment);
 	}
-	Framebuffer::unbind();
 }
 
 void EnvironmentMap::finish_frame()