From 2dfa2b3f073c039a5ccf419b4af2a259f21483d2 Mon Sep 17 00:00:00 2001
From: Nomango <569629550@qq.com>
Date: Tue, 17 Jul 2018 22:27:00 +0800
Subject: [PATCH] =?UTF-8?q?SceneManager=E5=87=BD=E6=95=B0=E9=87=8D?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/Manager/SceneManager.cpp | 11 +++++++----
 core/e2dmanager.h             |  8 ++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/core/Manager/SceneManager.cpp b/core/Manager/SceneManager.cpp
index b553f846..bd940677 100644
--- a/core/Manager/SceneManager.cpp
+++ b/core/Manager/SceneManager.cpp
@@ -34,7 +34,7 @@ e2d::SceneManager::~SceneManager()
 {
 }
 
-void e2d::SceneManager::enter(Scene * scene, Transition * transition /* = nullptr */, bool saveCurrentScene /* = true */)
+void e2d::SceneManager::push(Scene * scene, Transition * transition /* = nullptr */, bool saveCurrentScene /* = true */)
 {
 	if (!scene)
 		return;
@@ -63,11 +63,14 @@ void e2d::SceneManager::enter(Scene * scene, Transition * transition /* = nullpt
 	}
 }
 
-void e2d::SceneManager::back(Transition * transition /* = nullptr */)
+void e2d::SceneManager::pop(Transition * transition /* = nullptr */)
 {
 	// 栈为空时，调用返回场景函数失败
-	WARN_IF(_scenes.size() == 0, "Scene stack is empty!");
-	if (_scenes.size() == 0) return;
+	if (_scenes.size() == 0)
+	{
+		WARN("Scene stack is empty!");
+		return;
+	}
 
 	// 从栈顶取出场景指针，作为下一场景
 	_nextScene = _scenes.top();
diff --git a/core/e2dmanager.h b/core/e2dmanager.h
index e9f00d8d..0ca20a4b 100644
--- a/core/e2dmanager.h
+++ b/core/e2dmanager.h
@@ -22,15 +22,15 @@ public:
 	// 销毁实例
 	static void destroyInstance();
 
-	// 切换场景
-	void enter(
+	// 场景入栈
+	void push(
 		Scene * scene,						/* 下一个场景的指针 */
 		Transition * transition = nullptr,	/* 场景切换动作 */
 		bool saveCurrentScene = true		/* 是否保存当前场景 */
 	);
 
-	// 返回上一场景
-	void back(
+	// 场景出栈
+	void pop(
 		Transition * transition = nullptr	/* 场景切换动作 */
 	);