X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fenvironmentmap.cpp;h=9c4df092481789d270669450b18f21b6ff71f1e4;hp=cbb097eaa6370e3b944a73124639b9ca72d5d42c;hb=40e1eba6c489e11a4c9b8865ddcd3ec3d9f83818;hpb=d386eadfd08b556ecb05627a7ceca14652e8b1e5

diff --git a/source/environmentmap.cpp b/source/environmentmap.cpp
index cbb097ea..9c4df092 100644
--- a/source/environmentmap.cpp
+++ b/source/environmentmap.cpp
@@ -1,8 +1,11 @@
+#include <algorithm>
 #include <cmath>
 #include "environmentmap.h"
 #include "renderer.h"
 #include "texunit.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 
@@ -10,7 +13,9 @@ EnvironmentMap::EnvironmentMap(unsigned s, Renderable &r, Renderable &e):
 	Effect(r),
 	size(s),
 	environment(e),
-	rendered(false)
+	rendered(false),
+	update_interval(1),
+	update_delay(0)
 {
 	env_tex.storage(RGB, size);
 	env_tex.set_wrap(CLAMP_TO_EDGE);
@@ -23,13 +28,28 @@ 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::set_update_interval(unsigned i)
+{
+	update_interval = i;
+	update_delay = min(update_delay, update_interval-1);
+}
+
+void EnvironmentMap::queue_update()
+{
+	update_delay = 0;
+}
+
 void EnvironmentMap::setup_frame(Renderer &renderer)
 {
 	if(rendered)
@@ -37,12 +57,27 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
 
 	rendered = true;
 	renderable.setup_frame(renderer);
+
+	if(update_delay)
+	{
+		if(update_interval)
+			--update_delay;
+		return;
+	}
+	update_delay = update_interval-1;
 	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 +85,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()