From 9e62dc1e033b57d7eabbb7b7130a1cc4a3e11f4b Mon Sep 17 00:00:00 2001
From: Thomas FORGIONE <thomas.forgione@gmail.com>
Date: Sat, 14 Mar 2015 11:28:49 +0100
Subject: [PATCH] Added Menu in namespace pae

---
 Code/include/Animation/Menu.hpp     | 5 +++++
 Code/src/Animation/AnimatedMain.cpp | 2 +-
 Code/src/Animation/Menu.cpp         | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Code/include/Animation/Menu.hpp b/Code/include/Animation/Menu.hpp
index 98a1674..fc8896c 100644
--- a/Code/include/Animation/Menu.hpp
+++ b/Code/include/Animation/Menu.hpp
@@ -37,6 +37,9 @@
 
 #include <Animation/AnimatedMesh.hpp>
 
+namespace pae
+{
+
 ///////////////////////////////////////////////////////
 /// \ingroup animation
 /// \brief A menu drawable with SFML for animation of meshes
@@ -85,4 +88,6 @@ class Menu : public sf::Drawable
         unsigned int fontSize; ///< size of the font
 };
 
+} // namespace pae
+
 #endif // MENU_HPP
diff --git a/Code/src/Animation/AnimatedMain.cpp b/Code/src/Animation/AnimatedMain.cpp
index 4f2224f..0c5451e 100644
--- a/Code/src/Animation/AnimatedMain.cpp
+++ b/Code/src/Animation/AnimatedMain.cpp
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
 
     auto mesh = std::make_shared<pae::AnimatedMesh>(skeleton);
 
-    auto menu = Menu{mesh};
+    auto menu = pae::Menu{mesh};
 
     // Création de la fenêtre
     sf::RenderWindow window(sf::VideoMode(WIDTH, HEIGHT),
diff --git a/Code/src/Animation/Menu.cpp b/Code/src/Animation/Menu.cpp
index d969c38..34cf6a9 100644
--- a/Code/src/Animation/Menu.cpp
+++ b/Code/src/Animation/Menu.cpp
@@ -33,6 +33,9 @@
 
 #include <Animation/Menu.hpp>
 
+namespace pae
+{
+
 Menu::Menu(std::shared_ptr<pae::AnimatedMesh> const& mesh, unsigned int nbPatellas, std::string const& path, float rotationSpeed, unsigned int fontSize) :
     mesh(mesh),
     textsMenu{},
@@ -166,3 +169,5 @@ void Menu::draw(sf::RenderTarget& target, sf::RenderStates states) const
 
     target.popGLStates();
 }
+
+} // namespace pae