X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsequencer.cpp;h=0297c4397ff254bf30d26d95a44f4ec7909a1122;hb=5296c1532980c5918ac91370e7dd670d673edb85;hp=3807e1c15a760777273cc65a0c7030287f8c7467;hpb=423a982cb00a9ec74fc154d729cbf88518adc6d8;p=libs%2Fdemoscene.git

diff --git a/source/sequencer.cpp b/source/sequencer.cpp
index 3807e1c..0297c43 100644
--- a/source/sequencer.cpp
+++ b/source/sequencer.cpp
@@ -1,6 +1,7 @@
 #include <cmath>
 #include <msp/core/algorithm.h>
 #include <msp/core/maputils.h>
+#include "animate.h"
 #include "fadeoverlay.h"
 #include "sequencer.h"
 #include "stage.h"
@@ -15,8 +16,10 @@ Sequencer::Sequencer(float bpm):
 {
 	set_beats_per_minute(bpm);
 
+	register_action_type<Animate>("animate");
 	register_action_type<FadeOverlay::Fade>("fade");
 	register_action_type<Stage::UseInView>("use_stage");
+	register_action_type<Stage::SetCamera>("set_camera");
 }
 
 void Sequencer::set_beats_per_minute(float bpm)
@@ -34,12 +37,12 @@ void Sequencer::add_action(Action &act, float sb, float eb)
 	if(sb<0 || sb>eb)
 		throw invalid_argument("Sequencer::add_action");
 
-	Segment seq_act;
-	seq_act.action = &act;
-	seq_act.start_beat = sb;
-	seq_act.end_beat = eb;
+	Segment seg;
+	seg.action = &act;
+	seg.start_beat = sb;
+	seg.end_beat = eb;
 	auto i = find_if(segments, [=](const Segment &s){ return s.start_beat>sb; });
-	segments.insert(i, seq_act);
+	segments.insert(i, seg);
 }
 
 void Sequencer::start()
@@ -156,7 +159,7 @@ void Sequencer::Loader::instant(float beat)
 
 void Sequencer::Loader::segment(float start, float end)
 {
-	SegmentLoader ldr(obj, start, end);
+	SegmentLoader ldr(obj, start, end, demo);
 	load_sub_with(ldr);
 }
 
@@ -166,7 +169,7 @@ Sequencer::ActionDefLoader::ActionDefLoader(Sequencer &s, Demo &d):
 	demo(d)
 {
 	for(const auto &t: obj.action_types)
-		add(t.first, t.second->get_loader_func());
+		add(t.first, t.second->get_def_loader_func());
 }
 
 void Sequencer::ActionDefLoader::finished()
@@ -176,12 +179,15 @@ void Sequencer::ActionDefLoader::finished()
 }
 
 
-Sequencer::SegmentLoader::SegmentLoader(Sequencer &s, float b, float e):
+Sequencer::SegmentLoader::SegmentLoader(Sequencer &s, float b, float e, Demo &d):
 	ObjectLoader<Sequencer>(s),
 	start_beat(b),
-	end_beat(e)
+	end_beat(e),
+	demo(d)
 {
 	add("apply", &SegmentLoader::apply);
+	for(const auto &t: obj.action_types)
+		add(t.first, t.second->get_loader_func());
 }
 
 void Sequencer::SegmentLoader::apply(const string &n)