Put everything in namespace Msp::DemoScene

diff --git a/source/action.cpp b/source/action.cpp
index 16201aa1eed7dd9690f893aacee736db922188a6..de3b08a1e3c1bde940a3bc36632ccba359d25b6f 100644 (file)
--- a/source/action.cpp
+++ b/source/action.cpp
@@ -1,6 +1,7 @@
 #include "action.h"
 
-using namespace Msp;
+namespace Msp {
+namespace DemoScene {
 
 InterpolationAction::InterpolationAction(Mode m):
        mode(m),
@@ -43,3 +44,6 @@ Action::Loader::Loader(Action &a, Demo &d):
        DataFile::ObjectLoader<Action>(a),
        demo(d)
 { }
+
+} // namespace DemoScene
+} // namespace Msp

diff --git a/source/action.h b/source/action.h
index f43d4e1b2110f63138a9bd7ddc9fee46035a297b..dacf788fa31597d4864249ae038f5a60f5132ea9 100644 (file)
--- a/source/action.h
+++ b/source/action.h
@@ -3,6 +3,9 @@
 
 #include <msp/datafile/objectloader.h>
 
+namespace Msp {
+namespace DemoScene {
+
 class Demo;
 
 class Action
@@ -51,4 +54,7 @@ public:
        virtual void interpolate(float, float) { }
 };
 
+} // namespace DemoScene
+} // namespace Msp
+
 #endif

diff --git a/source/animate.cpp b/source/animate.cpp
index d74c23920da32b08c720f5cded62459e1f588ce5..f30281d7b33401a745e621462dbe32d7c8ebfa1d 100644 (file)
--- a/source/animate.cpp
+++ b/source/animate.cpp
@@ -2,7 +2,9 @@
 #include "demo.h"
 
 using namespace std;
-using namespace Msp;
+
+namespace Msp {
+namespace DemoScene {
 
 Animate::Animate():
        target(0),
@@ -50,3 +52,6 @@ void Animate::Loader::target(const string &n)
 {
        obj.target = &demo.get_thing<GL::Placeable>(n);
 }
+
+} // namespace DemoScene
+} // namespace Msp

diff --git a/source/animate.h b/source/animate.h
index d386a7ac452a90cedb392cadf5c859a9f2c15e31..31d1641c97b6ad696acc190fc02aed93e4dac286 100644 (file)
--- a/source/animate.h
+++ b/source/animate.h
@@ -5,6 +5,9 @@
 #include <msp/gl/animationplayer.h>
 #include "action.h"
 
+namespace Msp {
+namespace DemoScene {
+
 class Animate: public Action
 {
 public:
@@ -32,4 +35,7 @@ public:
        virtual void start(float, float);
 };
 
+} // namespace DemoScene
+} // namespace Msp
+
 #endif

diff --git a/source/beatcounter.cpp b/source/beatcounter.cpp
index e984034966b000158593ed9bc2407667ecb65966..d914c201790c279e116ae0e627bebde2f79afe5d 100644 (file)
--- a/source/beatcounter.cpp
+++ b/source/beatcounter.cpp
@@ -1,7 +1,8 @@
 #include <msp/strings/format.h>
 #include "beatcounter.h"
 
-using namespace Msp;
+namespace Msp {
+namespace DemoScene {
 
 BeatCounter::BeatCounter(Resources &resources):
        text(resources.get_ui_font(), &resources.get_ui_text_technique()),
@@ -20,3 +21,6 @@ void BeatCounter::render(GL::Renderer &renderer, const GL::Tag &tag) const
 {
        instance.render(renderer, tag);
 }
+
+} // namespace DemoScene
+} // namespace Msp

diff --git a/source/beatcounter.h b/source/beatcounter.h
index 2a12e520e9ed29a90950eec81a35bd030d8f081b..98af61b025bb9b12d0c31eb5810ed4726c7959a1 100644 (file)
--- a/source/beatcounter.h
+++ b/source/beatcounter.h
@@ -8,6 +8,9 @@
 #include "resources.h"
 #include "action.h"
 
