X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fenvironmentmap.cpp;h=b55dd2c7c6cca956d000a4823859b102b9513086;hp=ec406d157681baec5689ef07538f44f6e6f2dd82;hb=a993091fbb8fdb76a1d02be9de59529c14b59cf0;hpb=d895da0ab78b60fb083cb9846ad1a4b4eebde69c

diff --git a/source/environmentmap.cpp b/source/environmentmap.cpp
index ec406d15..b55dd2c7 100644
--- a/source/environmentmap.cpp
+++ b/source/environmentmap.cpp
@@ -25,24 +25,31 @@ EnvironmentMap::EnvironmentMap(unsigned s, Renderable &r, Renderable &e):
 
 	// 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::setup_frame() const
+void EnvironmentMap::setup_frame(Renderer &renderer)
 {
 	if(rendered)
 		return;
 
 	rendered = true;
-	renderable.setup_frame();
-	environment.setup_frame();
+	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,15 +57,12 @@ void EnvironmentMap::setup_frame() const
 		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() const
+void EnvironmentMap::finish_frame()
 {
 	if(rendered)
 	{
@@ -79,19 +83,8 @@ void EnvironmentMap::render(Renderer &renderer, const Tag &tag) const
 	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];
-	env_mdata[0] = view_matrix[0];
-	env_mdata[1] = view_matrix[4];
-	env_mdata[2] = view_matrix[8];
-	env_mdata[3] = view_matrix[1];
-	env_mdata[4] = view_matrix[5];
-	env_mdata[5] = view_matrix[9];
-	env_mdata[6] = view_matrix[2];
-	env_mdata[7] = view_matrix[6];
-	env_mdata[8] = view_matrix[10];
-	shdata.uniform_matrix3("env_eye_matrix", env_mdata);
+	const Matrix &camera_matrix = renderer.get_camera()->get_object_matrix();
+	shdata.uniform("env_eye_matrix", camera_matrix.block<3, 3>(0, 0));
 
 	renderer.add_shader_data(shdata);
 	renderer.render(renderable, tag);