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

diff --git a/source/ambientocclusion.cpp b/source/ambientocclusion.cpp
index 5edbf833..49d71254 100644
--- a/source/ambientocclusion.cpp
+++ b/source/ambientocclusion.cpp
@@ -21,7 +21,7 @@ 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);
+	rotate_lookup.storage(RGBA, 4, 4, 1);
 	rotate_lookup.set_filter(NEAREST);
 	unsigned char data[64];
 	for(unsigned i=0; i<16; ++i)
@@ -29,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);
 
@@ -52,7 +52,7 @@ AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float):
 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);
 }
 
@@ -108,5 +108,30 @@ 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)
+{ }
+
+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);
+	return ao.release();
+}
+
+
+AmbientOcclusion::Template::Loader::Loader(Template &t):
+	DataFile::DerivedObjectLoader<Template, PostProcessor::Template::Loader>(t)
+{
+	add("darkness", &Template::darkness);
+	add("occlusion_radius", &Template::occlusion_radius);
+	add("samples", &Template::n_samples);
+}
+
 } // namespace GL
 } // namespace Msp