+namespace Msp {
+namespace DemoScene {
+
 class BeatCounter: public Msp::GL::Renderable, public Action
 {
 private:
@@ -24,4 +27,7 @@ public:
        virtual void render(Msp::GL::Renderer &, const Msp::GL::Tag &) const;
 };
 
+} // namespace DemoScene
+} // namespace Msp
+
 #endif

diff --git a/source/colorfade.cpp b/source/colorfade.cpp
index edfd1e03a7092db8cf1bfcfad9b7aeca06025e2a..bebc980943f0ba8d434c0a2f5cb901c4130d7563 100644 (file)
--- a/source/colorfade.cpp
+++ b/source/colorfade.cpp
@@ -1,6 +1,7 @@
 #include "colorfade.h"
 
-using namespace Msp;
+namespace Msp {
+namespace DemoScene {
 
 ColorFadeAction::ColorFadeAction(const GL::Color &c):
        InterpolationAction(HERMITE),
@@ -23,3 +24,6 @@ void ColorFadeAction::interpolate(float t, float)
        c.a = start_color.a*(1-t)+end_color.a*t;
        set_color(c);
 }
+
+} // namespace DemoScene
+} // namespace Msp

diff --git a/source/colorfade.h b/source/colorfade.h
index 3b87513a00a5a03878e8bd76a24c606fcef3f582..7ddd9b5bacb6470c12abf1876386b17f11256aa4 100644 (file)
--- a/source/colorfade.h
+++ b/source/colorfade.h
@@ -4,6 +4,9 @@
 #include <msp/gl/color.h>
 #include "action.h"
 
+namespace Msp {
+namespace DemoScene {
+
 class ColorFadeAction: public InterpolationAction
 {
 protected:
@@ -19,4 +22,7 @@ public:
        virtual void set_color(const Msp::GL::Color &) = 0;
 };
 
+} // namespace DemoScene
+} // namespace Msp
+
 #endif

diff --git a/source/demo.cpp b/source/demo.cpp
index c5456853c55495fc41665b2813af2abfa0bb8f22..c15d5135c62800c6151eb229301a7ef1235c0720 100644 (file)
--- 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),
@@ -96,3 +98,6 @@ void Demo::AnimationAction::tick(float, float d)
 {
        player.tick(d*Time::sec);
 }
+
+} // namespace DemoScene
+} // namespace Msp

diff --git a/source/demo.h b/source/demo.h
index 35be62454e0c70100b13f392f560ef8784446a07..b4adb371f1c1d65ce2a152a0121cd07d08b4d901 100644 (file)
--- 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
@@ -79,4 +82,7 @@ T &Demo::get_thing(const std::string &name)
        return *get_item(things, name).value<T *>();
 }
 
+} // namespace DemoScene
+} // namespace Msp
+
 #endif

diff --git a/source/fadeoverlay.cpp b/source/fadeoverlay.cpp
index ab069c3477e79e69a339ca916cb62749eb94ead2..ee7ca7f3c3e8ed65e0821cf4121257cea25e52bb 100644 (file)
--- a/source/fadeoverlay.cpp
+++ b/source/fadeoverlay.cpp
@@ -4,9 +4,11 @@
 #include "demo.h"
 #include "fadeoverlay.h"
 
-using namespace Msp;
 using namespace std;
 
+namespace Msp {
+namespace DemoScene {
+
 FadeOverlay::FadeOverlay(DataFile::Collection &resources):
        mesh(get_fullscreen_quad()),
        shprog(resources.get<GL::Program>("fade.glsl")),
@@ -63,3 +65,6 @@ void FadeOverlay::Fade::Loader::color(float r, float g, float b, float a)
 {
        obj.end_color = GL::Color(r, g, b, a);
 }
+
+} // namespace DemoScene
+} // namespace Msp

diff --git a/source/fadeoverlay.h b/source/fadeoverlay.h
index e427c4ee9914c38752e1038a5edebbde08ddc2d7..a0b365b6c698c3a4477c1bb5162635fd1e7418be 100644 (file)
--- a/source/fadeoverlay.h
+++ b/source/fadeoverlay.h
@@ -9,6 +9,9 @@
 #include "colorfade.h"
 #include "sequencer.h"
 
