Use a type registry to manage postprocessor types for pipeline templates

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

diff --git a/source/pipelinetemplate.cpp b/source/pipelinetemplate.cpp
index 6fc63227c061c740bcbf4a7257c2c72baff58cd4..8c6dbe501203e0ee9bbcfb7a22fc27e3d869b7d8 100644 (file)
--- a/source/pipelinetemplate.cpp
+++ b/source/pipelinetemplate.cpp
@@ -26,6 +26,21 @@ PipelineTemplate::~PipelineTemplate()
 }
 
 
+PipelineTemplate::PostProcessorRegistry &PipelineTemplate::get_postprocessor_registry()
+{
+       static PostProcessorRegistry registry;
+       static bool initialized = false;
+       if(!initialized)
+       {
+               registry.register_type<AmbientOcclusion>("ambient_occlusion");
+               registry.register_type<Bloom>("bloom");
+               registry.register_type<ColorCurve>("colorcurve");
+               initialized = true;
+       }
+       return registry;
+}
+
+
 PipelineTemplate::Pass::~Pass()
 { }
 
@@ -44,13 +59,12 @@ PipelineTemplate::Loader::Loader(PipelineTemplate &t, Collection &c):
 
 void PipelineTemplate::Loader::init()
 {
-       add("ambient_occlusion", &Loader::postprocessor<AmbientOcclusion>);
-       add("bloom", &Loader::postprocessor<Bloom>);
-       add("colorcurve", &Loader::postprocessor<ColorCurve>);
        add("hdr", &PipelineTemplate::hdr);
        add("multisample", &Loader::multisample);
        add("multisample", &Loader::multisample_range);
        add("pass", &Loader::pass);
+
+       get_postprocessor_registry().add_all(*this);
 }
 
 void PipelineTemplate::Loader::multisample(unsigned samples)
@@ -78,14 +92,6 @@ void PipelineTemplate::Loader::pass(const string &tag, const string &rend)
        obj.passes.push_back(pss);
 }
 
-template<typename T>
-void PipelineTemplate::Loader::postprocessor()
-{
-       RefPtr<typename T::Template> postproc = new typename T::Template;
-       load_sub(*postproc);
-       obj.postprocessors.push_back(postproc.release());
-}
-
 
 PipelineTemplate::Pass::Loader::Loader(Pass &p):
        DataFile::CollectionObjectLoader<Pass>(p, 0)