X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fambientocclusion.cpp;h=8c1dd616c4b53ba40b49aea69bfd237bd89e1b17;hp=49d712543ccff582f5fd7a5f064e05c25e8d4264;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=a2e5fc44fc4eae17c98a569af1c6bd0baf1f7684

diff --git a/source/ambientocclusion.cpp b/source/ambientocclusion.cpp
index 49d71254..8c1dd616 100644
--- a/source/ambientocclusion.cpp
+++ b/source/ambientocclusion.cpp
@@ -12,17 +12,17 @@ namespace Msp {
 namespace GL {
 
 AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float):
-	occlude_target(w, h, (RENDER_COLOR,RGB)),
+	occlude_target(w, h, (RENDER_COLOR,R8)),
 	occlude_shader("ambientocclusion_occlude.glsl"),
 	combine_shader("ambientocclusion_combine.glsl"),
-	quad(get_fullscreen_quad())
+	quad(get_fullscreen_quad()),
+	linear_sampler(get_linear_sampler()),
+	nearest_sampler(get_nearest_sampler())
 {
-	occlude_target.set_texture_filter(LINEAR);
-	texturing.attach(2, occlude_target.get_target_texture(RENDER_COLOR));
+	texturing.attach(2, occlude_target.get_target_texture(RENDER_COLOR), linear_sampler.get());
 
 	unsigned seed = 1;
-	rotate_lookup.storage(RGBA, 4, 4, 1);
-	rotate_lookup.set_filter(NEAREST);
+	rotate_lookup.storage(RGBA8, 4, 4, 1);
 	unsigned char data[64];
 	for(unsigned i=0; i<16; ++i)
 	{
@@ -34,9 +34,9 @@ AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float):
 		data[i*4+2] = 255-s;
 		data[i*4+3] = ((i+i/4)%2)*255;
 	}
-	rotate_lookup.image(0, RGBA, UNSIGNED_BYTE, data);
+	rotate_lookup.image(0, data);
 
-	texturing.attach(3, rotate_lookup);
+	texturing.attach(3, rotate_lookup, nearest_sampler.get());
 
 	shdata.uniform("source", 0);
 	shdata.uniform("depth", 1);
@@ -47,6 +47,7 @@ AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float):
 	set_n_samples(16);
 	set_occlusion_radius(0.5f);
 	set_darkness(1.0f);
+	set_edge_depth_threshold(0.1f);
 }
 
 float AmbientOcclusion::random(unsigned &seed)
@@ -78,19 +79,20 @@ void AmbientOcclusion::set_occlusion_radius(float r)
 	shdata.uniform("occlusion_radius", r);
 }
 
-void AmbientOcclusion::set_depth_ratio(float)
+void AmbientOcclusion::set_darkness(float darkness)
 {
+	shdata.uniform("darkness", darkness);
 }
 
-void AmbientOcclusion::set_darkness(float darkness)
+void AmbientOcclusion::set_edge_depth_threshold(float edt)
 {
-	shdata.uniform("darkness", darkness);
+	shdata.uniform("edge_depth_threshold", edt);
 }
 
 void AmbientOcclusion::render(Renderer &renderer, const Texture2D &color, const Texture2D &depth)
 {
-	texturing.attach(0, color);
-	texturing.attach(1, depth);
+	texturing.attach(0, color, nearest_sampler.get());
+	texturing.attach(1, depth, nearest_sampler.get());
 
 	if(renderer.get_camera())
 		shdata.uniform("inverse_projection", invert(renderer.get_camera()->get_projection_matrix()));
@@ -101,18 +103,19 @@ void AmbientOcclusion::render(Renderer &renderer, const Texture2D &color, const
 
 	{
 		BindRestore bind_fbo(occlude_target.get_framebuffer());
-		quad.draw(renderer);
+		quad->draw(renderer);
 	}
 
 	renderer.set_shader_program(&combine_shader);
-	quad.draw(renderer);
+	quad->draw(renderer);
 }
 
 
 AmbientOcclusion::Template::Template():
 	n_samples(16),
 	occlusion_radius(0.5f),
-	darkness(1.0f)
+	darkness(1.0f),
+	edge_depth_threshold(0.1f)
 { }
 
 AmbientOcclusion *AmbientOcclusion::Template::create(unsigned width, unsigned height) const
@@ -121,6 +124,7 @@ AmbientOcclusion *AmbientOcclusion::Template::create(unsigned width, unsigned he
 	ao->set_n_samples(n_samples);
 	ao->set_occlusion_radius(occlusion_radius);
 	ao->set_darkness(darkness);
+	ao->set_edge_depth_threshold(edge_depth_threshold);
 	return ao.release();
 }
 
@@ -129,6 +133,7 @@ AmbientOcclusion::Template::Loader::Loader(Template &t):
 	DataFile::DerivedObjectLoader<Template, PostProcessor::Template::Loader>(t)
 {
 	add("darkness", &Template::darkness);
+	add("edge_depth_threshold", &Template::edge_depth_threshold);
 	add("occlusion_radius", &Template::occlusion_radius);
 	add("samples", &Template::n_samples);
 }