+namespace Msp {
+namespace DemoScene {
+
 class FadeOverlay: public Msp::GL::PostProcessor
 {
 public:
@@ -52,4 +55,7 @@ public:
        virtual void render(Msp::GL::Renderer &, const Msp::GL::Texture2D &, const Msp::GL::Texture2D &);
 };
 
+} // namespace DemoScene
+} // namespace Msp
+
 #endif

diff --git a/source/launcher.cpp b/source/launcher.cpp
index 2b53c18a2b2dbe92e5b78294e28eefd59dd1fb6c..bad077d03fa5df6fc29cb25d8ca2b4e82b0b5fb0 100644 (file)
--- a/source/launcher.cpp
+++ b/source/launcher.cpp
@@ -10,7 +10,9 @@
 #include "launchscreen.h"
 
 using namespace std;
-using namespace Msp;
+
+namespace Msp {
+namespace DemoScene {
 
 LauncherBase::Options::Options(Graphics::Display &dpy, int argc, char **argv):
        start_fullscreen(-1),
@@ -214,3 +216,6 @@ void LauncherBase::key_press(unsigned key)
        else if(key==Input::KEY_ESC)
                exit(0);
 }
+
+} // namespace DemoScene
+} // namespace Msp

diff --git a/source/launcher.h b/source/launcher.h
index c1dc33a8db8e1be88393082e97e1099a46ea095e..54e6eda17361bf65a491bfeb695585842b1d338a 100644 (file)
--- a/source/launcher.h
+++ b/source/launcher.h
@@ -13,6 +13,9 @@
 #include <msp/time/timestamp.h>
 #include "resources.h"
 
+namespace Msp {
+namespace DemoScene {
+
 class Demo;
 class LaunchScreen;
 
@@ -81,4 +84,7 @@ protected:
        virtual void exit(int c) { Msp::Application::exit(c); }
 };
 
+} // namespace DemoScene
+} // namespace Msp
+
 #endif

diff --git a/source/launchscreen.cpp b/source/launchscreen.cpp
index 972b311188a576ffbda6f741e23dd6e84342c50f..ccf2101d314c2bea08143fd613f70c8986710969 100644 (file)
--- a/source/launchscreen.cpp
+++ b/source/launchscreen.cpp
@@ -4,7 +4,8 @@
 #include <msp/strings/format.h>
 #include "launchscreen.h"
 
-using namespace Msp;
+namespace Msp {
+namespace DemoScene {
 
 LaunchScreen::LaunchScreen(Resources &resources):
        font(resources.get_ui_font()),
@@ -47,3 +48,6 @@ void LaunchScreen::render()
        renderer.transform(GL::Matrix::translation(0, -1.2, 0));
        esc_prompt.render(renderer);
 }
+
+} // namespace DemoScene
+} // namespace Msp

diff --git a/source/launchscreen.h b/source/launchscreen.h
index e4c737f4a3c9ac020ab848ff790af2fe1d43e23c..25710122b975cbcd94fa3e85b0ebb3c7ff1e6dd6 100644 (file)
--- a/source/launchscreen.h
+++ b/source/launchscreen.h
@@ -7,6 +7,9 @@
 #include <msp/gl/text.h>
 #include "resources.h"
 
+namespace Msp {
+namespace DemoScene {
+
 class LaunchScreen
 {
 private:
@@ -26,4 +29,7 @@ public:
        void render();
 };
 
+} // namespace DemoScene
+} // namespace Msp
+
 #endif

diff --git a/source/resources.cpp b/source/resources.cpp
index e5e893d58dc9e283ed35ffe33f88aab7c9e1d1c6..1742f06d41694cdb689b2db6be0a3b17be617d5a 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -3,7 +3,9 @@
 #include "resources.h"
 
 using namespace std;
