Simplify naming (Neon Engine)

theopnv · Aug 2, 2018 · f373ed1 · f373ed1
1 parent 18ccf35
commit f373ed1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/neon_engine/Core/Core.h b/neon_engine/Core/Core.h
@@ -27,7 +27,7 @@
 namespace neon_engine
 {
 
-	class IGameState;
+	class IState;
 
 	/**
 	 * \brief Main class of the game engine
@@ -76,13 +76,13 @@ namespace neon_engine
 		 * \brief Change the state
 		 * \param state new state
 		 */
-		void	changeState(const Sptr<IGameState>& state);
+		void	changeState(const Sptr<IState>& state);
 
 		/**
 		 * \brief Will pause the current state and change to a new one
 		 * \param state new state
 		 */
-		void	pushState(const Sptr<IGameState>& state);
+		void	pushState(const Sptr<IState>& state);
 
 		/**
 		 * \brief Will cleanup the current state, and resume the older one if present
@@ -120,7 +120,7 @@ namespace neon_engine
 		Vector2<int>		_winSize;
 		Vector2<int>		_logicalWinSize;
 
-		std::stack<Sptr<IGameState>>	_states;
+		std::stack<Sptr<IState>>	_states;
 		NEventFuncMapper				_eventFuncMapper;
 		NEventMapper					_eventMapper;
 

diff --git a/neon_engine/Core/StateManager.cpp b/neon_engine/Core/StateManager.cpp
@@ -14,14 +14,14 @@ namespace neon_engine
 		}
 	}
 
-	void Core::changeState(const Sptr<IGameState>& state)
+	void Core::changeState(const Sptr<IState>& state)
 	{
 		_popState = true;
 
 		_states.push(state);
 	}
 
-	void Core::pushState(const Sptr<IGameState>& state)
+	void Core::pushState(const Sptr<IState>& state)
 	{
 		_popState = true;
 

diff --git a/neon_engine/State/AState.h b/neon_engine/State/AState.h
@@ -7,17 +7,17 @@
 namespace neon_engine
 {
 
-	class AGameState : public IGameState
+	class AState : public IState
 	{
 
 	public:
-		virtual ~AGameState() = default;
+		virtual ~AState() = default;
 
 	protected:
-		Sptr<Core>		_ge;
+		Sptr<Core>						_ge;
 
-		std::vector<Sptr<IGObject>>	_gameObjects;
-		NEventFuncMapper			_eventFuncMapper;
+		std::vector<Sptr<IUIObject>>	_gameObjects;
+		NEventFuncMapper				_eventFuncMapper;
 
 		virtual void setEventFuncMapper() = 0;
 	};

diff --git a/neon_engine/State/IState.h b/neon_engine/State/IState.h
@@ -16,7 +16,7 @@ namespace neon_engine
 	 * It handles its rendering, and its events.
 	 * It is very useful to implement different logic for menus, games...
 	 */
-	class IGameState
+	class IState
 	{
 
 		public:
@@ -53,10 +53,10 @@ namespace neon_engine
 			 * \brief Give the order to the game engine to change state
 			 * \param state the new state
 			 */
-			virtual void	changeState(Sptr<IGameState> state) = 0;
+			virtual void	changeState(Sptr<IState> state) = 0;
 
 		protected:
-			virtual ~IGameState() = default;
+			virtual ~IState() = default;
 	};
 
 }
diff --git a/neon_engine/UI/AUIObject.h b/neon_engine/UI/AUIObject.h
@@ -12,7 +12,7 @@ namespace neon_engine
 	/**
 	 * \brief Abstract class for GameObject
 	 */
-	class AGObject : public IGObject
+	class AGObject : public IUIObject
 	{
 
 	public:

diff --git a/neon_engine/UI/IUIObject.h b/neon_engine/UI/IUIObject.h
@@ -12,11 +12,11 @@ namespace neon_engine
 	/**
 	 * \brief Base class for every object managed by the graphical library (SDL2)
 	 */
-	class IGObject
+	class IUIObject
 	{
 
 	public:
-		virtual			~IGObject() = default;
+		virtual			~IUIObject() = default;
 
 		/**
 		 * \brief Update state of the game object relatively to events