X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fsky.cpp;h=a11a76a971bad75f2c6b82f9933af39ddf0db193;hb=a9e3cf282bd9c5c43e767552b73068e7a56765e2;hp=0744e7b9adaacda6b02be7cfaf775e9a53e97600;hpb=84e0e55710123e54617d342df852007f8b60af24;p=libs%2Fgl.git

diff --git a/source/effects/sky.cpp b/source/effects/sky.cpp
index 0744e7b9..a11a76a9 100644
--- a/source/effects/sky.cpp
+++ b/source/effects/sky.cpp
@@ -13,13 +13,13 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Sky::Sky(Renderable &r, DirectionalLight &s):
-	Effect(r),
+Sky::Sky(Renderable &c, DirectionalLight &s):
+	Effect(c),
 	sun(s),
-	transmittance_lookup(128, 64, (COLOR_ATTACHMENT,RGB16F)),
+	transmittance_lookup(128, 64, (COLOR_ATTACHMENT,RGBA16F)),
 	transmittance_shprog(Resources::get_global().get<Program>("_sky_transmittance.glsl.shader")),
 	transmittance_lookup_dirty(true),
-	distant(256, 128, (COLOR_ATTACHMENT,RGB16F)),
+	distant(256, 128, (COLOR_ATTACHMENT,RGBA16F)),
 	distant_shprog(Resources::get_global().get<Program>("_sky_distant.glsl.shader")),
 	fullscreen_mesh(Resources::get_global().get<Mesh>("_fullscreen_quad.mesh")),
 	backdrop_shprog(Resources::get_global().get<Program>("_sky_backdrop.glsl.shader")),
@@ -101,22 +101,26 @@ void Sky::setup_frame(Renderer &renderer)
 	shdata.uniform("light_dir", -sun.get_direction());
 	sun.set_transmittance(get_transmittance(-sun.get_direction()));
 
-	Renderer::Push push(renderer);
-
-	if(transmittance_lookup_dirty)
 	{
-		transmittance_lookup_dirty = false;
-		renderer.set_framebuffer(&transmittance_lookup.get_framebuffer());
-		renderer.set_shader_program(&transmittance_shprog, &shdata);
+		Renderer::Push push(renderer);
+
+		renderer.add_shader_data(shdata);
+
+		if(transmittance_lookup_dirty)
+		{
+			transmittance_lookup_dirty = false;
+			renderer.set_framebuffer(&transmittance_lookup.get_framebuffer());
+			renderer.set_shader_program(&transmittance_shprog);
+			fullscreen_mesh.draw(renderer);
+		}
+
+		renderer.set_framebuffer(&distant.get_framebuffer());
+		renderer.set_shader_program(&distant_shprog);
+		renderer.set_texture("transmittance_lookup", &transmittance_lookup.get_target_texture(0), &sampler);
 		fullscreen_mesh.draw(renderer);
 	}
 
-	renderer.set_framebuffer(&distant.get_framebuffer());
-	renderer.set_shader_program(&distant_shprog, &shdata);
-	renderer.set_texture("transmittance_lookup", &transmittance_lookup.get_target_texture(0), &sampler);
-	fullscreen_mesh.draw(renderer);
-
-	renderable.setup_frame(renderer);
+	content.setup_frame(renderer);
 }
 
 void Sky::finish_frame()
@@ -124,13 +128,13 @@ void Sky::finish_frame()
 	if(rendered)
 	{
 		rendered = false;
-		renderable.finish_frame();
+		content.finish_frame();
 	}
 }
 
 void Sky::render(Renderer &renderer, Tag tag) const
 {
-	renderable.render(renderer, tag);
+	content.render(renderer, tag);
 
 	if(!is_enabled_for_method(tag))
 		return;