-using namespace Msp;
+
+namespace Msp {
+namespace DemoScene {
 
 Resources::Resources(const string &pack_name):
        ui_font(0),
@@ -46,3 +48,6 @@ void Resources::set_ui_text_resources(const string &font, const string &tech)
        ui_font = &get<GL::Font>(font);
        ui_text_technique = &get<GL::Technique>(tech);
 }
+
+} // namespace DemoScene
+} // namespace Msp

diff --git a/source/resources.h b/source/resources.h
index 63dee766967164a36ae676c20fbbf54be9665bea..bb86933e39b7ebaf734f983d17ee5bddaf42f09b 100644 (file)
--- a/source/resources.h
+++ b/source/resources.h
@@ -7,6 +7,9 @@
 #include <msp/gl/resources.h>
 #include <msp/gl/technique.h>
 
+namespace Msp {
+namespace DemoScene {
+
 class Resources: public Msp::GL::Resources
 {
 private:
@@ -24,4 +27,7 @@ public:
        void set_ui_text_resources(const std::string &, const std::string &);
 };
 
+} // namespace DemoScene
+} // namespace Msp
+
 #endif

diff --git a/source/sequencer.cpp b/source/sequencer.cpp
index 0297c4397ff254bf30d26d95a44f4ec7909a1122..5aa0823897749227b0a51b08bb44454da752fccb 100644 (file)
--- a/source/sequencer.cpp
+++ b/source/sequencer.cpp
@@ -7,7 +7,9 @@
 #include "stage.h"
 
 using namespace std;
-using namespace Msp;
+
+namespace Msp {
+namespace DemoScene {
 
 Sequencer::Sequencer(float bpm):
        started(false),
@@ -194,3 +196,6 @@ void Sequencer::SegmentLoader::apply(const string &n)
 {
        obj.add_action(*get_item(obj.named_actions, n), start_beat, end_beat);
 }
+
+} // namespace DemoScene
+} // namespace Msp

diff --git a/source/sequencer.h b/source/sequencer.h
index f8137177bbd73c31d792a5f59299187a49d99fdd..6e984025a0f27d21405185332c550952fe9ffd25 100644 (file)
--- a/source/sequencer.h
+++ b/source/sequencer.h
@@ -10,6 +10,9 @@
 #include <msp/time/timestamp.h>
 #include "action.h"
 
+namespace Msp {
+namespace DemoScene {
+
 class Demo;
 
 class Sequencer
@@ -179,4 +182,7 @@ void Sequencer::SegmentLoader::action()
        obj.anonymous_actions.push_back(act.release());
 }
 
+} // namespace DemoScene
+} // namespace Msp
+
 #endif

diff --git a/source/stage.cpp b/source/stage.cpp
index 0ca5c5eec607e1f7143b54edef0eeaf10cb1ea24..b6c456e96c479a6330060733b97ac2afd5533832 100644 (file)
--- a/source/stage.cpp
+++ b/source/stage.cpp
@@ -3,7 +3,9 @@
 #include "stage.h"
 
 using namespace std;
-using namespace Msp;
+
+namespace Msp {
+namespace DemoScene {
 
 Stage::Stage():
        pipeline(0),
@@ -120,3 +122,6 @@ void Stage::SetCamera::Loader::camera(const string &n)
 {
        obj.camera = &demo.get_resources().get<GL::Camera>(n);
 }
+
+} // namespace DemoScene
+} // namespace Msp

diff --git a/source/stage.h b/source/stage.h
index 7d4664fb2b4a2a70122abb04a5ba5e4092378c42..1d20bdae6760f4e79b08f44e7fd47bd0a9ad2030 100644 (file)
--- a/source/stage.h
+++ b/source/stage.h
@@ -6,6 +6,9 @@
 #include "action.h"
 #include "demo.h"
 
+namespace Msp {
+namespace DemoScene {
+
 class Stage
 {
 public:
@@ -79,4 +82,7 @@ protected:
        virtual void create_pipeline(Msp::GL::View &) = 0;
 };
 
+} // namespace DemoScene
+} // namespace Msp
+
 #endif