Collapse the shared part of Mesh::draw and draw_instanced

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

diff --git a/source/ambientocclusion.cpp b/source/ambientocclusion.cpp
index 0079009b513750d3f391019d2529d897b55f6f37..3fbaf81a12b6eeb0312eb4a6814aa2762b9ed309 100644 (file)
--- a/source/ambientocclusion.cpp
+++ b/source/ambientocclusion.cpp
@@ -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);
 }