X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdemo.cpp;h=6579b8cb7b3b6a905e053266177f4b15e5c2a4c0;hb=HEAD;hp=c5456853c55495fc41665b2813af2abfa0bb8f22;hpb=e2032cbdb8d2ae52e42d400c5cc90ddad844f665;p=libs%2Fdemoscene.git

diff --git a/source/demo.cpp b/source/demo.cpp
index c545685..6579b8c 100644
--- a/source/demo.cpp
+++ b/source/demo.cpp
@@ -3,7 +3,9 @@
 #include "stage.h"
 
 using namespace std;
-using namespace Msp;
+
+namespace Msp {
+namespace DemoScene {
 
 Demo::Demo(Graphics::Window &window, Graphics::GLContext &gl_ctx, DataFile::Collection &r):
 	resources(r),
@@ -31,7 +33,9 @@ Demo::~Demo()
 void Demo::add_stage(const std::string &name, Stage &stage)
 {
 	things[name] = &stage;
-	stage.add_things(things, name+".");
+	string prefix = name+".";
+	stage.add_things(things, prefix);
+	stage.define_actions(sequencer, prefix);
 }
 
 void Demo::set_fixed_framerate(float fps)
@@ -96,3 +100,6 @@ void Demo::AnimationAction::tick(float, float d)
 {
 	player.tick(d*Time::sec);
 }
+
+} // namespace DemoScene
+} // namespace Msp