Refactor the structure of sequence template files

[libs/gl.git] / source / builders / sequencetemplate.cpp

diff --git a/source/builders/sequencetemplate.cpp b/source/builders/sequencetemplate.cpp
index e48750e5f5df9299b25590658e1a6b2d3eae3603..a768d6bd8bc39ddca833735d7c248198631c9c98 100644 (file)
--- a/source/builders/sequencetemplate.cpp
+++ b/source/builders/sequencetemplate.cpp
@@ -22,16 +22,16 @@ SequenceTemplate::~SequenceTemplate()
                delete p.postprocessor_template;
 }
 
-
-SequenceTemplate::PostProcessorRegistry &SequenceTemplate::get_postprocessor_registry()
+template<>
+SequenceTemplate::TemplateRegistry<GL::PostProcessor> &SequenceTemplate::get_registry<GL::PostProcessor>()
 {
-       static PostProcessorRegistry registry;
+       static TemplateRegistry<GL::PostProcessor> registry;
        static bool initialized = false;
        if(!initialized)
        {
-               registry.register_type<AmbientOcclusion>("ambient_occlusion");
-               registry.register_type<Bloom>("bloom");
-               registry.register_type<ColorCurve>("colorcurve");
+               registry.register_type<AmbientOcclusion::Template>("ambient_occlusion");
+               registry.register_type<Bloom::Template>("bloom");
+               registry.register_type<ColorCurve::Template>("colorcurve");
                initialized = true;
        }
        return registry;
@@ -43,14 +43,8 @@ SequenceTemplate::PostProcessor::PostProcessor(GL::PostProcessor::Template *ppt)
 { }
 
 
-SequenceTemplate::PostProcLoader::PostProcLoader()
-{
-       get_postprocessor_registry().invoke_all(*this);
-}
-
-
 SequenceTemplate::Loader::Loader(SequenceTemplate &t, Collection &c):
-       DataFile::CollectionObjectLoader<SequenceTemplate, Resources>(t, &c)
+       CollectionObjectLoader<SequenceTemplate>(t, &c)
 {
        add("hdr", &SequenceTemplate::hdr);
        add("alpha", &SequenceTemplate::alpha);
@@ -58,16 +52,10 @@ SequenceTemplate::Loader::Loader(SequenceTemplate &t, Collection &c):
        add("multisample", &Loader::multisample);
        add("multisample", &Loader::multisample_range);
        add("postprocessor", &Loader::postprocessor);
+       add("postprocessor", &Loader::postprocessor_with_slot);
+       add("renderable", &Loader::renderable);
+       add("renderable", &Loader::renderable_with_default);
        add("step", &Loader::step);
-       add("step", &Loader::step_with_slot);
-
-       // Deprecated
-       add("pass", &Loader::step_with_slot);
-}
-
-void SequenceTemplate::Loader::postprocessor_loaded()
-{
-       obj.postprocessors.push_back(get_postprocessor_template());
 }
 
 void SequenceTemplate::Loader::clear()
@@ -89,27 +77,42 @@ void SequenceTemplate::Loader::multisample_range(unsigned req, unsigned max)
        obj.max_multisample = max;
 }
 
-void SequenceTemplate::Loader::postprocessor(const string &slot)
+void SequenceTemplate::Loader::postprocessor()
 {
-       PostProcLoader ldr;
+       postprocessor_with_slot(string());
+}
+
+void SequenceTemplate::Loader::postprocessor_with_slot(const string &slot)
+{
+       TemplateLoader<GL::PostProcessor> ldr(get_collection());
        load_sub_with(ldr);
        PostProcessor pp;
-       pp.postprocessor_template = ldr.get_postprocessor_template();
+       pp.postprocessor_template = ldr.get_object();
        pp.slot_name = slot;
        obj.postprocessors.push_back(pp);
 }
 
-void SequenceTemplate::Loader::step(const string &tag)
+void SequenceTemplate::Loader::renderable(const string &slot)
 {
-       step_with_slot(tag, string());
+       Renderable rend;
+       rend.slot_name = slot;
+       obj.renderables.push_back(rend);
 }
 
-void SequenceTemplate::Loader::step_with_slot(const string &tag, const string &rend)
+void SequenceTemplate::Loader::renderable_with_default(const string &slot, const string &name)
+{
+       Renderable rend;
+       rend.renderable = &get_collection().get<GL::Renderable>(name);
+       rend.slot_name = slot;
+       obj.renderables.push_back(rend);
+}
+
+void SequenceTemplate::Loader::step(const string &tag, const string &rend)
 {
        Step stp;
        stp.tag = tag;
-       stp.slot_name = rend;
-       Step::Loader ldr(stp, *coll);
+       stp.renderable_name = rend;
+       Step::Loader ldr(stp, get_collection());
        ldr.set_inline_base_name(format("%s/%d.step", get_source(), obj.steps.size()));
        load_sub_with(ldr);
 
@@ -148,8 +151,6 @@ SequenceTemplate::Step::Loader::Loader(Step &p, Collection &c):
        add("depth_test", &Loader::depth_compare);
        add("lighting", &Loader::lighting);
        add("lighting", &Loader::lighting_inline);
-       add("object", &Loader::object);
-       add("scene", &Loader::scene);
        add("stencil_test", &Loader::stencil_test);
 }
 
@@ -181,16 +182,6 @@ void SequenceTemplate::Step::Loader::lighting(const string &name)
        obj.lighting = &get_collection().get<Lighting>(name);
 }
 
-void SequenceTemplate::Step::Loader::object(const string &name)
-{
-       obj.default_renderable = &get_collection().get<GL::Object>(name);
-}
-
-void SequenceTemplate::Step::Loader::scene(const string &name)
-{
-       obj.default_renderable = &get_collection().get<Scene>(name);
-}
-
 void SequenceTemplate::Step::Loader::stencil_test()
 {
        load_sub(obj.stencil_test);