X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fambientocclusion.cpp;h=1cfdff09e8572b83f83442d834008b1724191610;hb=2ba5af95fb7341b0e6b212e28d03208c6747aae5;hp=0079009b513750d3f391019d2529d897b55f6f37;hpb=81e0e39fefd8f50ae2367fe821d58af6273bcea2;p=libs%2Fgl.git

diff --git a/source/ambientocclusion.cpp b/source/ambientocclusion.cpp
index 0079009b..1cfdff09 100644
--- a/source/ambientocclusion.cpp
+++ b/source/ambientocclusion.cpp
@@ -12,7 +12,7 @@ namespace Msp {
 namespace GL {
 
 AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float):
-	occlude_target(w, h, (RENDER_COLOR,RED)),
+	occlude_target(w, h, (RENDER_COLOR,R8)),
 	occlude_shader("ambientocclusion_occlude.glsl"),
 	combine_shader("ambientocclusion_combine.glsl"),
 	quad(get_fullscreen_quad())
@@ -21,8 +21,8 @@ AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float):
 	texturing.attach(2, occlude_target.get_target_texture(RENDER_COLOR));
 
 	unsigned seed = 1;
-	rotate_lookup.storage(RGBA, 4, 4, 1);
-	rotate_lookup.set_filter(NEAREST);
+	rotate_lookup.storage(RGBA8, 4, 4, 1);
+	rotate_lookup.get_default_sampler().set_filter(NEAREST);
 	unsigned char data[64];
 	for(unsigned i=0; i<16; ++i)
 	{
@@ -34,7 +34,7 @@ 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);
 
@@ -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,13 +79,14 @@ 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)
@@ -112,7 +114,8 @@ void AmbientOcclusion::render(Renderer &renderer, const Texture2D &color, const
 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);
 }