suff

Author: Alessio Linares

Core/Clock.h

@@ -5,16 +5,25 @@
 
 namespace hb
 {
+	//! A class for measuring time intervals
 	class Clock
 	{
 	public:
+		//! Class constructor
+		/*!
+		  Initializes a new instance of Clock wich starts measuring 
+		  the time since it is created.
+		*/
 		Clock();
+		//! Class destructor
 		~Clock();
+		//! Returns the Time elapsed since creation or last reset
 		Time getElapsedTime() const;
+		//! Returns the Time elapsed since creation or last reset and resets the counter
 		Time reset();
 
 	private:
 		std::chrono::high_resolution_clock::time_point m_time_point;
 	};
 }
-#endif
+#endif

Core/Game.cpp

@@ -23,6 +23,26 @@ Game::~Game()
 }
 
 
+GameObject* Game::makeGameObject(std::map<std::string, std::string>& properties)
+{
+	std::map<std::string, Plugin::ComponentFactory> list = Game::getAllComponentFactories();
+	GameObject* go = new GameObject;
+	for (auto it : list)
+	{
+		if (properties.find(it.first + ".count") != properties.end())
+		{
+			int count = atoi(properties[it.first + ".count"].c_str());
+			for (int i = 0; i < count; ++i)
+			{
+				GameObject::Component* c = it.second(properties, i);
+				go->addComponent(c);
+			}
+		}
+	}
+	return go;
+}
+
+
 void Game::addScene(Scene&& scene)
 {
 	s_scenes.insert(std::pair<std::string, Scene>(scene.getName(), scene));

Core/Game.h

@@ -22,20 +22,20 @@ namespace hb
 			Scene(Scene&& other);
 			~Scene();
 
-			static GameObject* makeGameObject(std::map<std::string, std::string>& properties);
 
 			void init();
 			void exit();
 			const std::string& getName() const;
 			void setExit(std::function<void(void)>&& exit);
 
-		private:
+		protected:
 			std::function<void(void)> m_init, m_exit;
 			std::string m_name;
 		};
 
 		~Game();
 
+		static GameObject* makeGameObject(std::map<std::string, std::string>& properties);
 		static void addScene(Scene&& scene);
 		static void setScene(const std::string& name);
 		static void run();

Core/Scene.cpp

@@ -29,26 +29,6 @@ Game::Scene::~Scene()
 }
 
 
-GameObject* Game::Scene::makeGameObject(std::map<std::string, std::string>& properties)
-{
-	std::map<std::string, Plugin::ComponentFactory> list = Game::getAllComponentFactories();
-	GameObject* go = new GameObject;
-	for (auto it : list)
-	{
-		if (properties.find(it.first + ".count") != properties.end())
-		{
-			int count = atoi(properties[it.first + ".count"].c_str());
-			for (int i = 0; i < count; ++i)
-			{
-				GameObject::Component* c = it.second(properties, i);
-				go->addComponent(c);
-			}
-		}
-	}
-	return go;
-}
-
-
 void Game::Scene::init()
 {
 	m_init();

Core/Time.cpp

@@ -20,7 +20,7 @@ double Time::asSeconds() const
 }
 
 
-int Time::asMiliseconds() const
+int Time::asMilliseconds() const
 {
 	return m_microseconds/1000;
 }
@@ -40,10 +40,10 @@ Time Time::seconds(double seconds)
 }
 
 
-Time Time::miliseconds(int miliseconds)
+Time Time::milliseconds(int milliseconds)
 {
 	Time t;
-	t.m_microseconds = miliseconds * 1000;
+	t.m_microseconds = milliseconds * 1000;
 	return t;
 }
 

Core/Time.h

@@ -9,11 +9,11 @@ namespace hb
 		Time();
 		~Time();
 		double asSeconds() const;
-		int asMiliseconds() const;
+		int asMilliseconds() const;
 		long long asMicroseconds() const;
 
 		static Time seconds(double seconds);
-		static Time miliseconds(int miliseconds);
+		static Time milliseconds(int milliseconds);
 		static Time microseconds(long long microseconds);
 		static Time deltaTime;