X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fambientocclusion.cpp;h=a519b80aaf7e67090908f159bd076b72cb624b8c;hb=7515dea78777a7184f207d353d23f9ad9917675e;hp=d431bcdd51ea68417a6b285b1b7ba8773542742b;hpb=5bb193f930fb8738d099d630c4d625d82c1215b5;p=libs%2Fgl.git

diff --git a/source/effects/ambientocclusion.cpp b/source/effects/ambientocclusion.cpp
index d431bcdd..a519b80a 100644
--- a/source/effects/ambientocclusion.cpp
+++ b/source/effects/ambientocclusion.cpp
@@ -12,7 +12,7 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float):
+AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h):
 	rotate_lookup(get_or_create_rotate_lookup()),
 	occlude_target(w, h, (COLOR_ATTACHMENT,R8)),
 	occlude_shader(Resources::get_global().get<Program>("_ambientocclusion_occlude.glsl.shader")),
@@ -32,7 +32,7 @@ const Texture2D &AmbientOcclusion::get_or_create_rotate_lookup()
 {
 	Resources &resources = Resources::get_global();
 
-	static const string name = "_ambientocclusion_rotate.tex2d";
+	static const string name = "_ambientocclusion_rotate.tex";
 	Texture2D *rotate_lookup = resources.find<Texture2D>(name);
 	if(rotate_lookup)
 		return *rotate_lookup;
@@ -109,10 +109,14 @@ void AmbientOcclusion::render(Renderer &renderer, const Texture2D &color, const
 	renderer.set_texture("rotate", &rotate_lookup, &nearest_sampler);
 	renderer.set_shader_program(&occlude_shader, &shdata);
 
+	renderer.set_pipeline_key(this);
 	renderer.set_framebuffer(&occlude_target.get_framebuffer());
+	renderer.clear(0);
 	quad.draw(renderer);
 
+	renderer.set_pipeline_key(this, 1);
 	renderer.set_framebuffer(out_fbo);
+	renderer.clear(0);
 	renderer.set_shader_program(&combine_shader);
 	quad.draw(renderer);
 }
@@ -128,13 +132,6 @@ void AmbientOcclusion::set_debug_name(const string &name)
 }
 
 
-AmbientOcclusion::Template::Template():
-	n_samples(16),
-	occlusion_radius(0.5f),
-	darkness(1.0f),
-	edge_depth_threshold(0.1f)
-{ }
-
 AmbientOcclusion *AmbientOcclusion::Template::create(unsigned width, unsigned height) const
 {
 	RefPtr<AmbientOcclusion> ao = new AmbientOcclusion(width/size_divisor, height/size_divisor);