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

diff --git a/source/effects/sky.cpp b/source/effects/sky.cpp
index a11a76a9..be4896fb 100644
--- a/source/effects/sky.cpp
+++ b/source/effects/sky.cpp
@@ -25,6 +25,7 @@ Sky::Sky(Renderable &c, DirectionalLight &s):
 	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);
@@ -109,11 +110,14 @@ void Sky::setup_frame(Renderer &renderer)
 		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);
@@ -141,6 +145,7 @@ void Sky::render(Renderer &renderer, Tag tag) const
 
 	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);
@@ -194,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();
 }