SequenceTemplate::~SequenceTemplate()
{
for(const PostProcessor &p: postprocessors)
delete p.postprocessor_template;
}
SequenceTemplate::~SequenceTemplate()
{
for(const PostProcessor &p: postprocessors)
delete p.postprocessor_template;
}
- 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");
SequenceTemplate::PostProcessor::PostProcessor(GL::PostProcessor::Template *ppt):
postprocessor_template(ppt)
{ }
SequenceTemplate::PostProcessor::PostProcessor(GL::PostProcessor::Template *ppt):
postprocessor_template(ppt)
{ }
{
add("hdr", &SequenceTemplate::hdr);
add("alpha", &SequenceTemplate::alpha);
{
add("hdr", &SequenceTemplate::hdr);
add("alpha", &SequenceTemplate::alpha);
add("multisample", &Loader::multisample);
add("multisample", &Loader::multisample_range);
add("postprocessor", &Loader::postprocessor);
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_with_slot);
-
- // Deprecated
- add("pass", &Loader::step_with_slot);
-}
-
-void SequenceTemplate::Loader::postprocessor_loaded()
-{
- obj.postprocessors.push_back(get_postprocessor_template());
-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)
- stp.slot_name = rend;
- if(coll)
- {
- Step::Loader ldr(stp, *coll);
- ldr.set_inline_base_name(format("%s/%d.step", get_source(), obj.steps.size()));
- load_sub_with(ldr);
- }
- else
- load_sub(stp);
+ 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);
-SequenceTemplate::Step::Loader::Loader(Step &p, Collection *c):
- DataFile::CollectionObjectLoader<Step>(p, c)
+SequenceTemplate::Step::Loader::Loader(Step &p, Collection &c):
+ DataFile::CollectionObjectLoader<Step>(p, &c)
add("depth_test", &Loader::depth_test);
add("depth_test", &Loader::depth_compare);
add("lighting", &Loader::lighting);
add("lighting", &Loader::lighting_inline);
add("depth_test", &Loader::depth_test);
add("depth_test", &Loader::depth_compare);
add("lighting", &Loader::lighting);
add("lighting", &Loader::lighting_inline);
get_collection().add(inline_base_name+".lightn", lightn.get());
obj.lighting = lightn.release();
}
get_collection().add(inline_base_name+".lightn", lightn.get());
obj.lighting = lightn.release();
}
-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);
-}
-