X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fambientocclusion.cpp;h=ed7d1636d711d34ee6539fd4ddb11adbb4677f44;hp=af1008b4230cf3283c2fe3362c6815f71d6c078c;hb=99d25b5ef615a23ef63645fea87596b3384b5ede;hpb=1b9640375606a305f19c76cf15406202322b5bdf

diff --git a/source/ambientocclusion.cpp b/source/ambientocclusion.cpp
index af1008b4..ed7d1636 100644
--- a/source/ambientocclusion.cpp
+++ b/source/ambientocclusion.cpp
@@ -12,15 +12,16 @@ namespace Msp {
 namespace GL {
 
 AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float):
-	occlude_target(w, h, (RENDER_COLOR,RGB)),
+	occlude_target(w, h, (RENDER_COLOR,RED)),
 	occlude_shader("ambientocclusion_occlude.glsl"),
 	combine_shader("ambientocclusion_combine.glsl"),
 	quad(get_fullscreen_quad())
 {
+	occlude_target.set_texture_filter(LINEAR);
 	texturing.attach(2, occlude_target.get_target_texture(RENDER_COLOR));
 
 	unsigned seed = 1;
-	rotate_lookup.storage(RGBA, 4, 4);
+	rotate_lookup.storage(RGBA, 4, 4, 1);
 	rotate_lookup.set_filter(NEAREST);
 	unsigned char data[64];
 	for(unsigned i=0; i<16; ++i)
@@ -28,10 +29,10 @@ AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float):
 		Geometry::Angle<float> a = Geometry::Angle<float>::from_turns(random(seed));
 		unsigned char c = (cos(a)*0.5f+0.5f)*255;
 		unsigned char s = (sin(a)*0.5f+0.5f)*255;
-		data[i*3  ] = c;
-		data[i*3+1] = s;
-		data[i*3+2] = 255-s;
-		data[i*3+4] = ((i+i/4)%2)*255;
+		data[i*4  ] = c;
+		data[i*4+1] = s;
+		data[i*4+2] = 255-s;
+		data[i*4+3] = ((i+i/4)%2)*255;
 	}
 	rotate_lookup.image(0, RGBA, UNSIGNED_BYTE, data);
 
@@ -46,12 +47,13 @@ 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)
 {
 	static const unsigned modulus = (1U<<31)-1;
-	seed = (seed*48271)%modulus;  // minstd
+	seed = (static_cast<UInt64>(seed)*48271)%modulus;  // minstd
 	return static_cast<float>(seed)/(modulus-1);
 }
 
@@ -86,6 +88,11 @@ void AmbientOcclusion::set_darkness(float darkness)
 	shdata.uniform("darkness", darkness);
 }
 
+void AmbientOcclusion::set_edge_depth_threshold(float edt)
+{
+	shdata.uniform("edge_depth_threshold", edt);
+}
+
 void AmbientOcclusion::render(Renderer &renderer, const Texture2D &color, const Texture2D &depth)
 {
 	texturing.attach(0, color);
@@ -107,5 +114,33 @@ void AmbientOcclusion::render(Renderer &renderer, const Texture2D &color, const
 	quad.draw(renderer);
 }
 
+
+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);
+	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();
+}
+
+
+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);
+}
+
 } // namespace GL
 } // namespace Msp