X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.cpp;h=47cea0904017c2daa7bbeff4328ec7d5d4128573;hb=3867df2040d1fb955158ca3bd8fbf5271ad66fb2;hp=a675f7e249291d759bda1de98417a463874cca91;hpb=4a639bc5e80fce2467855a9e8f4c6cdff2f0adc0;p=libs%2Fgl.git

diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index a675f7e2..47cea090 100644
--- a/source/effects/environmentmap.cpp
+++ b/source/effects/environmentmap.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <cmath>
+#include <msp/strings/format.h>
 #include "environmentmap.h"
 #include "mesh.h"
 #include "renderer.h"
@@ -11,16 +12,8 @@ namespace Msp {
 namespace GL {
 
 EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, Renderable &r, Renderable &e):
-	Effect(r),
-	environment(e),
-	irradiance_shprog(Resources::get_global().get<Program>("_envmap_irradiance.glsl.shader")),
-	specular_shprog(Resources::get_global().get<Program>("_envmap_specular.glsl.shader")),
-	fullscreen_mesh(Resources::get_global().get<Mesh>("_fullscreen_quad.mesh")),
-	sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp")),
-	mip_sampler(Resources::get_global().get<Sampler>("_mip_clamp.samp"))
-{
-	init(s, f, 1);
-}
+	EnvironmentMap(s, f, 1, r, e)
+{ }
 
 EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable &r, Renderable &e):
 	Effect(r),
@@ -30,11 +23,6 @@ EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable
 	fullscreen_mesh(Resources::get_global().get<Mesh>("_fullscreen_quad.mesh")),
 	sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp")),
 	mip_sampler(Resources::get_global().get<Sampler>("_mip_clamp.samp"))
-{
-	init(s, f, l);
-}
-
-void EnvironmentMap::init(unsigned s, PixelFormat f, unsigned l)
 {
 	if(!l || (1U<<(l-1))>=s)
 		throw invalid_argument("EnvironmentMap::EnvironmentMap");
@@ -91,6 +79,12 @@ void EnvironmentMap::init(unsigned s, PixelFormat f, unsigned l)
 	shdata.uniform("env_world_matrix", LinAl::SquareMatrix<float, 3>::identity());
 }
 
+void EnvironmentMap::set_fixed_position(const Vector3 &p)
+{
+	fixed_position = p;
+	use_fixed_pos = true;
+}
+
 void EnvironmentMap::set_depth_clip(float n, float f)
 {
 	for(unsigned i=0; i<6; ++i)
@@ -125,21 +119,26 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
 	update_delay = update_interval-1;
 	environment.setup_frame(renderer);
 
-	const Matrix *matrix = renderable.get_matrix();
-	if(!matrix)
-		return;
+	Vector3 center;
+	if(use_fixed_pos)
+		center = fixed_position;
+	else
+	{
+		const Matrix *matrix = renderable.get_matrix();
+		if(!matrix)
+			return;
+
+		center = matrix->column(3).slice<3>(0);
+	}
 
 	Renderer::Push push(renderer);
 	Renderer::Exclude exclude1(renderer, renderable);
 	Renderer::Exclude exclude2(renderer, *this);
 
-	Vector3 center = matrix->column(3).slice<3>(0);
-
 	for(unsigned i=0; i<6; ++i)
 	{
 		faces[i].camera.set_position(center);
 		renderer.set_framebuffer(&faces[i].fbo);
-		renderer.clear();
 		renderer.set_camera(faces[i].camera);
 		renderer.render(environment);
 	}