X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fenvironmentmap.cpp;h=1e6f639a3eb8f89bb1037b94f386fe8c59cfaf1d;hb=78cec1556c85db6beb4f3d9f918b5a1f421719ef;hp=f61d2c40ed9a45507fcf5e87f1db4adf9ce54181;hpb=1d24ddbc35f9e0480d30c66d47b7ea3834c15fbf;p=libs%2Fgl.git

diff --git a/source/environmentmap.cpp b/source/environmentmap.cpp
index f61d2c40..1e6f639a 100644
--- a/source/environmentmap.cpp
+++ b/source/environmentmap.cpp
@@ -39,6 +39,7 @@ void EnvironmentMap::setup_frame() const
 	renderable.setup_frame();
 	environment.setup_frame();
 
+	Renderer env_renderer(0);
 	const Matrix *matrix = renderable.get_matrix();
 	Vector3 position = (*matrix)*Vector3();
 	camera.set_position(position);
@@ -49,8 +50,9 @@ 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));
-		Renderer env_renderer(&camera);
+		env_renderer.begin(&camera);
 		env_renderer.exclude(renderable);
+		env_renderer.exclude(*this);
 		env_renderer.render(environment);
 	}
 	Framebuffer::unbind();
@@ -77,19 +79,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);