X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fambientocclusion.cpp;h=6ba51853d6d288814bd716fbb76881d13e8185af;hb=cd5f37b066352119cf92d53d0001af7ff99be437;hp=a407c2d9918621b3aa9f057fd93597845635f1e9;hpb=7f81f26889b84542b0b35685b0e80383256cdc47;p=libs%2Fgl.git

diff --git a/source/effects/ambientocclusion.cpp b/source/effects/ambientocclusion.cpp
index a407c2d9..6ba51853 100644
--- a/source/effects/ambientocclusion.cpp
+++ b/source/effects/ambientocclusion.cpp
@@ -5,7 +5,6 @@
 #include "renderer.h"
 #include "resources.h"
 #include "shader.h"
-#include "tests.h"
 
 using namespace std;
 
@@ -67,14 +66,14 @@ float AmbientOcclusion::radical_inverse(unsigned n)
 
 void AmbientOcclusion::set_n_samples(unsigned n)
 {
-	if(n<1 || n>32)
+	if(n<1 || n>128)
 		throw out_of_range("AmbientOcclusion::set_n_samples");
 
-	Vector3 sample_points[32];
+	vector<Vector3> sample_points(n);
 	for(unsigned i=0; i<n; ++i)
 	{
-		float z = static_cast<float>(i)/n;
-		float r = sqrt(1.0f-z*z);
+		float r = static_cast<float>(i)/n;
+		float z = sqrt(1.0f-r*r);
 		float d = radical_inverse(i);
 		Geometry::Angle<float> a = Geometry::Angle<float>::from_turns(d);
 		sample_points[i] = Vector3(cos(a)*r, sin(a)*r, z)*(0.1f+0.9f*d*d);
@@ -100,6 +99,8 @@ void AmbientOcclusion::set_edge_depth_threshold(float edt)
 
 void AmbientOcclusion::render(Renderer &renderer, const Texture2D &color, const Texture2D &depth)
 {
+	const Framebuffer *out_fbo = renderer.get_framebuffer();
+
 	Renderer::Push push(renderer);
 	renderer.set_texture("source", &color, &nearest_clamp_sampler);
 	renderer.set_texture("depth", &depth, &nearest_clamp_sampler);
@@ -107,15 +108,24 @@ void AmbientOcclusion::render(Renderer &renderer, const Texture2D &color, const
 	renderer.set_texture("rotate", &rotate_lookup, &nearest_sampler);
 	renderer.set_shader_program(&occlude_shader, &shdata);
 
-	{
-		BindRestore bind_fbo(occlude_target.get_framebuffer());
-		quad.draw(renderer);
-	}
+	renderer.set_framebuffer(&occlude_target.get_framebuffer());
+	quad.draw(renderer);
 
+	renderer.set_framebuffer(out_fbo);
 	renderer.set_shader_program(&combine_shader);
 	quad.draw(renderer);
 }
 
+void AmbientOcclusion::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+	occlude_target.set_debug_name(name+" [RT]");
+	shdata.set_debug_name(name+" [UBO]");
+#else
+	(void)name;
+#endif
+}
+
 
 AmbientOcclusion::Template::Template():
 	n_samples(16),