#include <cmath>
#include <msp/core/algorithm.h>
#include <msp/core/maputils.h>
+#include <msp/core/raii.h>
#include "animate.h"
#include "fadeoverlay.h"
#include "sequencer.h"
Sequencer::Loader::Loader(Sequencer &s, Demo &d):
DataFile::ObjectLoader<Sequencer>(s),
- demo(d)
+ demo(d),
+ base_beat(0.0f)
{
+ add("base", &Loader::base);
add("define_action", &Loader::define_action);
add("instant", &Loader::instant);
+ add("repeat", &Loader::repeat);
add("segment", &Loader::segment);
}
+void Sequencer::Loader::base(float b)
+{
+ SetForScope<float> set_base(base_beat, base_beat+b);
+ load_sub_with(*this);
+}
+
void Sequencer::Loader::define_action(const string &n)
{
ActionDefLoader ldr(obj, demo);
segment(beat, beat);
}
+void Sequencer::Loader::repeat(float b, float d, unsigned n)
+{
+ for(unsigned i=0; i<n; ++i)
+ {
+ SetForScope<float> set_base(base_beat, base_beat+b+i*d);
+ load_sub_with(*this);
+ }
+}
+
void Sequencer::Loader::segment(float start, float end)
{
- SegmentLoader ldr(obj, start, end, demo);
+ SegmentLoader ldr(obj, base_beat+start, base_beat+end, demo);
load_sub_with(ldr);
}
DataFile::ObjectLoader<Sequencer>(s),
demo(d)
{
- for(const auto &t: obj.action_types)
- add(t.first, t.second->get_def_loader_func());
-}
-
-void Sequencer::ActionDefLoader::finished()
-{
- if(action)
- action->validate();
+ obj.action_registry.add_all(*this);
}
Sequencer::SegmentLoader::SegmentLoader(Sequencer &s, float b, float e, Demo &d):
- ObjectLoader<Sequencer>(s),
+ ActionDefLoader(s, d),
start_beat(b),
- end_beat(e),
- demo(d)
+ end_beat(e)
{
add("apply", &SegmentLoader::apply);
- for(const auto &t: obj.action_types)
- add(t.first, t.second->get_loader_func());
+}
+
+void Sequencer::SegmentLoader::action_loaded()
+{
+ obj.add_action(*action, start_beat, end_beat);
+ obj.anonymous_actions.push_back(action.release());
}
void Sequencer::SegmentLoader::apply(const string &n)