X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Feffects%2Fsky.cpp;h=be4896fbbd9e725632d5d1dfd8f3fdf0fd9df140;hp=ab322f230e34365e6363c3ea9c867b2be251d79c;hb=HEAD;hpb=083a8227715fa32c841fc2b8126e4ab8d2840ba0

diff --git a/source/effects/sky.cpp b/source/effects/sky.cpp
index ab322f23..be4896fb 100644
--- a/source/effects/sky.cpp
+++ b/source/effects/sky.cpp
@@ -13,18 +13,19 @@ 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")),
 	sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp")),
 	wrap_sampler(Resources::get_global().get<Sampler>("_linear_clamp_v.samp")),
+	dummy_texture(Resources::get_global().get<Texture>("_placeholder.png")),
 	rendered(false)
 {
 	shdata.uniform("n_steps", 50);
@@ -101,22 +102,29 @@ 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_pipeline_key(this);
+			renderer.set_framebuffer(&transmittance_lookup.get_framebuffer());
+			renderer.set_shader_program(&transmittance_shprog);
+			renderer.set_texture("transmittance_lookup", &dummy_texture, &sampler);
+			fullscreen_mesh.draw(renderer);
+		}
+
+		renderer.set_pipeline_key(this, 1);
+		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,19 +132,20 @@ 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(!enabled_methods.count(tag))
+	if(!is_enabled_for_method(tag))
 		return;
 
 	Renderer::Push push(renderer);
 
+	renderer.set_pipeline_key(this, 2);
 	renderer.set_shader_program(&backdrop_shprog, &shdata);
 	renderer.set_texture("distant", &distant.get_target_texture(0), &wrap_sampler);
 	fullscreen_mesh.draw(renderer);
@@ -190,7 +199,11 @@ Sky *Sky::Template::create(const map<string, Renderable *> &renderables) const
 	Renderable *content = get_item(renderables, content_name);
 	if(!content || !sun)
 		throw invalid_operation("Sky::Template::create");
-	return new Sky(*content, *sun);
+
+	RefPtr<Sky> sky = new Sky(*content, *sun);
+	create_base(*sky);
+
+	return sky.release();
 }