X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.cpp;h=bd44ae04fecac868c2852534726c3d0b4c58df87;hp=d9812c49bc0943d508b2f50ee4b5348c8dcd3fde;hb=fe2fc291a4fc618425c64112c9ffd3519f0b8a3e;hpb=7db40551e9197142b0b6cb7fd883b325684bb8c2

diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index d9812c49..bd44ae04 100644
--- a/source/effects/environmentmap.cpp
+++ b/source/effects/environmentmap.cpp
@@ -10,16 +10,30 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-EnvironmentMap::EnvironmentMap(Resources &resources, unsigned s, Renderable &r, Renderable &e):
+EnvironmentMap::EnvironmentMap(unsigned s, Renderable &r, Renderable &e):
 	Effect(r),
-	size(s),
 	environment(e),
-	sampler(resources.get<Sampler>("_linear_clamp.samp")),
-	rendered(false),
-	update_interval(1),
-	update_delay(0)
+	sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp"))
 {
-	env_tex.storage(RGB8, size, 1);
+	init(s, RGB8);
+}
+
+EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, Renderable &r, Renderable &e):
+	Effect(r),
+	environment(e),
+	sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp"))
+{
+	init(s, f);
+}
+
+void EnvironmentMap::init(unsigned s, PixelFormat f)
+{
+	size = s;
+	rendered = false;
+	update_interval = 1;
+	update_delay = 0;
+
+	env_tex.storage(f, size);
 	depth_buf.storage(DEPTH_COMPONENT32F, size, size);
 	for(unsigned i=0; i<6; ++i)
 	{
@@ -33,6 +47,8 @@ EnvironmentMap::EnvironmentMap(Resources &resources, unsigned s, Renderable &r,
 		faces[i].camera.set_aspect_ratio(1);
 		faces[i].camera.set_depth_clip(0.1, 100);
 	}
+
+	shdata.uniform("env_world_matrix", LinAl::SquareMatrix<float, 3>::identity());
 }
 
 void EnvironmentMap::set_depth_clip(float n, float f)
@@ -107,9 +123,6 @@ void EnvironmentMap::render(Renderer &renderer, Tag tag) const
 
 	Renderer::Push _push_rend(renderer);
 
-	const Matrix &camera_matrix = renderer.get_camera()->get_object_matrix();
-	shdata.uniform("env_eye_matrix", camera_matrix.block<3, 3>(0, 0));
-
 	renderer.set_texture("environment_map", &env_tex, &sampler);
 	renderer.add_shader_data(shdata);
 	renderer.render(renderable, tag);