X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdemo.cpp;h=c15d5135c62800c6151eb229301a7ef1235c0720;hb=462cb9fc40ae7fec26615c652e95991be89ea8ae;hp=4cd66bd2a036d803988c18d6f195adb3bd376b60;hpb=bcee277ee013cb24cff047a5459774df67561f0c;p=libs%2Fdemoscene.git

diff --git a/source/demo.cpp b/source/demo.cpp
index 4cd66bd..c15d513 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,7 @@ Demo::~Demo()
 void Demo::add_stage(const std::string &name, Stage &stage)
 {
 	things[name] = &stage;
-	things[name+".camera"] = static_cast<GL::Placeable *>(&stage.get_camera());
+	stage.add_things(things, name+".");
 }
 
 void Demo::set_fixed_framerate(float fps)
@@ -96,3 +98,6 @@ void Demo::AnimationAction::tick(float, float d)
 {
 	player.tick(d*Time::sec);
 }
+
+} // namespace DemoScene
+} // namespace Msp