update project files

core/Tool/Listener/CollisionListener.cpp

@@ -1,5 +1,5 @@
-#include "..\etool.h"
+#include "..\..\etool.h"
-#include "..\emanager.h"
+#include "..\..\emanager.h"
 
 e2d::CollisionListener::CollisionListener()
 	: Listener()

core/Tool/Listener/InputListener.cpp

@@ -1,5 +1,5 @@
-#include "..\etool.h"
+#include "..\..\etool.h"
-#include "..\emanager.h"
+#include "..\..\emanager.h"
 
 e2d::InputListener::InputListener()
 	: Listener()

core/Tool/Listener/Listener.cpp

@@ -1,4 +1,4 @@
-#include "..\etool.h"
+#include "..\..\etool.h"
 
 e2d::Listener::Listener()
 	: m_bRunning(false)

core/ecommon.h

@@ -75,7 +75,7 @@ struct Size
 
 
 // ×Ö·û´®
-class String final
+class String
 {
 public:
 	String();

core/emanager.h

@@ -18,7 +18,7 @@ class InputListener;
 class CollisionListener;
 
 // 对象管理器
-class ObjectManager final
+class ObjectManager
 {
 	friend Game;
 
@@ -41,7 +41,7 @@ private:
 
 
 // 场景管理器
-class SceneManager final
+class SceneManager
 {
 	friend Game;
 	friend Renderer;
@@ -87,7 +87,7 @@ private:
 
 
 // 定时器管理器
-class TimerManager final
+class TimerManager
 {
 	friend Game;
 	friend Node;
@@ -150,7 +150,7 @@ private:
 
 
 // 动作管理器
-class ActionManager final
+class ActionManager
 {
 	friend Game;
 	friend Node;
@@ -235,7 +235,7 @@ private:
 
 
 // 音乐管理工具
-class MusicManager final
+class MusicManager
 {
 	friend Game;
 
@@ -305,7 +305,7 @@ private:
 
 
 // 键盘和鼠标消息管理器
-class InputManager final
+class InputManager
 {
 	friend Input;
 	friend InputListener;
@@ -361,7 +361,7 @@ private:
 
 
 // 碰撞管理器
-class ColliderManager final
+class ColliderManager
 {
 	friend Node;
 	friend Collider;

project/vs2010/Easy2D.vcxproj

@@ -40,6 +40,10 @@
     <ClCompile Include="..\..\core\Base\Renderer.cpp" />
     <ClCompile Include="..\..\core\Base\Time.cpp" />
     <ClCompile Include="..\..\core\Base\Window.cpp" />
+    <ClCompile Include="..\..\core\Collider\Collider.cpp" />
+    <ClCompile Include="..\..\core\Collider\ColliderCircle.cpp" />
+    <ClCompile Include="..\..\core\Collider\ColliderEllipse.cpp" />
+    <ClCompile Include="..\..\core\Collider\ColliderRect.cpp" />
     <ClCompile Include="..\..\core\Common\Font.cpp" />
     <ClCompile Include="..\..\core\Common\Image.cpp" />
     <ClCompile Include="..\..\core\Common\Object.cpp" />
@@ -48,7 +52,7 @@
     <ClCompile Include="..\..\core\Common\Size.cpp" />
     <ClCompile Include="..\..\core\Common\String.cpp" />
     <ClCompile Include="..\..\core\Manager\ActionManager.cpp" />
-    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp" />
+    <ClCompile Include="..\..\core\Manager\ColliderManager.cpp" />
     <ClCompile Include="..\..\core\Manager\InputManager.cpp" />
     <ClCompile Include="..\..\core\Manager\MusicManager.cpp" />
     <ClCompile Include="..\..\core\Manager\ObjectManager.cpp" />
@@ -58,16 +62,17 @@
     <ClCompile Include="..\..\core\Node\ButtonToggle.cpp" />
     <ClCompile Include="..\..\core\Node\Menu.cpp" />
     <ClCompile Include="..\..\core\Node\Node.cpp" />
+    <ClCompile Include="..\..\core\Node\Shape\Circle.cpp" />
+    <ClCompile Include="..\..\core\Node\Shape\Ellipse.cpp" />
+    <ClCompile Include="..\..\core\Node\Shape\Rect.cpp" />
+    <ClCompile Include="..\..\core\Node\Shape\RoundRect.cpp" />
+    <ClCompile Include="..\..\core\Node\Shape\Shape.cpp" />
     <ClCompile Include="..\..\core\Node\Sprite.cpp" />
     <ClCompile Include="..\..\core\Node\Text.cpp" />
-    <ClCompile Include="..\..\core\Shape\ShapeBase.cpp" />
-    <ClCompile Include="..\..\core\Shape\ShapeCircle.cpp" />
-    <ClCompile Include="..\..\core\Shape\ShapeEllipse.cpp" />
-    <ClCompile Include="..\..\core\Shape\ShapeRectangle.cpp" />
-    <ClCompile Include="..\..\core\Tool\CollisionListener.cpp" />
     <ClCompile Include="..\..\core\Tool\Data.cpp" />
-    <ClCompile Include="..\..\core\Tool\InputListener.cpp" />
+    <ClCompile Include="..\..\core\Tool\Listener\CollisionListener.cpp" />
-    <ClCompile Include="..\..\core\Tool\Listener.cpp" />
+    <ClCompile Include="..\..\core\Tool\Listener\InputListener.cpp" />
+    <ClCompile Include="..\..\core\Tool\Listener\Listener.cpp" />
     <ClCompile Include="..\..\core\Tool\Music.cpp" />
     <ClCompile Include="..\..\core\Tool\Path.cpp" />
     <ClCompile Include="..\..\core\Tool\Random.cpp" />
@@ -78,16 +83,17 @@
     <ClCompile Include="..\..\core\Transition\TransitionMove.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\core\eactions.h" />
+    <ClInclude Include="..\..\core\eaction.h" />
     <ClInclude Include="..\..\core\easy2d.h" />
     <ClInclude Include="..\..\core\ebase.h" />
+    <ClInclude Include="..\..\core\ecollider.h" />
     <ClInclude Include="..\..\core\ecommon.h" />
     <ClInclude Include="..\..\core\emacros.h" />
-    <ClInclude Include="..\..\core\emanagers.h" />
+    <ClInclude Include="..\..\core\emanager.h" />
-    <ClInclude Include="..\..\core\enodes.h" />
+    <ClInclude Include="..\..\core\enode.h" />
     <ClInclude Include="..\..\core\eshape.h" />
-    <ClInclude Include="..\..\core\etools.h" />
+    <ClInclude Include="..\..\core\etool.h" />
-    <ClInclude Include="..\..\core\etransitions.h" />
+    <ClInclude Include="..\..\core\etransition.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{47AF11E1-8725-4ECA-B8CF-951ABC397B31}</ProjectGuid>

project/vs2010/Easy2D.vcxproj.filters

@@ -22,8 +22,14 @@
     <Filter Include="Transition">
       <UniqueIdentifier>{6c760a81-9bc8-4fb0-a145-8e119b783365}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Shape">
+    <Filter Include="Collider">
-      <UniqueIdentifier>{508b39c8-a430-45c3-9405-364fbc281220}</UniqueIdentifier>
+      <UniqueIdentifier>{4c1db04d-1ba5-4313-924e-c58c35265eed}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Node\Shape">
+      <UniqueIdentifier>{fe2c1cba-f77d-4a33-bc8a-4f40ecd9d618}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tool\Listener">
+      <UniqueIdentifier>{72484ebf-d464-4f37-ad9b-340b378f9701}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -111,24 +117,9 @@
     <ClCompile Include="..\..\core\Common\String.cpp">
       <Filter>Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Shape\ShapeBase.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\ShapeCircle.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\ShapeEllipse.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\ShapeRectangle.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Manager\ActionManager.cpp">
       <Filter>Manager</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp">
-      <Filter>Manager</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Manager\InputManager.cpp">
       <Filter>Manager</Filter>
     </ClCompile>
@@ -162,18 +153,9 @@
     <ClCompile Include="..\..\core\Node\Text.cpp">
       <Filter>Node</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\CollisionListener.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Tool\Data.cpp">
       <Filter>Tool</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\InputListener.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Listener.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Tool\Music.cpp">
       <Filter>Tool</Filter>
     </ClCompile>
@@ -198,17 +180,57 @@
     <ClCompile Include="..\..\core\Transition\TransitionMove.cpp">
       <Filter>Transition</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\core\Manager\ColliderManager.cpp">
+      <Filter>Manager</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Collider\Collider.cpp">
+      <Filter>Collider</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Collider\ColliderCircle.cpp">
+      <Filter>Collider</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Collider\ColliderEllipse.cpp">
+      <Filter>Collider</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Collider\ColliderRect.cpp">
+      <Filter>Collider</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Node\Shape\Circle.cpp">
+      <Filter>Node\Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Node\Shape\Ellipse.cpp">
+      <Filter>Node\Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Node\Shape\Rect.cpp">
+      <Filter>Node\Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Node\Shape\RoundRect.cpp">
+      <Filter>Node\Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Node\Shape\Shape.cpp">
+      <Filter>Node\Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Tool\Listener\CollisionListener.cpp">
+      <Filter>Tool\Listener</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Tool\Listener\InputListener.cpp">
+      <Filter>Tool\Listener</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Tool\Listener\Listener.cpp">
+      <Filter>Tool\Listener</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\core\eactions.h" />
+    <ClInclude Include="..\..\core\eaction.h" />
     <ClInclude Include="..\..\core\easy2d.h" />
     <ClInclude Include="..\..\core\ebase.h" />
+    <ClInclude Include="..\..\core\ecollider.h" />
     <ClInclude Include="..\..\core\ecommon.h" />
     <ClInclude Include="..\..\core\emacros.h" />
-    <ClInclude Include="..\..\core\emanagers.h" />
+    <ClInclude Include="..\..\core\emanager.h" />
-    <ClInclude Include="..\..\core\enodes.h" />
+    <ClInclude Include="..\..\core\enode.h" />
     <ClInclude Include="..\..\core\eshape.h" />
-    <ClInclude Include="..\..\core\etools.h" />
+    <ClInclude Include="..\..\core\etool.h" />
-    <ClInclude Include="..\..\core\etransitions.h" />
+    <ClInclude Include="..\..\core\etransition.h" />
   </ItemGroup>
 </Project>

project/vs2012/Easy2D.vcxproj

@@ -18,18 +18,6 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\core\eactions.h" />
-    <ClInclude Include="..\..\core\easy2d.h" />
-    <ClInclude Include="..\..\core\ebase.h" />
-    <ClInclude Include="..\..\core\ecommon.h" />
-    <ClInclude Include="..\..\core\emacros.h" />
-    <ClInclude Include="..\..\core\emanagers.h" />
-    <ClInclude Include="..\..\core\enodes.h" />
-    <ClInclude Include="..\..\core\eshape.h" />
-    <ClInclude Include="..\..\core\etools.h" />
-    <ClInclude Include="..\..\core\etransitions.h" />
-  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\core\Action\Action.cpp" />
     <ClCompile Include="..\..\core\Action\ActionDelay.cpp" />
@@ -52,6 +40,10 @@
     <ClCompile Include="..\..\core\Base\Renderer.cpp" />
     <ClCompile Include="..\..\core\Base\Time.cpp" />
     <ClCompile Include="..\..\core\Base\Window.cpp" />
+    <ClCompile Include="..\..\core\Collider\Collider.cpp" />
+    <ClCompile Include="..\..\core\Collider\ColliderCircle.cpp" />
+    <ClCompile Include="..\..\core\Collider\ColliderEllipse.cpp" />
+    <ClCompile Include="..\..\core\Collider\ColliderRect.cpp" />
     <ClCompile Include="..\..\core\Common\Font.cpp" />
     <ClCompile Include="..\..\core\Common\Image.cpp" />
     <ClCompile Include="..\..\core\Common\Object.cpp" />
@@ -60,7 +52,7 @@
     <ClCompile Include="..\..\core\Common\Size.cpp" />
     <ClCompile Include="..\..\core\Common\String.cpp" />
     <ClCompile Include="..\..\core\Manager\ActionManager.cpp" />
-    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp" />
+    <ClCompile Include="..\..\core\Manager\ColliderManager.cpp" />
     <ClCompile Include="..\..\core\Manager\InputManager.cpp" />
     <ClCompile Include="..\..\core\Manager\MusicManager.cpp" />
     <ClCompile Include="..\..\core\Manager\ObjectManager.cpp" />
@@ -70,16 +62,17 @@
     <ClCompile Include="..\..\core\Node\ButtonToggle.cpp" />
     <ClCompile Include="..\..\core\Node\Menu.cpp" />
     <ClCompile Include="..\..\core\Node\Node.cpp" />
+    <ClCompile Include="..\..\core\Node\Shape\Circle.cpp" />
+    <ClCompile Include="..\..\core\Node\Shape\Ellipse.cpp" />
+    <ClCompile Include="..\..\core\Node\Shape\Rect.cpp" />
+    <ClCompile Include="..\..\core\Node\Shape\RoundRect.cpp" />
+    <ClCompile Include="..\..\core\Node\Shape\Shape.cpp" />
     <ClCompile Include="..\..\core\Node\Sprite.cpp" />
     <ClCompile Include="..\..\core\Node\Text.cpp" />
-    <ClCompile Include="..\..\core\Shape\ShapeBase.cpp" />
-    <ClCompile Include="..\..\core\Shape\ShapeCircle.cpp" />
-    <ClCompile Include="..\..\core\Shape\ShapeEllipse.cpp" />
-    <ClCompile Include="..\..\core\Shape\ShapeRectangle.cpp" />
-    <ClCompile Include="..\..\core\Tool\CollisionListener.cpp" />
     <ClCompile Include="..\..\core\Tool\Data.cpp" />
-    <ClCompile Include="..\..\core\Tool\InputListener.cpp" />
+    <ClCompile Include="..\..\core\Tool\Listener\CollisionListener.cpp" />
-    <ClCompile Include="..\..\core\Tool\Listener.cpp" />
+    <ClCompile Include="..\..\core\Tool\Listener\InputListener.cpp" />
+    <ClCompile Include="..\..\core\Tool\Listener\Listener.cpp" />
     <ClCompile Include="..\..\core\Tool\Music.cpp" />
     <ClCompile Include="..\..\core\Tool\Path.cpp" />
     <ClCompile Include="..\..\core\Tool\Random.cpp" />
@@ -89,6 +82,19 @@
     <ClCompile Include="..\..\core\Transition\TransitionFade.cpp" />
     <ClCompile Include="..\..\core\Transition\TransitionMove.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\core\eaction.h" />
+    <ClInclude Include="..\..\core\easy2d.h" />
+    <ClInclude Include="..\..\core\ebase.h" />
+    <ClInclude Include="..\..\core\ecollider.h" />
+    <ClInclude Include="..\..\core\ecommon.h" />
+    <ClInclude Include="..\..\core\emacros.h" />
+    <ClInclude Include="..\..\core\emanager.h" />
+    <ClInclude Include="..\..\core\enode.h" />
+    <ClInclude Include="..\..\core\eshape.h" />
+    <ClInclude Include="..\..\core\etool.h" />
+    <ClInclude Include="..\..\core\etransition.h" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{722EA245-ADD5-4296-8C85-8FF42C0335D3}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>

project/vs2012/Easy2D.vcxproj.filters

@@ -22,21 +22,15 @@
     <Filter Include="Transition">
       <UniqueIdentifier>{337d5a0f-60fd-473a-83da-b2a3515affd9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Shape">
+    <Filter Include="Collider">
-      <UniqueIdentifier>{dfaa8954-50d7-49c5-8aa6-7232c6d5c557}</UniqueIdentifier>
+      <UniqueIdentifier>{4ff7f97f-95dd-4060-badc-0362c74a7318}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Node\Shape">
+      <UniqueIdentifier>{f0ed2748-5199-48d1-930c-286afd27c235}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tool\Listener">
+      <UniqueIdentifier>{836e9902-e58c-4cfa-9c23-26632ae737ba}</UniqueIdentifier>
     </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\core\eactions.h" />
-    <ClInclude Include="..\..\core\easy2d.h" />
-    <ClInclude Include="..\..\core\ebase.h" />
-    <ClInclude Include="..\..\core\emacros.h" />
-    <ClInclude Include="..\..\core\emanagers.h" />
-    <ClInclude Include="..\..\core\enodes.h" />
-    <ClInclude Include="..\..\core\etools.h" />
-    <ClInclude Include="..\..\core\etransitions.h" />
-    <ClInclude Include="..\..\core\eshape.h" />
-    <ClInclude Include="..\..\core\ecommon.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\core\Action\Action.cpp">
@@ -180,35 +174,63 @@
     <ClCompile Include="..\..\core\Tool\Data.cpp">
       <Filter>Tool</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\CollisionListener.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Tool\InputListener.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Listener.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\ShapeCircle.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\ShapeEllipse.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\ShapeRectangle.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\ShapeBase.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp">
-      <Filter>Manager</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Manager\InputManager.cpp">
       <Filter>Manager</Filter>
     </ClCompile>
     <ClCompile Include="..\..\core\Action\ActionFunc.cpp">
       <Filter>Action</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\core\Node\Shape\Circle.cpp">
+      <Filter>Node\Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Node\Shape\Ellipse.cpp">
+      <Filter>Node\Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Node\Shape\Rect.cpp">
+      <Filter>Node\Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Node\Shape\RoundRect.cpp">
+      <Filter>Node\Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Node\Shape\Shape.cpp">
+      <Filter>Node\Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Collider\Collider.cpp">
+      <Filter>Collider</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Collider\ColliderCircle.cpp">
+      <Filter>Collider</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Collider\ColliderEllipse.cpp">
+      <Filter>Collider</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Collider\ColliderRect.cpp">
+      <Filter>Collider</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Manager\ColliderManager.cpp">
+      <Filter>Manager</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Tool\Listener\CollisionListener.cpp">
+      <Filter>Tool\Listener</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Tool\Listener\InputListener.cpp">
+      <Filter>Tool\Listener</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Tool\Listener\Listener.cpp">
+      <Filter>Tool\Listener</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\core\eaction.h" />
+    <ClInclude Include="..\..\core\easy2d.h" />
+    <ClInclude Include="..\..\core\ebase.h" />
+    <ClInclude Include="..\..\core\ecollider.h" />
+    <ClInclude Include="..\..\core\ecommon.h" />
+    <ClInclude Include="..\..\core\emacros.h" />
+    <ClInclude Include="..\..\core\emanager.h" />
+    <ClInclude Include="..\..\core\enode.h" />
+    <ClInclude Include="..\..\core\eshape.h" />
+    <ClInclude Include="..\..\core\etool.h" />
+    <ClInclude Include="..\..\core\etransition.h" />
   </ItemGroup>
 </Project>

project/vs2013/Easy2D.vcxproj

@@ -156,18 +156,6 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\core\eactions.h" />
-    <ClInclude Include="..\..\core\easy2d.h" />
-    <ClInclude Include="..\..\core\ebase.h" />
-    <ClInclude Include="..\..\core\ecommon.h" />
-    <ClInclude Include="..\..\core\emacros.h" />
-    <ClInclude Include="..\..\core\emanagers.h" />
-    <ClInclude Include="..\..\core\enodes.h" />
-    <ClInclude Include="..\..\core\eshape.h" />
-    <ClInclude Include="..\..\core\etools.h" />
-    <ClInclude Include="..\..\core\etransitions.h" />
-  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\core\Action\Action.cpp" />
     <ClCompile Include="..\..\core\Action\ActionDelay.cpp" />
@@ -190,6 +178,10 @@
     <ClCompile Include="..\..\core\Base\Renderer.cpp" />
     <ClCompile Include="..\..\core\Base\Time.cpp" />
     <ClCompile Include="..\..\core\Base\Window.cpp" />
+    <ClCompile Include="..\..\core\Collider\Collider.cpp" />
+    <ClCompile Include="..\..\core\Collider\ColliderCircle.cpp" />
+    <ClCompile Include="..\..\core\Collider\ColliderEllipse.cpp" />
+    <ClCompile Include="..\..\core\Collider\ColliderRect.cpp" />
     <ClCompile Include="..\..\core\Common\Font.cpp" />
     <ClCompile Include="..\..\core\Common\Image.cpp" />
     <ClCompile Include="..\..\core\Common\Object.cpp" />
@@ -198,7 +190,7 @@
     <ClCompile Include="..\..\core\Common\Size.cpp" />
     <ClCompile Include="..\..\core\Common\String.cpp" />
     <ClCompile Include="..\..\core\Manager\ActionManager.cpp" />
-    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp" />
+    <ClCompile Include="..\..\core\Manager\ColliderManager.cpp" />
     <ClCompile Include="..\..\core\Manager\InputManager.cpp" />
     <ClCompile Include="..\..\core\Manager\MusicManager.cpp" />
     <ClCompile Include="..\..\core\Manager\ObjectManager.cpp" />
@@ -208,16 +200,17 @@
     <ClCompile Include="..\..\core\Node\ButtonToggle.cpp" />
     <ClCompile Include="..\..\core\Node\Menu.cpp" />
     <ClCompile Include="..\..\core\Node\Node.cpp" />
+    <ClCompile Include="..\..\core\Node\Shape\Circle.cpp" />
+    <ClCompile Include="..\..\core\Node\Shape\Ellipse.cpp" />
+    <ClCompile Include="..\..\core\Node\Shape\Rect.cpp" />
+    <ClCompile Include="..\..\core\Node\Shape\RoundRect.cpp" />
+    <ClCompile Include="..\..\core\Node\Shape\Shape.cpp" />
     <ClCompile Include="..\..\core\Node\Sprite.cpp" />
     <ClCompile Include="..\..\core\Node\Text.cpp" />
-    <ClCompile Include="..\..\core\Shape\ShapeBase.cpp" />
-    <ClCompile Include="..\..\core\Shape\ShapeCircle.cpp" />
-    <ClCompile Include="..\..\core\Shape\ShapeEllipse.cpp" />
-    <ClCompile Include="..\..\core\Shape\ShapeRectangle.cpp" />
-    <ClCompile Include="..\..\core\Tool\CollisionListener.cpp" />
     <ClCompile Include="..\..\core\Tool\Data.cpp" />
-    <ClCompile Include="..\..\core\Tool\InputListener.cpp" />
+    <ClCompile Include="..\..\core\Tool\Listener\CollisionListener.cpp" />
-    <ClCompile Include="..\..\core\Tool\Listener.cpp" />
+    <ClCompile Include="..\..\core\Tool\Listener\InputListener.cpp" />
+    <ClCompile Include="..\..\core\Tool\Listener\Listener.cpp" />
     <ClCompile Include="..\..\core\Tool\Music.cpp" />
     <ClCompile Include="..\..\core\Tool\Path.cpp" />
     <ClCompile Include="..\..\core\Tool\Random.cpp" />
@@ -227,6 +220,19 @@
     <ClCompile Include="..\..\core\Transition\TransitionFade.cpp" />
     <ClCompile Include="..\..\core\Transition\TransitionMove.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\core\eaction.h" />
+    <ClInclude Include="..\..\core\easy2d.h" />
+    <ClInclude Include="..\..\core\ebase.h" />
+    <ClInclude Include="..\..\core\ecollider.h" />
+    <ClInclude Include="..\..\core\ecommon.h" />
+    <ClInclude Include="..\..\core\emacros.h" />
+    <ClInclude Include="..\..\core\emanager.h" />
+    <ClInclude Include="..\..\core\enode.h" />
+    <ClInclude Include="..\..\core\eshape.h" />
+    <ClInclude Include="..\..\core\etool.h" />
+    <ClInclude Include="..\..\core\etransition.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

project/vs2013/Easy2D.vcxproj.filters

@@ -22,21 +22,15 @@
     <Filter Include="Transition">
       <UniqueIdentifier>{337d5a0f-60fd-473a-83da-b2a3515affd9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Shape">
+    <Filter Include="Node\Shape">
-      <UniqueIdentifier>{dfaa8954-50d7-49c5-8aa6-7232c6d5c557}</UniqueIdentifier>
+      <UniqueIdentifier>{47b7c15b-ac05-4773-a9ee-7aa352830f02}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Collider">
+      <UniqueIdentifier>{2092de23-7fdd-430a-9936-1038c55b504b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tool\Listener">
+      <UniqueIdentifier>{8c3a8c7b-5406-400f-9ec1-db294632e449}</UniqueIdentifier>
     </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\core\eactions.h" />
-    <ClInclude Include="..\..\core\easy2d.h" />
-    <ClInclude Include="..\..\core\ebase.h" />
-    <ClInclude Include="..\..\core\ecommon.h" />
-    <ClInclude Include="..\..\core\emacros.h" />
-    <ClInclude Include="..\..\core\emanagers.h" />
-    <ClInclude Include="..\..\core\enodes.h" />
-    <ClInclude Include="..\..\core\etools.h" />
-    <ClInclude Include="..\..\core\etransitions.h" />
-    <ClInclude Include="..\..\core\eshape.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\core\Action\Action.cpp">
@@ -180,35 +174,63 @@
     <ClCompile Include="..\..\core\Tool\Data.cpp">
       <Filter>Tool</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\CollisionListener.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Tool\InputListener.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Listener.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\ShapeBase.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\ShapeCircle.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\ShapeEllipse.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Shape\ShapeRectangle.cpp">
-      <Filter>Shape</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp">
-      <Filter>Manager</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Manager\InputManager.cpp">
       <Filter>Manager</Filter>
     </ClCompile>
     <ClCompile Include="..\..\core\Action\ActionFunc.cpp">
       <Filter>Action</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\core\Node\Shape\Circle.cpp">
+      <Filter>Node\Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Node\Shape\Ellipse.cpp">
+      <Filter>Node\Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Node\Shape\Rect.cpp">
+      <Filter>Node\Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Node\Shape\RoundRect.cpp">
+      <Filter>Node\Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Node\Shape\Shape.cpp">
+      <Filter>Node\Shape</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Collider\Collider.cpp">
+      <Filter>Collider</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Collider\ColliderCircle.cpp">
+      <Filter>Collider</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Collider\ColliderEllipse.cpp">
+      <Filter>Collider</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Collider\ColliderRect.cpp">
+      <Filter>Collider</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Manager\ColliderManager.cpp">
+      <Filter>Manager</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Tool\Listener\CollisionListener.cpp">
+      <Filter>Tool\Listener</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Tool\Listener\InputListener.cpp">
+      <Filter>Tool\Listener</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Tool\Listener\Listener.cpp">
+      <Filter>Tool\Listener</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\core\eaction.h" />
+    <ClInclude Include="..\..\core\easy2d.h" />
+    <ClInclude Include="..\..\core\ebase.h" />
+    <ClInclude Include="..\..\core\ecollider.h" />
+    <ClInclude Include="..\..\core\ecommon.h" />
+    <ClInclude Include="..\..\core\emacros.h" />
+    <ClInclude Include="..\..\core\emanager.h" />
+    <ClInclude Include="..\..\core\enode.h" />
+    <ClInclude Include="..\..\core\eshape.h" />
+    <ClInclude Include="..\..\core\etool.h" />
+    <ClInclude Include="..\..\core\etransition.h" />
   </ItemGroup>
 </Project>

project/vs2017/Easy2D.vcxproj

@@ -240,10 +240,10 @@
     <ClCompile Include="..\..\core\Node\Shape\Shape.cpp" />
     <ClCompile Include="..\..\core\Node\Sprite.cpp" />
     <ClCompile Include="..\..\core\Node\Text.cpp" />
-    <ClCompile Include="..\..\core\Tool\CollisionListener.cpp" />
     <ClCompile Include="..\..\core\Tool\Data.cpp" />
-    <ClCompile Include="..\..\core\Tool\InputListener.cpp" />
+    <ClCompile Include="..\..\core\Tool\Listener\CollisionListener.cpp" />
-    <ClCompile Include="..\..\core\Tool\Listener.cpp" />
+    <ClCompile Include="..\..\core\Tool\Listener\InputListener.cpp" />
+    <ClCompile Include="..\..\core\Tool\Listener\Listener.cpp" />
     <ClCompile Include="..\..\core\Tool\Path.cpp" />
     <ClCompile Include="..\..\core\Tool\Music.cpp" />
     <ClCompile Include="..\..\core\Tool\Random.cpp" />

project/vs2017/Easy2D.vcxproj.filters

@@ -28,6 +28,9 @@
     <Filter Include="Node\Shape">
       <UniqueIdentifier>{eb72b49a-5b2f-4fc0-9ad2-8f5e02efac6f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Tool\Listener">
+      <UniqueIdentifier>{d3968182-2399-40d4-8e39-accb4711018c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\core\Base\Input.cpp">
@@ -171,18 +174,9 @@
     <ClCompile Include="..\..\core\Tool\Path.cpp">
       <Filter>Tool</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\InputListener.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Tool\CollisionListener.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Manager\InputManager.cpp">
       <Filter>Manager</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Listener.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\Action\ActionFunc.cpp">
       <Filter>Action</Filter>
     </ClCompile>
@@ -216,6 +210,15 @@
     <ClCompile Include="..\..\core\Node\Shape\Ellipse.cpp">
       <Filter>Node\Shape</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\core\Tool\Listener\CollisionListener.cpp">
+      <Filter>Tool\Listener</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Tool\Listener\InputListener.cpp">
+      <Filter>Tool\Listener</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\Tool\Listener\Listener.cpp">
+      <Filter>Tool\Listener</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\core\emacros.h" />