Some tweaks to vector component handling

[libs/gl.git] / source / effects / ambientocclusion.cpp

diff --git a/source/effects/ambientocclusion.cpp b/source/effects/ambientocclusion.cpp
index 21271acf2555d8a7f6b474d9cf3657cc69dccdb9..c7fff846fbbe655b7d25f0d5b7daf886ed42d866 100644 (file)
--- a/source/effects/ambientocclusion.cpp
+++ b/source/effects/ambientocclusion.cpp
@@ -2,19 +2,19 @@
 #include "ambientocclusion.h"
 #include "blend.h"
 #include "camera.h"
+#include "mesh.h"
 #include "renderer.h"
 #include "resources.h"
-#include "shader.h"
-#include "tests.h"
+#include "texture2d.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float):
+AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h):
        rotate_lookup(get_or_create_rotate_lookup()),
-       occlude_target(w, h, (RENDER_COLOR,R8)),
+       occlude_target(w, h, (COLOR_ATTACHMENT,R8)),
        occlude_shader(Resources::get_global().get<Program>("_ambientocclusion_occlude.glsl.shader")),
        combine_shader(Resources::get_global().get<Program>("_ambientocclusion_combine.glsl.shader")),
        quad(Resources::get_global().get<Mesh>("_fullscreen_quad.mesh")),
@@ -32,7 +32,7 @@ const Texture2D &AmbientOcclusion::get_or_create_rotate_lookup()
 {
        Resources &resources = Resources::get_global();
 
-       static const string name = "_ambientocclusion_rotate.tex2d";
+       static const string name = "_ambientocclusion_rotate.tex";
        Texture2D *rotate_lookup = resources.find<Texture2D>(name);
        if(rotate_lookup)
                return *rotate_lookup;
@@ -79,7 +79,7 @@ void AmbientOcclusion::set_n_samples(unsigned n)
                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);
        }
-       shdata.uniform3_array("sample_points", n, &sample_points[0].x);
+       shdata.uniform3_array("sample_points", n, &sample_points[0][0]);
        shdata.uniform("n_samples", static_cast<int>(n));
 }
 
@@ -100,18 +100,23 @@ 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);
-       renderer.set_texture("occlusion", &occlude_target.get_target_texture(RENDER_COLOR), &linear_sampler);
+       renderer.set_texture("occlusion", &occlude_target.get_target_texture(COLOR_ATTACHMENT), &linear_sampler);
        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_pipeline_key(this);
+       renderer.set_framebuffer(&occlude_target.get_framebuffer());
+       renderer.clear(0);
+       quad.draw(renderer);
 
+       renderer.set_pipeline_key(this, 1);
+       renderer.set_framebuffer(out_fbo);
+       renderer.clear(0);
        renderer.set_shader_program(&combine_shader);
        quad.draw(renderer);
 }
@@ -127,13 +132,6 @@ void AmbientOcclusion::set_debug_name(const string &name)
 }
 
 
-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);