X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdemo.h;h=b4adb371f1c1d65ce2a152a0121cd07d08b4d901;hb=462cb9fc40ae7fec26615c652e95991be89ea8ae;hp=e2dfd6e9e6d926455827b9232036568bc68c795b;hpb=bcee277ee013cb24cff047a5459774df67561f0c;p=libs%2Fdemoscene.git diff --git a/source/demo.h b/source/demo.h index e2dfd6e..b4adb37 100644 --- a/source/demo.h +++ b/source/demo.h @@ -13,6 +13,9 @@ #include "action.h" #include "sequencer.h" +namespace Msp { +namespace DemoScene { + class Stage; class Demo @@ -32,6 +35,8 @@ private: }; public: + typedef std::map ThingMap; + sigc::signal signal_finished; protected: @@ -48,7 +53,7 @@ protected: Msp::Time::TimeStamp last_tick; Msp::Time::TimeStamp next_frame; - std::map things; + ThingMap things; Demo(Msp::Graphics::Window &, Msp::Graphics::GLContext &, Msp::DataFile::Collection &); public: @@ -77,4 +82,7 @@ T &Demo::get_thing(const std::string &name) return *get_item(things, name).value(); } +} // namespace DemoScene +} // namespace Msp + #endif