Refactoring : filters

core/Event/Collision.cpp

@@ -1,4 +1,4 @@
-#include "..\e2devent.h"
+#include "..\e2dobject.h"
 
 e2d::Collision::Collision()
 	: node_(nullptr)

core/Manager/CollisionManager.cpp

@@ -1,5 +1,5 @@
 #include "..\e2dmanager.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 #include "..\e2dtool.h"
 #include "..\e2dmodule.h"
 

core/Node/Scene.cpp

@@ -1,42 +0,0 @@
-#include "..\e2dmodule.h"
-#include "..\e2dnode.h"
-#include "..\e2dmanager.h"
-
-e2d::Scene::Scene()
-	: border_visible_(false)
-	, collider_visible_(false)
-{
-	parent_scene_ = this;
-}
-
-e2d::Scene::~Scene()
-{
-}
-
-void e2d::Scene::ShowBorder(bool visible)
-{
-	border_visible_ = visible;
-}
-
-void e2d::Scene::ShowCollider(bool visible)
-{
-	collider_visible_ = visible;
-}
-
-void e2d::Scene::Visit()
-{
-	Node::Visit();
-
-	if (border_visible_)
-	{
-		Renderer::GetInstance()->GetRenderTarget()->SetTransform(D2D1::Matrix3x2F::Identity());
-		Renderer::GetInstance()->GetSolidBrush()->SetOpacity(1.f);
-		this->DrawBorder();
-	}
-
-	if (collider_visible_)
-	{
-		Renderer::GetInstance()->GetRenderTarget()->SetTransform(D2D1::Matrix3x2F::Identity());
-		this->DrawCollider();
-	}
-}

core/actions/Animate.cpp

@@ -1,5 +1,5 @@
 #include "..\e2daction.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 e2d::Animate::Animate() 
 	: frame_index_(0)

core/actions/JumpBy.cpp

@@ -1,5 +1,5 @@
 #include "..\e2daction.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 e2d::JumpBy::JumpBy(float duration, const Point & vec, float height, int jumps)
 	: FiniteTimeAction(duration)

core/actions/JumpTo.cpp

@@ -1,5 +1,5 @@
 #include "..\e2daction.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 e2d::JumpTo::JumpTo(float duration, const Point & pos, float height, int jumps)
 	: JumpBy(duration, Point(), height, jumps)

core/actions/MoveBy.cpp

@@ -1,5 +1,5 @@
 #include "..\e2daction.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 
 e2d::MoveBy::MoveBy(float duration, Point vector)

core/actions/MoveTo.cpp

@@ -1,5 +1,5 @@
 #include "..\e2daction.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 e2d::MoveTo::MoveTo(float duration, Point pos)
 	: MoveBy(duration, Point())

core/actions/OpacityBy.cpp

@@ -1,5 +1,5 @@
 #include "..\e2daction.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 
 e2d::OpacityBy::OpacityBy(float duration, float opacity)

core/actions/OpacityTo.cpp

@@ -1,5 +1,5 @@
 #include "..\e2daction.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 
 e2d::OpacityTo::OpacityTo(float duration, float opacity)

core/actions/RotateBy.cpp

@@ -1,5 +1,5 @@
 #include "..\e2daction.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 
 e2d::RotateBy::RotateBy(float duration, float rotation)

core/actions/RotateTo.cpp

@@ -1,5 +1,5 @@
 #include "..\e2daction.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 
 e2d::RotateTo::RotateTo(float duration, float rotation)

core/actions/ScaleBy.cpp

@@ -1,5 +1,5 @@
 #include "..\e2daction.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 
 e2d::ScaleBy::ScaleBy(float duration, float scale)

core/actions/ScaleTo.cpp

@@ -1,5 +1,5 @@
 #include "..\e2daction.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 e2d::ScaleTo::ScaleTo(float duration, float scale)
 	: ScaleBy(duration, 0, 0)

core/e2dcomponent.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "e2dnode.h"
+#include "e2dobject.h"
 
 namespace e2d
 {

core/e2devent.h

@@ -112,28 +112,21 @@ namespace e2d
 	};
 
 
-	// 碰撞事件
+	// 事件接收目标
-	class Collision
+	class EventTarget
 	{
 	public:
-		Collision();
+		// 分发鼠标消息
+		virtual bool Dispatch(
+			const MouseEvent& e,
+			bool handled
+		) = 0;
 
-		explicit Collision(
+		// 分发按键消息
-			Node* node,
+		virtual bool Dispatch(
-			Collider::Relation relation
+			const KeyEvent& e,
-		);
+			bool handled
-
+		) = 0;
-		~Collision();
-
-		// 获取发生碰撞节点
-		Node* GetNode() const;
-
-		// 获取交集关系
-		Collider::Relation GetRelation() const;
-
-	protected:
-		Node * node_;
-		Collider::Relation relation_;
 	};
 
 }

core/e2dmanager.h

@@ -1,14 +1,10 @@
 #pragma once
-#include "e2dmacros.h"
+#include "e2dobject.h"
-#include "e2dutil.h"
 
 namespace e2d
 {
 
 
-	class Node;
-
-
 	// 碰撞体管理器
 	class CollisionManager
 	{

core/e2dmodule.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "e2dimpl.h"
-#include "e2dnode.h"
+#include "e2dobject.h"
 #include "e2dtransition.h"
 
 

core/e2dobject.h

@@ -2,12 +2,307 @@
 #include "e2dutil.h"
 #include "e2devent.h"
 
+
 namespace e2d
 {
 
 
-	class Action;
+	// 图片
-	class Scene;
+	class Image :
+		public Ref
+	{
+	public:
+		Image();
+
+		explicit Image(
+			const Resource& res
+		);
+
+		explicit Image(
+			const Resource& res,
+			const Rect& crop_rect	/* 裁剪矩形 */
+		);
+
+		explicit Image(
+			const String& file_name
+		);
+
+		explicit Image(
+			const String& file_name,
+			const Rect& crop_rect	/* 裁剪矩形 */
+		);
+
+		virtual ~Image();
+
+		// 加载图片资源
+		bool Open(
+			const Resource& res
+		);
+
+		// 加载图片资源
+		bool Open(
+			const String& file_name
+		);
+
+		// 将图片裁剪为矩形
+		void Crop(
+			const Rect& crop_rect	/* 裁剪矩形 */
+		);
+
+		// 获取宽度
+		virtual float GetWidth() const;
+
+		// 获取高度
+		virtual float GetHeight() const;
+
+		// 获取大小
+		virtual Size GetSize() const;
+
+		// 获取源图片宽度
+		virtual float GetSourceWidth() const;
+
+		// 获取源图片高度
+		virtual float GetSourceHeight() const;
+
+		// 获取源图片大小
+		virtual Size GetSourceSize() const;
+
+		// 获取裁剪位置 X 坐标
+		virtual float GetCropX() const;
+
+		// 获取裁剪位置 Y 坐标
+		virtual float GetCropY() const;
+
+		// 获取裁剪位置
+		virtual Point GetCropPos() const;
+
+		// 获取 ID2D1Bitmap 对象
+		ID2D1Bitmap * GetBitmap();
+
+		// 预加载图片资源
+		static bool Preload(
+			const String& file_name
+		);
+
+		// 预加载图片资源
+		static bool Preload(
+			const Resource& res
+		);
+
+		// 清空缓存
+		static void ClearCache();
+
+	protected:
+		E2D_DISABLE_COPY(Image);
+
+		// 设置 Bitmap
+		void SetBitmap(
+			ID2D1Bitmap * bitmap
+		);
+
+	protected:
+		Rect crop_rect_;
+		ID2D1Bitmap * bitmap_;
+
+		static std::map<size_t, ID2D1Bitmap*> bitmap_cache_;
+	};
+
+
+	class Node;
+
+	// 场景
+	class Scene :
+		public Ref,
+		public EventTarget
+	{
+	public:
+		Scene();
+
+		explicit Scene(
+			Node * root
+		);
+
+		virtual ~Scene();
+
+		// 进入场景
+		virtual void OnEnter() {}
+
+		// 退出场景
+		virtual void OnExit() {}
+
+		// 关闭窗口
+		// 说明：返回 false 将阻止窗口关闭
+		virtual bool OnCloseWindow() { return true; }
+
+		// 设置根节点
+		void SetRoot(
+			Node * root
+		);
+
+		// 获取根节点
+		Node* GetRoot() const;
+
+		// 显示或隐藏节点边缘
+		// 默认：隐藏
+		void ShowBorder(
+			bool visible
+		);
+
+		// 显示或隐藏碰撞体
+		// 默认：隐藏
+		void ShowCollider(
+			bool visible
+		);
+
+		// 渲染场景
+		void Draw();
+
+		// 分发鼠标消息
+		virtual bool Dispatch(
+			const MouseEvent& e,
+			bool handled
+		) override;
+
+		// 分发按键消息
+		virtual bool Dispatch(
+			const KeyEvent& e,
+			bool handled
+		) override;
+
+	protected:
+		E2D_DISABLE_COPY(Scene);
+
+	protected:
+		Node * root_;
+		bool	border_visible_;
+		bool	collider_visible_;
+	};
+
+
+	// 碰撞体
+	class Collider
+	{
+	public:
+		// 碰撞体形状
+		enum class Shape
+		{
+			None,		/* 无 */
+			Rect,		/* 矩形 */
+			Circle,		/* 圆形 */
+			Ellipse		/* 椭圆形 */
+		};
+
+		// 碰撞体交集关系
+		enum class Relation : int
+		{
+			Unknown = 0,		/* 关系不确定 */
+			Disjoin = 1,		/* 没有交集 */
+			IsContained = 2,	/* 完全被包含 */
+			Contains = 3,		/* 完全包含 */
+			Overlap = 4			/* 部分重叠 */
+		};
+
+	public:
+		explicit Collider(
+			Node * parent
+		);
+
+		virtual ~Collider();
+
+		// 设置碰撞体形状
+		void SetShape(
+			Shape shape
+		);
+
+		// 是否触发碰撞事件
+		void SetCollisionNotify(
+			bool notify
+		);
+
+		// 启用或关闭该碰撞体
+		void SetEnabled(
+			bool enabled
+		);
+
+		// 设置碰撞体的可见性
+		void SetVisible(
+			bool visible
+		);
+
+		// 设置绘制颜色
+		void SetBorderColor(
+			const Color& color
+		);
+
+		// 判断两碰撞体的交集关系
+		Relation GetRelationWith(
+			Collider * collider
+		) const;
+
+		// 是否启用碰撞体
+		bool IsEnabled() const;
+
+		// 是否可见
+		bool IsVisible() const;
+
+		// 是否触发碰撞事件
+		bool IsCollisionNotify() const;
+
+		// 获取绘制颜色
+		const Color& GetBorderColor() const;
+
+		// 获取形状
+		Shape GetShape() const;
+
+		// 获取绑定节点
+		Node* GetNode() const;
+
+		// 获取 ID2D1Geometry* 对象
+		ID2D1Geometry* GetGeometry() const;
+
+		// 重新生成
+		void Recreate();
+
+		// 渲染碰撞体
+		void Draw();
+
+	protected:
+		E2D_DISABLE_COPY(Collider);
+
+	protected:
+		bool	enabled_;
+		bool	visible_;
+		bool	notify_;
+		Color	border_color_;
+		Node *	parent_node_;
+		Shape	shape_;
+		ID2D1Geometry* geometry_;
+	};
+
+
+	// 碰撞事件
+	class Collision
+	{
+	public:
+		Collision();
+
+		explicit Collision(
+			Node* node,
+			Collider::Relation relation
+		);
+
+		~Collision();
+
+		// 获取发生碰撞节点
+		Node* GetNode() const;
+
+		// 获取交集关系
+		Collider::Relation GetRelation() const;
+
+	protected:
+		Node * node_;
+		Collider::Relation relation_;
+	};
 
 
 	// 绘图接口
@@ -55,10 +350,14 @@ namespace e2d
 	};
 
 
+	class Action;
+
 	// 节点
 	class Node :
-		public Ref
+		public Ref,
+		public EventTarget
 	{
+		friend class Scene;
 		friend class Collider;
 
 	public:
@@ -421,13 +720,13 @@ namespace e2d
 		virtual bool Dispatch(
 			const MouseEvent& e,
 			bool handled
-		);
+		) override;
 
 		// 分发按键消息
 		virtual bool Dispatch(
 			const KeyEvent& e,
 			bool handled
-		);
+		) override;
 
 		// 遍历节点
 		virtual void Visit();
@@ -488,49 +787,6 @@ namespace e2d
 	};
 
 
-	// 场景
-	class Scene :
-		public Node
-	{
-	public:
-		Scene();
-
-		virtual ~Scene();
-
-		// 进入场景
-		virtual void OnEnter() {}
-
-		// 退出场景
-		virtual void OnExit() {}
-
-		// 关闭窗口
-		// 说明：返回 false 将阻止窗口关闭
-		virtual bool OnCloseWindow() { return true; }
-
-		// 显示或隐藏节点边缘
-		// 默认：隐藏
-		void ShowBorder(
-			bool visible
-		);
-
-		// 显示或隐藏碰撞体
-		// 默认：隐藏
-		void ShowCollider(
-			bool visible
-		);
-
-		// 遍历节点
-		virtual void Visit() override;
-
-	protected:
-		E2D_DISABLE_COPY(Scene);
-
-	protected:
-		bool border_visible_;
-		bool collider_visible_;
-	};
-
-
 	// 精灵
 	class Sprite :
 		public Node,

core/e2dtool.h

@@ -50,11 +50,8 @@ namespace e2d
 
 
 	// ÒôÀÖ
-	class Music :
+	class Music
-		public Ref
 	{
-		friend class VoiceCallback;
-
 	public:
 		Music();
 
@@ -117,16 +114,16 @@ namespace e2d
 		IXAudio2SourceVoice * GetSourceVoice() const;
 
 	protected:
-		bool _readMMIO();
+		bool ReadMMIO();
 
-		bool _resetFile();
+		bool ResetFile();
 
-		bool _read(
+		bool Read(
 			BYTE* buffer,
 			DWORD size_to_read
 		);
 
-		bool _findMediaFileCch(
+		bool FindMediaFileCch(
 			wchar_t* dest_path,
 			int cch_dest,
 			const wchar_t * file_name

core/e2dutil.h

@@ -586,109 +586,6 @@ namespace e2d
 	};
 
 
-	class Node;
-
-	// 碰撞体
-	class Collider
-	{
-	public:
-		// 碰撞体形状
-		enum class Shape
-		{
-			None,		/* 无 */
-			Rect,		/* 矩形 */
-			Circle,		/* 圆形 */
-			Ellipse		/* 椭圆形 */
-		};
-
-		// 碰撞体交集关系
-		enum class Relation : int
-		{
-			Unknown = 0,		/* 关系不确定 */
-			Disjoin = 1,		/* 没有交集 */
-			IsContained = 2,	/* 完全被包含 */
-			Contains = 3,		/* 完全包含 */
-			Overlap = 4			/* 部分重叠 */
-		};
-
-	public:
-		explicit Collider(
-			Node * parent
-		);
-
-		virtual ~Collider();
-
-		// 设置碰撞体形状
-		void SetShape(
-			Shape shape
-		);
-
-		// 是否触发碰撞事件
-		void SetCollisionNotify(
-			bool notify
-		);
-
-		// 启用或关闭该碰撞体
-		void SetEnabled(
-			bool enabled
-		);
-
-		// 设置碰撞体的可见性
-		void SetVisible(
-			bool visible
-		);
-
-		// 设置绘制颜色
-		void SetBorderColor(
-			const Color& color
-		);
-
-		// 判断两碰撞体的交集关系
-		Relation GetRelationWith(
-			Collider * collider
-		) const;
-
-		// 是否启用碰撞体
-		bool IsEnabled() const;
-
-		// 是否可见
-		bool IsVisible() const;
-
-		// 是否触发碰撞事件
-		bool IsCollisionNotify() const;
-
-		// 获取绘制颜色
-		const Color& GetBorderColor() const;
-
-		// 获取形状
-		Shape GetShape() const;
-
-		// 获取绑定节点
-		Node* GetNode() const;
-
-		// 获取 ID2D1Geometry* 对象
-		ID2D1Geometry* GetGeometry() const;
-
-		// 重新生成
-		void Recreate();
-
-		// 渲染碰撞体
-		void Draw();
-
-	protected:
-		E2D_DISABLE_COPY(Collider);
-
-	protected:
-		bool	enabled_;
-		bool	visible_;
-		bool	notify_;
-		Color	border_color_;
-		Node *	parent_node_;
-		Shape	shape_;
-		ID2D1Geometry* geometry_;
-	};
-
-
 	// ×ÊÔ´
 	class Resource
 	{
@@ -729,107 +626,6 @@ namespace e2d
 	};
 
 
-	// 图片
-	class Image :
-		public Ref
-	{
-	public:
-		Image();
-
-		explicit Image(
-			const Resource& res
-		);
-
-		explicit Image(
-			const Resource& res,
-			const Rect& crop_rect	/* 裁剪矩形 */
-		);
-
-		explicit Image(
-			const String& file_name
-		);
-
-		explicit Image(
-			const String& file_name,
-			const Rect& crop_rect	/* 裁剪矩形 */
-		);
-
-		virtual ~Image();
-
-		// 加载图片资源
-		bool Open(
-			const Resource& res
-		);
-
-		// 加载图片资源
-		bool Open(
-			const String& file_name
-		);
-
-		// 将图片裁剪为矩形
-		void Crop(
-			const Rect& crop_rect	/* 裁剪矩形 */
-		);
-
-		// 获取宽度
-		virtual float GetWidth() const;
-
-		// 获取高度
-		virtual float GetHeight() const;
-
-		// 获取大小
-		virtual Size GetSize() const;
-
-		// 获取源图片宽度
-		virtual float GetSourceWidth() const;
-
-		// 获取源图片高度
-		virtual float GetSourceHeight() const;
-
-		// 获取源图片大小
-		virtual Size GetSourceSize() const;
-
-		// 获取裁剪位置 X 坐标
-		virtual float GetCropX() const;
-
-		// 获取裁剪位置 Y 坐标
-		virtual float GetCropY() const;
-
-		// 获取裁剪位置
-		virtual Point GetCropPos() const;
-
-		// 获取 ID2D1Bitmap 对象
-		ID2D1Bitmap * GetBitmap();
-
-		// 预加载图片资源
-		static bool Preload(
-			const String& file_name
-		);
-
-		// 预加载图片资源
-		static bool Preload(
-			const Resource& res
-		);
-
-		// 清空缓存
-		static void ClearCache();
-
-	protected:
-		E2D_DISABLE_COPY(Image);
-
-		// 设置 Bitmap
-		void SetBitmap(
-			ID2D1Bitmap * bitmap
-		);
-
-	protected:
-		Rect crop_rect_;
-		ID2D1Bitmap * bitmap_;
-
-		static std::map<size_t, ID2D1Bitmap*> bitmap_cache_;
-	};
-
-
 }
 
 

core/easy2d.h

@@ -20,7 +20,7 @@
 #include "e2dmacros.h"
 #include "e2dutil.h"
 #include "e2dmanager.h"
-#include "e2dnode.h"
+#include "e2dobject.h"
 #include "e2dcomponent.h"
 #include "e2dtool.h"
 #include "e2daction.h"

core/modules/Game.cpp

@@ -1,5 +1,5 @@
 #include "..\e2dmodule.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 #include "..\e2dtransition.h"
 #include "..\e2dmanager.h"
 #include "..\e2dtool.h"
@@ -102,7 +102,7 @@ void e2d::Game::Resume()
 	{
 		Timer::GetInstance()->UpdateTime();
 		if (curr_scene_)
-			curr_scene_->UpdateActionsTime();
+			curr_scene_->GetRoot()->UpdateActionsTime();
 	}
 	paused_ = false;
 }
@@ -204,7 +204,7 @@ void e2d::Game::DrawScene()
 		}
 		else if (curr_scene_)
 		{
-			curr_scene_->Visit();
+			curr_scene_->Draw();
 		}
 	}
 	Renderer::GetInstance()->EndDraw();

core/modules/Renderer.cpp

@@ -1,6 +1,6 @@
 #include "..\e2dmodule.h"
 #include "..\e2dmanager.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 
 e2d::Renderer*		e2d::Renderer::instance_ = nullptr;

core/modules/Window.cpp

@@ -1,6 +1,6 @@
 #include "..\e2dmodule.h"
 #include "..\e2dmanager.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 #include <imm.h>
 #pragma comment (lib ,"imm32.lib")
 

core/objects/Canvas.cpp

@@ -1,4 +1,4 @@
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 #include "..\e2dmodule.h"
 
 e2d::Canvas::Canvas(float width, float height)

core/objects/Collider.cpp

@@ -2,7 +2,7 @@
 #include "..\e2dimpl.h"
 #include "..\e2dmodule.h"
 #include "..\e2dmanager.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 e2d::Collider::Collider(Node * parent)
 	: visible_(true)

core/objects/Image.cpp

@@ -1,4 +1,4 @@
-#include "..\e2dutil.h"
+#include "..\e2dobject.h"
 #include "..\e2dmodule.h"
 #include "..\e2dtool.h"
 

core/objects/Node.cpp

@@ -1,4 +1,4 @@
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 #include "..\e2devent.h"
 #include "..\e2dmanager.h"
 #include "..\e2daction.h"

core/objects/Object.cpp

@@ -1,4 +1,4 @@
-#include "..\e2dutil.h"
+#include "..\e2dobject.h"
 
 e2d::Ref::Ref()
 	: ref_count_(0)

core/objects/Scene.cpp

@@ -0,0 +1,100 @@
+#include "..\e2dmodule.h"
+#include "..\e2dobject.h"
+
+e2d::Scene::Scene()
+	: root_(nullptr)
+	, border_visible_(false)
+	, collider_visible_(false)
+{
+}
+
+e2d::Scene::Scene(Node * root)
+	: root_(nullptr)
+	, border_visible_(false)
+	, collider_visible_(false)
+{
+	this->SetRoot(root);
+}
+
+e2d::Scene::~Scene()
+{
+	if (root_)
+	{
+		root_->Release();
+		root_->SetParentScene(nullptr);
+	}
+}
+
+void e2d::Scene::SetRoot(Node * root)
+{
+	if (root_ == root)
+		return;
+
+	if (root_)
+	{
+		root_->Release();
+		root_->SetParentScene(nullptr);
+	}
+
+	if (root)
+	{
+		root->Retain();
+		root->SetParentScene(this);
+	}
+
+	root_ = root;
+}
+
+e2d::Node * e2d::Scene::GetRoot() const
+{
+	return root_;
+}
+
+void e2d::Scene::ShowBorder(bool visible)
+{
+	border_visible_ = visible;
+}
+
+void e2d::Scene::ShowCollider(bool visible)
+{
+	collider_visible_ = visible;
+}
+
+void e2d::Scene::Draw()
+{
+	if (root_)
+	{
+		root_->Visit();
+
+		if (border_visible_)
+		{
+			Renderer::GetInstance()->GetRenderTarget()->SetTransform(D2D1::Matrix3x2F::Identity());
+			Renderer::GetInstance()->GetSolidBrush()->SetOpacity(1.f);
+			root_->DrawBorder();
+		}
+
+		if (collider_visible_)
+		{
+			Renderer::GetInstance()->GetRenderTarget()->SetTransform(D2D1::Matrix3x2F::Identity());
+			root_->DrawCollider();
+		}
+	}
+}
+
+bool e2d::Scene::Dispatch(const MouseEvent & e, bool handled)
+{
+	if (root_)
+	{
+		return root_->Dispatch(e, handled);
+	}
+	return false;
+}
+
+bool e2d::Scene::Dispatch(const KeyEvent & e, bool handled)
+{
+	if (root_)
+	{
+		return root_->Dispatch(e, handled);
+	}
+	return false;
+}

core/objects/Sprite.cpp

@@ -1,4 +1,4 @@
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 #include "..\e2dmodule.h"
 
 e2d::Sprite::Sprite()

core/objects/Text.cpp

@@ -1,4 +1,4 @@
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 #include "..\e2dmodule.h"
 
 //-------------------------------------------------------

core/tools/Music.cpp

@@ -88,7 +88,7 @@ bool e2d::Music::Open(const e2d::String & file_path)
 
 	// 定位 wave 文件
 	wchar_t pFilePath[MAX_PATH];
-	if (!_findMediaFileCch(pFilePath, MAX_PATH, (const wchar_t *)actualFilePath))
+	if (!FindMediaFileCch(pFilePath, MAX_PATH, (const wchar_t *)actualFilePath))
 	{
 		WARN("Failed to Find media file: %s", pFilePath);
 		return false;
@@ -101,14 +101,14 @@ bool e2d::Music::Open(const e2d::String & file_path)
 		return TraceError(L"mmioOpen");
 	}
 
-	if (!_readMMIO())
+	if (!ReadMMIO())
 	{
 		// 读取非 wave 文件时 ReadMMIO 调用失败
 		mmioClose(hmmio_, 0);
 		return TraceError(L"ReadMMIO");
 	}
 
-	if (!_resetFile())
+	if (!ResetFile())
 		return TraceError(L"ResetFile");
 
 	// 重置文件后，wave 文件的大小是 ck_.cksize
@@ -117,7 +117,7 @@ bool e2d::Music::Open(const e2d::String & file_path)
 	// 将样本数据读取到内存中
 	wave_data_ = new BYTE[size_];
 
-	if (!_read(wave_data_, size_))
+	if (!Read(wave_data_, size_))
 	{
 		TraceError(L"Failed to read WAV data");
 		SAFE_DELETE_ARRAY(wave_data_);
@@ -179,14 +179,14 @@ bool e2d::Music::Open(const Resource& res)
 		return TraceError(L"mmioOpen");
 	}
 
-	if (!_readMMIO())
+	if (!ReadMMIO())
 	{
 		// 读取非 wave 文件时 ReadMMIO 调用失败
 		mmioClose(hmmio_, 0);
 		return TraceError(L"ReadMMIO");
 	}
 
-	if (!_resetFile())
+	if (!ResetFile())
 		return TraceError(L"ResetFile");
 
 	// 重置文件后，wave 文件的大小是 ck_.cksize
@@ -195,7 +195,7 @@ bool e2d::Music::Open(const Resource& res)
 	// 将样本数据读取到内存中
 	wave_data_ = new BYTE[size_];
 
-	if (!_read(wave_data_, size_))
+	if (!Read(wave_data_, size_))
 	{
 		TraceError(L"Failed to read WAV data");
 		SAFE_DELETE_ARRAY(wave_data_);
@@ -349,7 +349,7 @@ void e2d::Music::SetCallbackOnLoopEnd(const Function & func)
 	callback_.SetCallbackOnLoopEnd(func);
 }
 
-bool e2d::Music::_readMMIO()
+bool e2d::Music::ReadMMIO()
 {
 	MMCKINFO ckIn;
 	PCMWAVEFORMAT pcmWaveFormat;
@@ -421,7 +421,7 @@ bool e2d::Music::_readMMIO()
 	return true;
 }
 
-bool e2d::Music::_resetFile()
+bool e2d::Music::ResetFile()
 {
 	// Seek to the data
 	if (-1 == mmioSeek(hmmio_, ck_riff_.dwDataOffset + sizeof(FOURCC),
@@ -436,7 +436,7 @@ bool e2d::Music::_resetFile()
 	return true;
 }
 
-bool e2d::Music::_read(BYTE* buffer, DWORD size_to_read)
+bool e2d::Music::Read(BYTE* buffer, DWORD size_to_read)
 {
 	MMIOINFO mmioinfoIn; // current status of hmmio_
 
@@ -472,7 +472,7 @@ bool e2d::Music::_read(BYTE* buffer, DWORD size_to_read)
 	return true;
 }
 
-bool e2d::Music::_findMediaFileCch(wchar_t* dest_path, int cch_dest, const wchar_t * file_name)
+bool e2d::Music::FindMediaFileCch(wchar_t* dest_path, int cch_dest, const wchar_t * file_name)
 {
 	bool bFound = false;
 

core/transitions/BoxTransition.cpp

@@ -1,5 +1,5 @@
 #include "..\e2dtransition.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 #include "..\e2dmodule.h"
 
 e2d::BoxTransition::BoxTransition(Scene* scene, float duration)

core/transitions/EmergeTransition.cpp

@@ -1,5 +1,5 @@
 #include "..\e2dtransition.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 e2d::EmergeTransition::EmergeTransition(Scene* scene, float duration)
 	: Transition(scene, duration)

core/transitions/FadeTransition.cpp

@@ -1,5 +1,5 @@
 #include "..\e2dtransition.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 e2d::FadeTransition::FadeTransition(Scene* scene, float duration)
 	: Transition(scene, duration)

core/transitions/MoveTransition.cpp

@@ -1,5 +1,5 @@
 #include "..\e2dtransition.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 #include "..\e2dmodule.h"
 
 e2d::MoveTransition::MoveTransition(Scene* scene, float duration, Direction direction)
@@ -34,8 +34,8 @@ bool e2d::MoveTransition::Init(Game * game, Scene * prev)
 			start_pos_ = Point(-size.width, 0);
 		}
 
-		if (out_scene_) out_scene_->SetPos(0, 0);
+		if (out_scene_ && out_scene_->GetRoot()) out_scene_->GetRoot()->SetPos(0, 0);
-		in_scene_->SetPos(start_pos_);
+		if (in_scene_->GetRoot()) in_scene_->GetRoot()->SetPos(start_pos_);
 		return true;
 	}
 	return false;
@@ -45,13 +45,14 @@ void e2d::MoveTransition::Update()
 {
 	Transition::Update();
 
-	if (out_scene_)
+	if (out_scene_ && out_scene_->GetRoot())
 	{
-		out_scene_->SetPos(pos_delta_ * delta_);
+		out_scene_->GetRoot()->SetPos(pos_delta_ * delta_);
 	}
-	if (in_scene_)
+
+	if (in_scene_->GetRoot())
 	{
-		in_scene_->SetPos(start_pos_ + pos_delta_ * delta_);
+		in_scene_->GetRoot()->SetPos(start_pos_ + pos_delta_ * delta_);
 	}
 
 	if (delta_ >= 1)
@@ -62,6 +63,13 @@ void e2d::MoveTransition::Update()
 
 void e2d::MoveTransition::Reset()
 {
-	if (out_scene_) out_scene_->SetPos(0, 0);
+	if (out_scene_ && out_scene_->GetRoot())
-	in_scene_->SetPos(0, 0);
+	{
+		out_scene_->GetRoot()->SetPos(0, 0);
+	}
+	
+	if (in_scene_->GetRoot())
+	{
+		in_scene_->GetRoot()->SetPos(0, 0);
+	}
 }

core/transitions/Transition.cpp

@@ -1,6 +1,6 @@
 #include "..\e2dmodule.h"
 #include "..\e2dtransition.h"
-#include "..\e2dnode.h"
+#include "..\e2dobject.h"
 
 e2d::Transition::Transition(Scene* scene, float duration)
 	: done_(false)
@@ -87,9 +87,9 @@ void e2d::Transition::Draw()
 	auto render_target = Renderer::GetInstance()->GetRenderTarget();
 	auto size = Window::GetInstance()->GetSize();
 
-	if (out_scene_)
+	if (out_scene_ && out_scene_->GetRoot())
 	{
-		auto rootPos = out_scene_->GetPos();
+		auto rootPos = out_scene_->GetRoot()->GetPos();
 		auto clipRect = D2D1::RectF(
 			std::max(rootPos.x, 0.f),
 			std::max(rootPos.y, 0.f),
@@ -100,15 +100,15 @@ void e2d::Transition::Draw()
 		render_target->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE);
 		render_target->PushLayer(out_layer_param_, out_layer_);
 
-		out_scene_->Visit();
+		out_scene_->Draw();
 
 		render_target->PopLayer();
 		render_target->PopAxisAlignedClip();
 	}
 
-	if (in_scene_)
+	if (in_scene_ && in_scene_->GetRoot())
 	{
-		Point rootPos = in_scene_->GetPos();
+		Point rootPos = in_scene_->GetRoot()->GetPos();
 		auto clipRect = D2D1::RectF(
 			std::max(rootPos.x, 0.f),
 			std::max(rootPos.y, 0.f),
@@ -119,7 +119,7 @@ void e2d::Transition::Draw()
 		render_target->PushAxisAlignedClip(clipRect, D2D1_ANTIALIAS_MODE_PER_PRIMITIVE);
 		render_target->PushLayer(in_layer_param_, in_layer_);
 
-		in_scene_->Visit();
+		in_scene_->Draw();
 
 		render_target->PopLayer();
 		render_target->PopAxisAlignedClip();

project/vs2012/Easy2D.vcxproj

@@ -19,7 +19,78 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\core\e2dnode.h" />
+    <ClCompile Include="..\..\core\actions\Action.cpp" />
+    <ClCompile Include="..\..\core\actions\Animate.cpp" />
+    <ClCompile Include="..\..\core\actions\Animation.cpp" />
+    <ClCompile Include="..\..\core\actions\Callback.cpp" />
+    <ClCompile Include="..\..\core\actions\Delay.cpp" />
+    <ClCompile Include="..\..\core\actions\FadeIn.cpp" />
+    <ClCompile Include="..\..\core\actions\FadeOut.cpp" />
+    <ClCompile Include="..\..\core\actions\FiniteTimeAction.cpp" />
+    <ClCompile Include="..\..\core\actions\JumpBy.cpp" />
+    <ClCompile Include="..\..\core\actions\JumpTo.cpp" />
+    <ClCompile Include="..\..\core\actions\Loop.cpp" />
+    <ClCompile Include="..\..\core\actions\MoveBy.cpp" />
+    <ClCompile Include="..\..\core\actions\MoveTo.cpp" />
+    <ClCompile Include="..\..\core\actions\OpacityBy.cpp" />
+    <ClCompile Include="..\..\core\actions\OpacityTo.cpp" />
+    <ClCompile Include="..\..\core\actions\RotateBy.cpp" />
+    <ClCompile Include="..\..\core\actions\RotateTo.cpp" />
+    <ClCompile Include="..\..\core\actions\ScaleBy.cpp" />
+    <ClCompile Include="..\..\core\actions\ScaleTo.cpp" />
+    <ClCompile Include="..\..\core\actions\Sequence.cpp" />
+    <ClCompile Include="..\..\core\actions\Spawn.cpp" />
+    <ClCompile Include="..\..\core\components\Button.cpp" />
+    <ClCompile Include="..\..\core\components\Menu.cpp" />
+    <ClCompile Include="..\..\core\components\ToggleButton.cpp" />
+    <ClCompile Include="..\..\core\event\Collision.cpp" />
+    <ClCompile Include="..\..\core\event\KeyEvent.cpp" />
+    <ClCompile Include="..\..\core\event\MouseEvent.cpp" />
+    <ClCompile Include="..\..\core\impl\Exception.cpp" />
+    <ClCompile Include="..\..\core\impl\SystemException.cpp" />
+    <ClCompile Include="..\..\core\impl\TextRenderer.cpp" />
+    <ClCompile Include="..\..\core\impl\VoiceCallback.cpp" />
+    <ClCompile Include="..\..\core\manager\CollisionManager.cpp" />
+    <ClCompile Include="..\..\core\modules\Audio.cpp" />
+    <ClCompile Include="..\..\core\modules\Game.cpp" />
+    <ClCompile Include="..\..\core\modules\GC.cpp" />
+    <ClCompile Include="..\..\core\modules\Input.cpp" />
+    <ClCompile Include="..\..\core\modules\Renderer.cpp" />
+    <ClCompile Include="..\..\core\modules\Window.cpp" />
+    <ClCompile Include="..\..\core\objects\Canvas.cpp" />
+    <ClCompile Include="..\..\core\objects\Collider.cpp" />
+    <ClCompile Include="..\..\core\objects\Image.cpp" />
+    <ClCompile Include="..\..\core\objects\Node.cpp" />
+    <ClCompile Include="..\..\core\objects\Object.cpp" />
+    <ClCompile Include="..\..\core\objects\Scene.cpp" />
+    <ClCompile Include="..\..\core\objects\Sprite.cpp" />
+    <ClCompile Include="..\..\core\objects\Text.cpp" />
+    <ClCompile Include="..\..\core\tools\Data.cpp" />
+    <ClCompile Include="..\..\core\tools\File.cpp" />
+    <ClCompile Include="..\..\core\tools\Music.cpp" />
+    <ClCompile Include="..\..\core\tools\Path.cpp" />
+    <ClCompile Include="..\..\core\tools\Player.cpp" />
+    <ClCompile Include="..\..\core\tools\Random.cpp" />
+    <ClCompile Include="..\..\core\tools\Task.cpp" />
+    <ClCompile Include="..\..\core\tools\Timer.cpp" />
+    <ClCompile Include="..\..\core\transitions\BoxTransition.cpp" />
+    <ClCompile Include="..\..\core\transitions\EmergeTransition.cpp" />
+    <ClCompile Include="..\..\core\transitions\FadeTransition.cpp" />
+    <ClCompile Include="..\..\core\transitions\MoveTransition.cpp" />
+    <ClCompile Include="..\..\core\transitions\Transition.cpp" />
+    <ClCompile Include="..\..\core\utils\Color.cpp" />
+    <ClCompile Include="..\..\core\utils\Duration.cpp" />
+    <ClCompile Include="..\..\core\utils\Font.cpp" />
+    <ClCompile Include="..\..\core\utils\Function.cpp" />
+    <ClCompile Include="..\..\core\utils\Point.cpp" />
+    <ClCompile Include="..\..\core\utils\Rect.cpp" />
+    <ClCompile Include="..\..\core\utils\Resource.cpp" />
+    <ClCompile Include="..\..\core\utils\Size.cpp" />
+    <ClCompile Include="..\..\core\utils\String.cpp" />
+    <ClCompile Include="..\..\core\utils\Time.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\core\e2dobject.h" />
     <ClInclude Include="..\..\core\easy2d.h" />
     <ClInclude Include="..\..\core\e2daction.h" />
     <ClInclude Include="..\..\core\e2dutil.h" />
@@ -32,77 +103,6 @@
     <ClInclude Include="..\..\core\e2dtool.h" />
     <ClInclude Include="..\..\core\e2dtransition.h" />
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\core\Action\Action.cpp" />
-    <ClCompile Include="..\..\core\Action\Animate.cpp" />
-    <ClCompile Include="..\..\core\Action\Animation.cpp" />
-    <ClCompile Include="..\..\core\Action\Callback.cpp" />
-    <ClCompile Include="..\..\core\Action\Delay.cpp" />
-    <ClCompile Include="..\..\core\Action\FadeIn.cpp" />
-    <ClCompile Include="..\..\core\Action\FadeOut.cpp" />
-    <ClCompile Include="..\..\core\Action\FiniteTimeAction.cpp" />
-    <ClCompile Include="..\..\core\Action\JumpBy.cpp" />
-    <ClCompile Include="..\..\core\Action\JumpTo.cpp" />
-    <ClCompile Include="..\..\core\Action\Loop.cpp" />
-    <ClCompile Include="..\..\core\Action\MoveBy.cpp" />
-    <ClCompile Include="..\..\core\Action\MoveTo.cpp" />
-    <ClCompile Include="..\..\core\Action\OpacityBy.cpp" />
-    <ClCompile Include="..\..\core\Action\OpacityTo.cpp" />
-    <ClCompile Include="..\..\core\Action\RotateBy.cpp" />
-    <ClCompile Include="..\..\core\Action\RotateTo.cpp" />
-    <ClCompile Include="..\..\core\Action\ScaleBy.cpp" />
-    <ClCompile Include="..\..\core\Action\ScaleTo.cpp" />
-    <ClCompile Include="..\..\core\Action\Sequence.cpp" />
-    <ClCompile Include="..\..\core\Action\Spawn.cpp" />
-    <ClCompile Include="..\..\core\Base\Audio.cpp" />
-    <ClCompile Include="..\..\core\Base\Game.cpp" />
-    <ClCompile Include="..\..\core\Base\GC.cpp" />
-    <ClCompile Include="..\..\core\Base\Input.cpp" />
-    <ClCompile Include="..\..\core\Base\Renderer.cpp" />
-    <ClCompile Include="..\..\core\Base\Window.cpp" />
-    <ClCompile Include="..\..\core\Common\Collider.cpp" />
-    <ClCompile Include="..\..\core\Common\Color.cpp" />
-    <ClCompile Include="..\..\core\Common\Duration.cpp" />
-    <ClCompile Include="..\..\core\Common\Font.cpp" />
-    <ClCompile Include="..\..\core\Common\Function.cpp" />
-    <ClCompile Include="..\..\core\Common\Image.cpp" />
-    <ClCompile Include="..\..\core\Common\Ref.cpp" />
-    <ClCompile Include="..\..\core\Common\Resource.cpp" />
-    <ClCompile Include="..\..\core\Common\Point.cpp" />
-    <ClCompile Include="..\..\core\Common\Rect.cpp" />
-    <ClCompile Include="..\..\core\Common\Size.cpp" />
-    <ClCompile Include="..\..\core\Common\String.cpp" />
-    <ClCompile Include="..\..\core\Common\Time.cpp" />
-    <ClCompile Include="..\..\core\Custom\Exception.cpp" />
-    <ClCompile Include="..\..\core\Custom\SystemException.cpp" />
-    <ClCompile Include="..\..\core\Custom\TextRenderer.cpp" />
-    <ClCompile Include="..\..\core\Custom\VoiceCallback.cpp" />
-    <ClCompile Include="..\..\core\Event\Collision.cpp" />
-    <ClCompile Include="..\..\core\Event\KeyEvent.cpp" />
-    <ClCompile Include="..\..\core\Event\MouseEvent.cpp" />
-    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp" />
-    <ClCompile Include="..\..\core\Node\Canvas.cpp" />
-    <ClCompile Include="..\..\core\Node\Scene.cpp" />
-    <ClCompile Include="..\..\core\Node\Node.cpp" />
-    <ClCompile Include="..\..\core\Node\Sprite.cpp" />
-    <ClCompile Include="..\..\core\Node\Text.cpp" />
-    <ClCompile Include="..\..\core\Component\Button.cpp" />
-    <ClCompile Include="..\..\core\Component\ToggleButton.cpp" />
-    <ClCompile Include="..\..\core\Component\Menu.cpp" />
-    <ClCompile Include="..\..\core\Tool\Data.cpp" />
-    <ClCompile Include="..\..\core\Tool\File.cpp" />
-    <ClCompile Include="..\..\core\Tool\Music.cpp" />
-    <ClCompile Include="..\..\core\Tool\Path.cpp" />
-    <ClCompile Include="..\..\core\Tool\Player.cpp" />
-    <ClCompile Include="..\..\core\Tool\Random.cpp" />
-    <ClCompile Include="..\..\core\Tool\Task.cpp" />
-    <ClCompile Include="..\..\core\Tool\Timer.cpp" />
-    <ClCompile Include="..\..\core\Transition\BoxTransition.cpp" />
-    <ClCompile Include="..\..\core\Transition\EmergeTransition.cpp" />
-    <ClCompile Include="..\..\core\Transition\FadeTransition.cpp" />
-    <ClCompile Include="..\..\core\Transition\MoveTransition.cpp" />
-    <ClCompile Include="..\..\core\Transition\Transition.cpp" />
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{722EA245-ADD5-4296-8C85-8FF42C0335D3}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>

project/vs2012/Easy2D.vcxproj.filters

@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Action">
+    <Filter Include="utils">
-      <UniqueIdentifier>{01311827-b639-4313-a5b6-61cd22fe8920}</UniqueIdentifier>
+      <UniqueIdentifier>{be5d9314-b00a-4f11-bd2a-1f720dc32407}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Base">
+    <Filter Include="modules">
-      <UniqueIdentifier>{e5c42dd3-2d56-4a95-8f88-45d059d58c21}</UniqueIdentifier>
+      <UniqueIdentifier>{261633d3-3814-40c7-bd6d-201ede6c6ade}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Common">
+    <Filter Include="actions">
-      <UniqueIdentifier>{08126b0c-d139-48f9-8559-3d9d9e3a5940}</UniqueIdentifier>
+      <UniqueIdentifier>{50293f38-87fe-4dde-b938-cf1b7a2921f8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Manager">
+    <Filter Include="components">
-      <UniqueIdentifier>{a8185fe2-5477-4293-97d6-d84f27d354bb}</UniqueIdentifier>
+      <UniqueIdentifier>{7ffdcb87-b6a2-4815-be96-5598f74155ee}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Node">
+    <Filter Include="impl">
-      <UniqueIdentifier>{70412fec-4c60-425b-81c9-4547e5a1b78a}</UniqueIdentifier>
+      <UniqueIdentifier>{3475b59d-d50c-43b1-8334-bcb9e1703ed2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Tool">
+    <Filter Include="event">
-      <UniqueIdentifier>{dacd05f1-3496-488b-af4d-b3ea7bce9515}</UniqueIdentifier>
+      <UniqueIdentifier>{6c9657de-02d5-4d3b-9e1d-bc921eb5aea3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Transition">
+    <Filter Include="manager">
-      <UniqueIdentifier>{337d5a0f-60fd-473a-83da-b2a3515affd9}</UniqueIdentifier>
+      <UniqueIdentifier>{9031e36b-fa85-4b4e-8e80-657c7e68f283}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Custom">
+    <Filter Include="transitions">
-      <UniqueIdentifier>{8ef0d8e2-1138-40c0-a1a8-0eb681721f4e}</UniqueIdentifier>
+      <UniqueIdentifier>{563b19f2-4c5e-4362-983a-94d2ae724550}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Event">
+    <Filter Include="tools">
-      <UniqueIdentifier>{69654184-01f6-4729-9559-802cd79bcb4b}</UniqueIdentifier>
+      <UniqueIdentifier>{42d46a92-c043-4667-8c20-358319e5c313}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="objects">
+      <UniqueIdentifier>{51864c81-02ee-4043-bf09-9ce3cbe5b6da}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -39,211 +42,217 @@
     <ClInclude Include="..\..\core\e2dmodule.h" />
     <ClInclude Include="..\..\core\e2dcomponent.h" />
     <ClInclude Include="..\..\core\e2dimpl.h" />
-    <ClInclude Include="..\..\core\e2dnode.h" />
     <ClInclude Include="..\..\core\e2dtool.h" />
     <ClInclude Include="..\..\core\e2dutil.h" />
+    <ClInclude Include="..\..\core\e2dobject.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\core\Action\Action.cpp">
+    <ClCompile Include="..\..\core\actions\Action.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\Animate.cpp">
+    <ClCompile Include="..\..\core\actions\Animate.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\Animation.cpp">
+    <ClCompile Include="..\..\core\actions\Animation.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\Delay.cpp">
+    <ClCompile Include="..\..\core\actions\Callback.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\FiniteTimeAction.cpp">
+    <ClCompile Include="..\..\core\actions\Delay.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\JumpBy.cpp">
+    <ClCompile Include="..\..\core\actions\FadeIn.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\JumpTo.cpp">
+    <ClCompile Include="..\..\core\actions\FadeOut.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\Loop.cpp">
+    <ClCompile Include="..\..\core\actions\FiniteTimeAction.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\MoveBy.cpp">
+    <ClCompile Include="..\..\core\actions\JumpBy.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\MoveTo.cpp">
+    <ClCompile Include="..\..\core\actions\JumpTo.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\OpacityBy.cpp">
+    <ClCompile Include="..\..\core\actions\Loop.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\OpacityTo.cpp">
+    <ClCompile Include="..\..\core\actions\MoveBy.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\RotateBy.cpp">
+    <ClCompile Include="..\..\core\actions\MoveTo.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\RotateTo.cpp">
+    <ClCompile Include="..\..\core\actions\OpacityBy.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\ScaleBy.cpp">
+    <ClCompile Include="..\..\core\actions\OpacityTo.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\ScaleTo.cpp">
+    <ClCompile Include="..\..\core\actions\RotateBy.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\Sequence.cpp">
+    <ClCompile Include="..\..\core\actions\RotateTo.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\Spawn.cpp">
+    <ClCompile Include="..\..\core\actions\ScaleBy.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Base\Game.cpp">
+    <ClCompile Include="..\..\core\actions\ScaleTo.cpp">
-      <Filter>Base</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Base\GC.cpp">
+    <ClCompile Include="..\..\core\actions\Sequence.cpp">
-      <Filter>Base</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Base\Input.cpp">
+    <ClCompile Include="..\..\core\actions\Spawn.cpp">
-      <Filter>Base</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Base\Renderer.cpp">
+    <ClCompile Include="..\..\core\modules\Audio.cpp">
-      <Filter>Base</Filter>
+      <Filter>modules</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Base\Window.cpp">
+    <ClCompile Include="..\..\core\modules\Game.cpp">
-      <Filter>Base</Filter>
+      <Filter>modules</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Collider.cpp">
+    <ClCompile Include="..\..\core\modules\GC.cpp">
-      <Filter>Common</Filter>
+      <Filter>modules</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Color.cpp">
+    <ClCompile Include="..\..\core\modules\Input.cpp">
-      <Filter>Common</Filter>
+      <Filter>modules</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Font.cpp">
+    <ClCompile Include="..\..\core\modules\Renderer.cpp">
-      <Filter>Common</Filter>
+      <Filter>modules</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Function.cpp">
+    <ClCompile Include="..\..\core\modules\Window.cpp">
-      <Filter>Common</Filter>
+      <Filter>modules</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Image.cpp">
+    <ClCompile Include="..\..\core\utils\Color.cpp">
-      <Filter>Common</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Ref.cpp">
+    <ClCompile Include="..\..\core\utils\Duration.cpp">
-      <Filter>Common</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Point.cpp">
+    <ClCompile Include="..\..\core\utils\Font.cpp">
-      <Filter>Common</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Rect.cpp">
+    <ClCompile Include="..\..\core\utils\Function.cpp">
-      <Filter>Common</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Size.cpp">
+    <ClCompile Include="..\..\core\utils\Point.cpp">
-      <Filter>Common</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\String.cpp">
+    <ClCompile Include="..\..\core\utils\Rect.cpp">
-      <Filter>Common</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Custom\Exception.cpp">
+    <ClCompile Include="..\..\core\utils\Resource.cpp">
-      <Filter>Custom</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Custom\SystemException.cpp">
+    <ClCompile Include="..\..\core\utils\Size.cpp">
-      <Filter>Custom</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Custom\TextRenderer.cpp">
+    <ClCompile Include="..\..\core\utils\String.cpp">
-      <Filter>Custom</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Custom\VoiceCallback.cpp">
+    <ClCompile Include="..\..\core\utils\Time.cpp">
-      <Filter>Custom</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Node\Node.cpp">
+    <ClCompile Include="..\..\core\components\Button.cpp">
-      <Filter>Node</Filter>
+      <Filter>components</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Node\Sprite.cpp">
+    <ClCompile Include="..\..\core\components\Menu.cpp">
-      <Filter>Node</Filter>
+      <Filter>components</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Node\Text.cpp">
+    <ClCompile Include="..\..\core\components\ToggleButton.cpp">
-      <Filter>Node</Filter>
+      <Filter>components</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Data.cpp">
+    <ClCompile Include="..\..\core\impl\Exception.cpp">
-      <Filter>Tool</Filter>
+      <Filter>impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Music.cpp">
+    <ClCompile Include="..\..\core\impl\SystemException.cpp">
-      <Filter>Tool</Filter>
+      <Filter>impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Path.cpp">
+    <ClCompile Include="..\..\core\impl\TextRenderer.cpp">
-      <Filter>Tool</Filter>
+      <Filter>impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Player.cpp">
+    <ClCompile Include="..\..\core\impl\VoiceCallback.cpp">
-      <Filter>Tool</Filter>
+      <Filter>impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Random.cpp">
+    <ClCompile Include="..\..\core\event\Collision.cpp">
-      <Filter>Tool</Filter>
+      <Filter>event</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Timer.cpp">
+    <ClCompile Include="..\..\core\event\KeyEvent.cpp">
-      <Filter>Tool</Filter>
+      <Filter>event</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Task.cpp">
+    <ClCompile Include="..\..\core\event\MouseEvent.cpp">
-      <Filter>Tool</Filter>
+      <Filter>event</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Transition\BoxTransition.cpp">
+    <ClCompile Include="..\..\core\manager\CollisionManager.cpp">
-      <Filter>Transition</Filter>
+      <Filter>manager</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Transition\EmergeTransition.cpp">
+    <ClCompile Include="..\..\core\tools\Data.cpp">
-      <Filter>Transition</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Transition\FadeTransition.cpp">
+    <ClCompile Include="..\..\core\tools\File.cpp">
-      <Filter>Transition</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Transition\MoveTransition.cpp">
+    <ClCompile Include="..\..\core\tools\Music.cpp">
-      <Filter>Transition</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Transition\Transition.cpp">
+    <ClCompile Include="..\..\core\tools\Path.cpp">
-      <Filter>Transition</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\File.cpp">
+    <ClCompile Include="..\..\core\tools\Player.cpp">
-      <Filter>Tool</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Resource.cpp">
+    <ClCompile Include="..\..\core\tools\Random.cpp">
-      <Filter>Common</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp">
+    <ClCompile Include="..\..\core\tools\Task.cpp">
-      <Filter>Manager</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Event\Collision.cpp">
+    <ClCompile Include="..\..\core\tools\Timer.cpp">
-      <Filter>Event</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Event\KeyEvent.cpp">
+    <ClCompile Include="..\..\core\transitions\BoxTransition.cpp">
-      <Filter>Event</Filter>
+      <Filter>transitions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Event\MouseEvent.cpp">
+    <ClCompile Include="..\..\core\transitions\EmergeTransition.cpp">
-      <Filter>Event</Filter>
+      <Filter>transitions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Node\Scene.cpp">
+    <ClCompile Include="..\..\core\transitions\FadeTransition.cpp">
-      <Filter>Node</Filter>
+      <Filter>transitions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Node\Canvas.cpp">
+    <ClCompile Include="..\..\core\transitions\MoveTransition.cpp">
-      <Filter>Node</Filter>
+      <Filter>transitions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Base\Audio.cpp">
+    <ClCompile Include="..\..\core\transitions\Transition.cpp">
-      <Filter>Base</Filter>
+      <Filter>transitions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\FadeIn.cpp">
+    <ClCompile Include="..\..\core\objects\Canvas.cpp">
-      <Filter>Action</Filter>
+      <Filter>objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\FadeOut.cpp">
+    <ClCompile Include="..\..\core\objects\Collider.cpp">
-      <Filter>Action</Filter>
+      <Filter>objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\Callback.cpp">
+    <ClCompile Include="..\..\core\objects\Image.cpp">
-      <Filter>Action</Filter>
+      <Filter>objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Component\Button.cpp">
+    <ClCompile Include="..\..\core\objects\Node.cpp">
-      <Filter>Component</Filter>
+      <Filter>objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Component\Menu.cpp">
+    <ClCompile Include="..\..\core\objects\Object.cpp">
-      <Filter>Component</Filter>
+      <Filter>objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Component\ToggleButton.cpp">
+    <ClCompile Include="..\..\core\objects\Scene.cpp">
-      <Filter>Component</Filter>
+      <Filter>objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\objects\Sprite.cpp">
+      <Filter>objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\objects\Text.cpp">
+      <Filter>objects</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>

project/vs2013/Easy2D.vcxproj

@@ -163,7 +163,78 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\core\e2dnode.h" />
+    <ClCompile Include="..\..\core\actions\Action.cpp" />
+    <ClCompile Include="..\..\core\actions\Animate.cpp" />
+    <ClCompile Include="..\..\core\actions\Animation.cpp" />
+    <ClCompile Include="..\..\core\actions\Callback.cpp" />
+    <ClCompile Include="..\..\core\actions\Delay.cpp" />
+    <ClCompile Include="..\..\core\actions\FadeIn.cpp" />
+    <ClCompile Include="..\..\core\actions\FadeOut.cpp" />
+    <ClCompile Include="..\..\core\actions\FiniteTimeAction.cpp" />
+    <ClCompile Include="..\..\core\actions\JumpBy.cpp" />
+    <ClCompile Include="..\..\core\actions\JumpTo.cpp" />
+    <ClCompile Include="..\..\core\actions\Loop.cpp" />
+    <ClCompile Include="..\..\core\actions\MoveBy.cpp" />
+    <ClCompile Include="..\..\core\actions\MoveTo.cpp" />
+    <ClCompile Include="..\..\core\actions\OpacityBy.cpp" />
+    <ClCompile Include="..\..\core\actions\OpacityTo.cpp" />
+    <ClCompile Include="..\..\core\actions\RotateBy.cpp" />
+    <ClCompile Include="..\..\core\actions\RotateTo.cpp" />
+    <ClCompile Include="..\..\core\actions\ScaleBy.cpp" />
+    <ClCompile Include="..\..\core\actions\ScaleTo.cpp" />
+    <ClCompile Include="..\..\core\actions\Sequence.cpp" />
+    <ClCompile Include="..\..\core\actions\Spawn.cpp" />
+    <ClCompile Include="..\..\core\components\Button.cpp" />
+    <ClCompile Include="..\..\core\components\Menu.cpp" />
+    <ClCompile Include="..\..\core\components\ToggleButton.cpp" />
+    <ClCompile Include="..\..\core\event\Collision.cpp" />
+    <ClCompile Include="..\..\core\event\KeyEvent.cpp" />
+    <ClCompile Include="..\..\core\event\MouseEvent.cpp" />
+    <ClCompile Include="..\..\core\impl\Exception.cpp" />
+    <ClCompile Include="..\..\core\impl\SystemException.cpp" />
+    <ClCompile Include="..\..\core\impl\TextRenderer.cpp" />
+    <ClCompile Include="..\..\core\impl\VoiceCallback.cpp" />
+    <ClCompile Include="..\..\core\manager\CollisionManager.cpp" />
+    <ClCompile Include="..\..\core\modules\Audio.cpp" />
+    <ClCompile Include="..\..\core\modules\Game.cpp" />
+    <ClCompile Include="..\..\core\modules\GC.cpp" />
+    <ClCompile Include="..\..\core\modules\Input.cpp" />
+    <ClCompile Include="..\..\core\modules\Renderer.cpp" />
+    <ClCompile Include="..\..\core\modules\Window.cpp" />
+    <ClCompile Include="..\..\core\objects\Canvas.cpp" />
+    <ClCompile Include="..\..\core\objects\Collider.cpp" />
+    <ClCompile Include="..\..\core\objects\Image.cpp" />
+    <ClCompile Include="..\..\core\objects\Node.cpp" />
+    <ClCompile Include="..\..\core\objects\Object.cpp" />
+    <ClCompile Include="..\..\core\objects\Scene.cpp" />
+    <ClCompile Include="..\..\core\objects\Sprite.cpp" />
+    <ClCompile Include="..\..\core\objects\Text.cpp" />
+    <ClCompile Include="..\..\core\tools\Data.cpp" />
+    <ClCompile Include="..\..\core\tools\File.cpp" />
+    <ClCompile Include="..\..\core\tools\Music.cpp" />
+    <ClCompile Include="..\..\core\tools\Path.cpp" />
+    <ClCompile Include="..\..\core\tools\Player.cpp" />
+    <ClCompile Include="..\..\core\tools\Random.cpp" />
+    <ClCompile Include="..\..\core\tools\Task.cpp" />
+    <ClCompile Include="..\..\core\tools\Timer.cpp" />
+    <ClCompile Include="..\..\core\transitions\BoxTransition.cpp" />
+    <ClCompile Include="..\..\core\transitions\EmergeTransition.cpp" />
+    <ClCompile Include="..\..\core\transitions\FadeTransition.cpp" />
+    <ClCompile Include="..\..\core\transitions\MoveTransition.cpp" />
+    <ClCompile Include="..\..\core\transitions\Transition.cpp" />
+    <ClCompile Include="..\..\core\utils\Color.cpp" />
+    <ClCompile Include="..\..\core\utils\Duration.cpp" />
+    <ClCompile Include="..\..\core\utils\Font.cpp" />
+    <ClCompile Include="..\..\core\utils\Function.cpp" />
+    <ClCompile Include="..\..\core\utils\Point.cpp" />
+    <ClCompile Include="..\..\core\utils\Rect.cpp" />
+    <ClCompile Include="..\..\core\utils\Resource.cpp" />
+    <ClCompile Include="..\..\core\utils\Size.cpp" />
+    <ClCompile Include="..\..\core\utils\String.cpp" />
+    <ClCompile Include="..\..\core\utils\Time.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\core\e2dobject.h" />
     <ClInclude Include="..\..\core\easy2d.h" />
     <ClInclude Include="..\..\core\e2daction.h" />
     <ClInclude Include="..\..\core\e2dutil.h" />
@@ -176,77 +247,6 @@
     <ClInclude Include="..\..\core\e2dtool.h" />
     <ClInclude Include="..\..\core\e2dtransition.h" />
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\core\Action\Action.cpp" />
-    <ClCompile Include="..\..\core\Action\Animate.cpp" />
-    <ClCompile Include="..\..\core\Action\Animation.cpp" />
-    <ClCompile Include="..\..\core\Action\Callback.cpp" />
-    <ClCompile Include="..\..\core\Action\Delay.cpp" />
-    <ClCompile Include="..\..\core\Action\FadeIn.cpp" />
-    <ClCompile Include="..\..\core\Action\FadeOut.cpp" />
-    <ClCompile Include="..\..\core\Action\FiniteTimeAction.cpp" />
-    <ClCompile Include="..\..\core\Action\JumpBy.cpp" />
-    <ClCompile Include="..\..\core\Action\JumpTo.cpp" />
-    <ClCompile Include="..\..\core\Action\Loop.cpp" />
-    <ClCompile Include="..\..\core\Action\MoveBy.cpp" />
-    <ClCompile Include="..\..\core\Action\MoveTo.cpp" />
-    <ClCompile Include="..\..\core\Action\OpacityBy.cpp" />
-    <ClCompile Include="..\..\core\Action\OpacityTo.cpp" />
-    <ClCompile Include="..\..\core\Action\RotateBy.cpp" />
-    <ClCompile Include="..\..\core\Action\RotateTo.cpp" />
-    <ClCompile Include="..\..\core\Action\ScaleBy.cpp" />
-    <ClCompile Include="..\..\core\Action\ScaleTo.cpp" />
-    <ClCompile Include="..\..\core\Action\Sequence.cpp" />
-    <ClCompile Include="..\..\core\Action\Spawn.cpp" />
-    <ClCompile Include="..\..\core\Base\Audio.cpp" />
-    <ClCompile Include="..\..\core\Base\Game.cpp" />
-    <ClCompile Include="..\..\core\Base\GC.cpp" />
-    <ClCompile Include="..\..\core\Base\Input.cpp" />
-    <ClCompile Include="..\..\core\Base\Renderer.cpp" />
-    <ClCompile Include="..\..\core\Base\Window.cpp" />
-    <ClCompile Include="..\..\core\Common\Collider.cpp" />
-    <ClCompile Include="..\..\core\Common\Color.cpp" />
-    <ClCompile Include="..\..\core\Common\Duration.cpp" />
-    <ClCompile Include="..\..\core\Common\Font.cpp" />
-    <ClCompile Include="..\..\core\Common\Function.cpp" />
-    <ClCompile Include="..\..\core\Common\Image.cpp" />
-    <ClCompile Include="..\..\core\Common\Ref.cpp" />
-    <ClCompile Include="..\..\core\Common\Resource.cpp" />
-    <ClCompile Include="..\..\core\Common\Point.cpp" />
-    <ClCompile Include="..\..\core\Common\Rect.cpp" />
-    <ClCompile Include="..\..\core\Common\Size.cpp" />
-    <ClCompile Include="..\..\core\Common\String.cpp" />
-    <ClCompile Include="..\..\core\Common\Time.cpp" />
-    <ClCompile Include="..\..\core\Custom\Exception.cpp" />
-    <ClCompile Include="..\..\core\Custom\SystemException.cpp" />
-    <ClCompile Include="..\..\core\Custom\TextRenderer.cpp" />
-    <ClCompile Include="..\..\core\Custom\VoiceCallback.cpp" />
-    <ClCompile Include="..\..\core\Event\Collision.cpp" />
-    <ClCompile Include="..\..\core\Event\KeyEvent.cpp" />
-    <ClCompile Include="..\..\core\Event\MouseEvent.cpp" />
-    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp" />
-    <ClCompile Include="..\..\core\Node\Canvas.cpp" />
-    <ClCompile Include="..\..\core\Node\Scene.cpp" />
-    <ClCompile Include="..\..\core\Node\Node.cpp" />
-    <ClCompile Include="..\..\core\Node\Sprite.cpp" />
-    <ClCompile Include="..\..\core\Node\Text.cpp" />
-    <ClCompile Include="..\..\core\Component\Button.cpp" />
-    <ClCompile Include="..\..\core\Component\ToggleButton.cpp" />
-    <ClCompile Include="..\..\core\Component\Menu.cpp" />
-    <ClCompile Include="..\..\core\Tool\Data.cpp" />
-    <ClCompile Include="..\..\core\Tool\File.cpp" />
-    <ClCompile Include="..\..\core\Tool\Music.cpp" />
-    <ClCompile Include="..\..\core\Tool\Path.cpp" />
-    <ClCompile Include="..\..\core\Tool\Player.cpp" />
-    <ClCompile Include="..\..\core\Tool\Random.cpp" />
-    <ClCompile Include="..\..\core\Tool\Task.cpp" />
-    <ClCompile Include="..\..\core\Tool\Timer.cpp" />
-    <ClCompile Include="..\..\core\Transition\BoxTransition.cpp" />
-    <ClCompile Include="..\..\core\Transition\EmergeTransition.cpp" />
-    <ClCompile Include="..\..\core\Transition\FadeTransition.cpp" />
-    <ClCompile Include="..\..\core\Transition\MoveTransition.cpp" />
-    <ClCompile Include="..\..\core\Transition\Transition.cpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

project/vs2013/Easy2D.vcxproj.filters

@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Action">
+    <Filter Include="utils">
-      <UniqueIdentifier>{01311827-b639-4313-a5b6-61cd22fe8920}</UniqueIdentifier>
+      <UniqueIdentifier>{be5d9314-b00a-4f11-bd2a-1f720dc32407}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Base">
+    <Filter Include="modules">
-      <UniqueIdentifier>{e5c42dd3-2d56-4a95-8f88-45d059d58c21}</UniqueIdentifier>
+      <UniqueIdentifier>{261633d3-3814-40c7-bd6d-201ede6c6ade}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Common">
+    <Filter Include="actions">
-      <UniqueIdentifier>{08126b0c-d139-48f9-8559-3d9d9e3a5940}</UniqueIdentifier>
+      <UniqueIdentifier>{50293f38-87fe-4dde-b938-cf1b7a2921f8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Manager">
+    <Filter Include="components">
-      <UniqueIdentifier>{a8185fe2-5477-4293-97d6-d84f27d354bb}</UniqueIdentifier>
+      <UniqueIdentifier>{7ffdcb87-b6a2-4815-be96-5598f74155ee}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Node">
+    <Filter Include="impl">
-      <UniqueIdentifier>{70412fec-4c60-425b-81c9-4547e5a1b78a}</UniqueIdentifier>
+      <UniqueIdentifier>{3475b59d-d50c-43b1-8334-bcb9e1703ed2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Tool">
+    <Filter Include="event">
-      <UniqueIdentifier>{dacd05f1-3496-488b-af4d-b3ea7bce9515}</UniqueIdentifier>
+      <UniqueIdentifier>{6c9657de-02d5-4d3b-9e1d-bc921eb5aea3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Transition">
+    <Filter Include="manager">
-      <UniqueIdentifier>{337d5a0f-60fd-473a-83da-b2a3515affd9}</UniqueIdentifier>
+      <UniqueIdentifier>{9031e36b-fa85-4b4e-8e80-657c7e68f283}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Custom">
+    <Filter Include="transitions">
-      <UniqueIdentifier>{7660a3fa-36f9-4b1b-8942-e38e02c0c95b}</UniqueIdentifier>
+      <UniqueIdentifier>{563b19f2-4c5e-4362-983a-94d2ae724550}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Event">
+    <Filter Include="tools">
-      <UniqueIdentifier>{c597916e-c162-41a4-849a-c568513f6d14}</UniqueIdentifier>
+      <UniqueIdentifier>{42d46a92-c043-4667-8c20-358319e5c313}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="objects">
+      <UniqueIdentifier>{51864c81-02ee-4043-bf09-9ce3cbe5b6da}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -39,211 +42,217 @@
     <ClInclude Include="..\..\core\e2dmodule.h" />
     <ClInclude Include="..\..\core\e2dcomponent.h" />
     <ClInclude Include="..\..\core\e2dimpl.h" />
-    <ClInclude Include="..\..\core\e2dnode.h" />
     <ClInclude Include="..\..\core\e2dtool.h" />
     <ClInclude Include="..\..\core\e2dutil.h" />
+    <ClInclude Include="..\..\core\e2dobject.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\core\Action\Action.cpp">
+    <ClCompile Include="..\..\core\actions\Action.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\Animate.cpp">
+    <ClCompile Include="..\..\core\actions\Animate.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\Animation.cpp">
+    <ClCompile Include="..\..\core\actions\Animation.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\Delay.cpp">
+    <ClCompile Include="..\..\core\actions\Callback.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\FiniteTimeAction.cpp">
+    <ClCompile Include="..\..\core\actions\Delay.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\JumpBy.cpp">
+    <ClCompile Include="..\..\core\actions\FadeIn.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\JumpTo.cpp">
+    <ClCompile Include="..\..\core\actions\FadeOut.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\Loop.cpp">
+    <ClCompile Include="..\..\core\actions\FiniteTimeAction.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\MoveBy.cpp">
+    <ClCompile Include="..\..\core\actions\JumpBy.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\MoveTo.cpp">
+    <ClCompile Include="..\..\core\actions\JumpTo.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\OpacityBy.cpp">
+    <ClCompile Include="..\..\core\actions\Loop.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\OpacityTo.cpp">
+    <ClCompile Include="..\..\core\actions\MoveBy.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\RotateBy.cpp">
+    <ClCompile Include="..\..\core\actions\MoveTo.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\RotateTo.cpp">
+    <ClCompile Include="..\..\core\actions\OpacityBy.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\ScaleBy.cpp">
+    <ClCompile Include="..\..\core\actions\OpacityTo.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\ScaleTo.cpp">
+    <ClCompile Include="..\..\core\actions\RotateBy.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\Sequence.cpp">
+    <ClCompile Include="..\..\core\actions\RotateTo.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\Spawn.cpp">
+    <ClCompile Include="..\..\core\actions\ScaleBy.cpp">
-      <Filter>Action</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Base\Game.cpp">
+    <ClCompile Include="..\..\core\actions\ScaleTo.cpp">
-      <Filter>Base</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Base\GC.cpp">
+    <ClCompile Include="..\..\core\actions\Sequence.cpp">
-      <Filter>Base</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Base\Input.cpp">
+    <ClCompile Include="..\..\core\actions\Spawn.cpp">
-      <Filter>Base</Filter>
+      <Filter>actions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Base\Renderer.cpp">
+    <ClCompile Include="..\..\core\modules\Audio.cpp">
-      <Filter>Base</Filter>
+      <Filter>modules</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Base\Window.cpp">
+    <ClCompile Include="..\..\core\modules\Game.cpp">
-      <Filter>Base</Filter>
+      <Filter>modules</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Collider.cpp">
+    <ClCompile Include="..\..\core\modules\GC.cpp">
-      <Filter>Common</Filter>
+      <Filter>modules</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Color.cpp">
+    <ClCompile Include="..\..\core\modules\Input.cpp">
-      <Filter>Common</Filter>
+      <Filter>modules</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Font.cpp">
+    <ClCompile Include="..\..\core\modules\Renderer.cpp">
-      <Filter>Common</Filter>
+      <Filter>modules</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Function.cpp">
+    <ClCompile Include="..\..\core\modules\Window.cpp">
-      <Filter>Common</Filter>
+      <Filter>modules</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Image.cpp">
+    <ClCompile Include="..\..\core\utils\Color.cpp">
-      <Filter>Common</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Ref.cpp">
+    <ClCompile Include="..\..\core\utils\Duration.cpp">
-      <Filter>Common</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Point.cpp">
+    <ClCompile Include="..\..\core\utils\Font.cpp">
-      <Filter>Common</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Rect.cpp">
+    <ClCompile Include="..\..\core\utils\Function.cpp">
-      <Filter>Common</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Size.cpp">
+    <ClCompile Include="..\..\core\utils\Point.cpp">
-      <Filter>Common</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\String.cpp">
+    <ClCompile Include="..\..\core\utils\Rect.cpp">
-      <Filter>Common</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Custom\Exception.cpp">
+    <ClCompile Include="..\..\core\utils\Resource.cpp">
-      <Filter>Custom</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Custom\SystemException.cpp">
+    <ClCompile Include="..\..\core\utils\Size.cpp">
-      <Filter>Custom</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Custom\TextRenderer.cpp">
+    <ClCompile Include="..\..\core\utils\String.cpp">
-      <Filter>Custom</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Custom\VoiceCallback.cpp">
+    <ClCompile Include="..\..\core\utils\Time.cpp">
-      <Filter>Custom</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Node\Node.cpp">
+    <ClCompile Include="..\..\core\components\Button.cpp">
-      <Filter>Node</Filter>
+      <Filter>components</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Node\Sprite.cpp">
+    <ClCompile Include="..\..\core\components\Menu.cpp">
-      <Filter>Node</Filter>
+      <Filter>components</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Node\Text.cpp">
+    <ClCompile Include="..\..\core\components\ToggleButton.cpp">
-      <Filter>Node</Filter>
+      <Filter>components</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Data.cpp">
+    <ClCompile Include="..\..\core\impl\Exception.cpp">
-      <Filter>Tool</Filter>
+      <Filter>impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Music.cpp">
+    <ClCompile Include="..\..\core\impl\SystemException.cpp">
-      <Filter>Tool</Filter>
+      <Filter>impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Path.cpp">
+    <ClCompile Include="..\..\core\impl\TextRenderer.cpp">
-      <Filter>Tool</Filter>
+      <Filter>impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Player.cpp">
+    <ClCompile Include="..\..\core\impl\VoiceCallback.cpp">
-      <Filter>Tool</Filter>
+      <Filter>impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Random.cpp">
+    <ClCompile Include="..\..\core\event\Collision.cpp">
-      <Filter>Tool</Filter>
+      <Filter>event</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Timer.cpp">
+    <ClCompile Include="..\..\core\event\KeyEvent.cpp">
-      <Filter>Tool</Filter>
+      <Filter>event</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Task.cpp">
+    <ClCompile Include="..\..\core\event\MouseEvent.cpp">
-      <Filter>Tool</Filter>
+      <Filter>event</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Transition\BoxTransition.cpp">
+    <ClCompile Include="..\..\core\manager\CollisionManager.cpp">
-      <Filter>Transition</Filter>
+      <Filter>manager</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Transition\EmergeTransition.cpp">
+    <ClCompile Include="..\..\core\tools\Data.cpp">
-      <Filter>Transition</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Transition\FadeTransition.cpp">
+    <ClCompile Include="..\..\core\tools\File.cpp">
-      <Filter>Transition</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Transition\MoveTransition.cpp">
+    <ClCompile Include="..\..\core\tools\Music.cpp">
-      <Filter>Transition</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Transition\Transition.cpp">
+    <ClCompile Include="..\..\core\tools\Path.cpp">
-      <Filter>Transition</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Tool\File.cpp">
+    <ClCompile Include="..\..\core\tools\Player.cpp">
-      <Filter>Tool</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Common\Resource.cpp">
+    <ClCompile Include="..\..\core\tools\Random.cpp">
-      <Filter>Common</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp">
+    <ClCompile Include="..\..\core\tools\Task.cpp">
-      <Filter>Manager</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Event\Collision.cpp">
+    <ClCompile Include="..\..\core\tools\Timer.cpp">
-      <Filter>Event</Filter>
+      <Filter>tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Event\KeyEvent.cpp">
+    <ClCompile Include="..\..\core\transitions\BoxTransition.cpp">
-      <Filter>Event</Filter>
+      <Filter>transitions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Event\MouseEvent.cpp">
+    <ClCompile Include="..\..\core\transitions\EmergeTransition.cpp">
-      <Filter>Event</Filter>
+      <Filter>transitions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Node\Scene.cpp">
+    <ClCompile Include="..\..\core\transitions\FadeTransition.cpp">
-      <Filter>Node</Filter>
+      <Filter>transitions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Node\Canvas.cpp">
+    <ClCompile Include="..\..\core\transitions\MoveTransition.cpp">
-      <Filter>Node</Filter>
+      <Filter>transitions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Base\Audio.cpp">
+    <ClCompile Include="..\..\core\transitions\Transition.cpp">
-      <Filter>Base</Filter>
+      <Filter>transitions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\FadeIn.cpp">
+    <ClCompile Include="..\..\core\objects\Canvas.cpp">
-      <Filter>Action</Filter>
+      <Filter>objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\FadeOut.cpp">
+    <ClCompile Include="..\..\core\objects\Collider.cpp">
-      <Filter>Action</Filter>
+      <Filter>objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Action\Callback.cpp">
+    <ClCompile Include="..\..\core\objects\Image.cpp">
-      <Filter>Action</Filter>
+      <Filter>objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Component\Button.cpp">
+    <ClCompile Include="..\..\core\objects\Node.cpp">
-      <Filter>Component</Filter>
+      <Filter>objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Component\Menu.cpp">
+    <ClCompile Include="..\..\core\objects\Object.cpp">
-      <Filter>Component</Filter>
+      <Filter>objects</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\Component\ToggleButton.cpp">
+    <ClCompile Include="..\..\core\objects\Scene.cpp">
-      <Filter>Component</Filter>
+      <Filter>objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\objects\Sprite.cpp">
+      <Filter>objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\objects\Text.cpp">
+      <Filter>objects</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>

project/vs2017/Easy2D.vcxproj

@@ -196,78 +196,78 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\core\Action\Action.cpp" />
+    <ClCompile Include="..\..\core\actions\Action.cpp" />
-    <ClCompile Include="..\..\core\Action\Animation.cpp" />
+    <ClCompile Include="..\..\core\actions\Animate.cpp" />
-    <ClCompile Include="..\..\core\Action\Callback.cpp" />
+    <ClCompile Include="..\..\core\actions\Animation.cpp" />
-    <ClCompile Include="..\..\core\Action\Delay.cpp" />
+    <ClCompile Include="..\..\core\actions\Callback.cpp" />
-    <ClCompile Include="..\..\core\Action\FadeIn.cpp" />
+    <ClCompile Include="..\..\core\actions\Delay.cpp" />
-    <ClCompile Include="..\..\core\Action\FadeOut.cpp" />
+    <ClCompile Include="..\..\core\actions\FadeIn.cpp" />
-    <ClCompile Include="..\..\core\Action\JumpBy.cpp" />
+    <ClCompile Include="..\..\core\actions\FadeOut.cpp" />
-    <ClCompile Include="..\..\core\Action\JumpTo.cpp" />
+    <ClCompile Include="..\..\core\actions\FiniteTimeAction.cpp" />
-    <ClCompile Include="..\..\core\Action\MoveBy.cpp" />
+    <ClCompile Include="..\..\core\actions\JumpBy.cpp" />
-    <ClCompile Include="..\..\core\Action\Animate.cpp" />
+    <ClCompile Include="..\..\core\actions\JumpTo.cpp" />
-    <ClCompile Include="..\..\core\Action\MoveTo.cpp" />
+    <ClCompile Include="..\..\core\actions\Loop.cpp" />
-    <ClCompile Include="..\..\core\Action\Loop.cpp" />
+    <ClCompile Include="..\..\core\actions\MoveBy.cpp" />
-    <ClCompile Include="..\..\core\Action\OpacityBy.cpp" />
+    <ClCompile Include="..\..\core\actions\MoveTo.cpp" />
-    <ClCompile Include="..\..\core\Action\OpacityTo.cpp" />
+    <ClCompile Include="..\..\core\actions\OpacityBy.cpp" />
-    <ClCompile Include="..\..\core\Action\RotateBy.cpp" />
+    <ClCompile Include="..\..\core\actions\OpacityTo.cpp" />
-    <ClCompile Include="..\..\core\Action\RotateTo.cpp" />
+    <ClCompile Include="..\..\core\actions\RotateBy.cpp" />
-    <ClCompile Include="..\..\core\Action\ScaleBy.cpp" />
+    <ClCompile Include="..\..\core\actions\RotateTo.cpp" />
-    <ClCompile Include="..\..\core\Action\ScaleTo.cpp" />
+    <ClCompile Include="..\..\core\actions\ScaleBy.cpp" />
-    <ClCompile Include="..\..\core\Action\Sequence.cpp" />
+    <ClCompile Include="..\..\core\actions\ScaleTo.cpp" />
-    <ClCompile Include="..\..\core\Action\FiniteTimeAction.cpp" />
+    <ClCompile Include="..\..\core\actions\Sequence.cpp" />
-    <ClCompile Include="..\..\core\Action\Spawn.cpp" />
+    <ClCompile Include="..\..\core\actions\Spawn.cpp" />
-    <ClCompile Include="..\..\core\Base\Audio.cpp" />
+    <ClCompile Include="..\..\core\components\Button.cpp" />
-    <ClCompile Include="..\..\core\Base\Game.cpp" />
+    <ClCompile Include="..\..\core\components\Menu.cpp" />
-    <ClCompile Include="..\..\core\Base\GC.cpp" />
+    <ClCompile Include="..\..\core\components\ToggleButton.cpp" />
-    <ClCompile Include="..\..\core\Base\Input.cpp" />
+    <ClCompile Include="..\..\core\event\Collision.cpp" />
-    <ClCompile Include="..\..\core\Base\Renderer.cpp" />
+    <ClCompile Include="..\..\core\event\KeyEvent.cpp" />
-    <ClCompile Include="..\..\core\Base\Window.cpp" />
+    <ClCompile Include="..\..\core\event\MouseEvent.cpp" />
-    <ClCompile Include="..\..\core\Common\Collider.cpp" />
+    <ClCompile Include="..\..\core\impl\Exception.cpp" />
-    <ClCompile Include="..\..\core\Common\Color.cpp" />
+    <ClCompile Include="..\..\core\impl\SystemException.cpp" />
-    <ClCompile Include="..\..\core\Common\Duration.cpp" />
+    <ClCompile Include="..\..\core\impl\TextRenderer.cpp" />
-    <ClCompile Include="..\..\core\Common\Font.cpp" />
+    <ClCompile Include="..\..\core\impl\VoiceCallback.cpp" />
-    <ClCompile Include="..\..\core\Common\Function.cpp" />
+    <ClCompile Include="..\..\core\manager\CollisionManager.cpp" />
-    <ClCompile Include="..\..\core\Common\Point.cpp" />
+    <ClCompile Include="..\..\core\modules\Audio.cpp" />
-    <ClCompile Include="..\..\core\Common\Rect.cpp" />
+    <ClCompile Include="..\..\core\modules\Game.cpp" />
-    <ClCompile Include="..\..\core\Common\Ref.cpp" />
+    <ClCompile Include="..\..\core\modules\GC.cpp" />
-    <ClCompile Include="..\..\core\Common\Resource.cpp" />
+    <ClCompile Include="..\..\core\modules\Input.cpp" />
-    <ClCompile Include="..\..\core\Common\Size.cpp" />
+    <ClCompile Include="..\..\core\modules\Renderer.cpp" />
-    <ClCompile Include="..\..\core\Common\String.cpp" />
+    <ClCompile Include="..\..\core\modules\Window.cpp" />
-    <ClCompile Include="..\..\core\Common\Image.cpp" />
+    <ClCompile Include="..\..\core\objects\Canvas.cpp" />
-    <ClCompile Include="..\..\core\Common\Time.cpp" />
+    <ClCompile Include="..\..\core\objects\Collider.cpp" />
-    <ClCompile Include="..\..\core\Component\Button.cpp" />
+    <ClCompile Include="..\..\core\objects\Image.cpp" />
-    <ClCompile Include="..\..\core\Component\Menu.cpp" />
+    <ClCompile Include="..\..\core\objects\Node.cpp" />
-    <ClCompile Include="..\..\core\Component\ToggleButton.cpp" />
+    <ClCompile Include="..\..\core\objects\Object.cpp" />
-    <ClCompile Include="..\..\core\Custom\Exception.cpp" />
+    <ClCompile Include="..\..\core\objects\Scene.cpp" />
-    <ClCompile Include="..\..\core\Custom\SystemException.cpp" />
+    <ClCompile Include="..\..\core\objects\Sprite.cpp" />
-    <ClCompile Include="..\..\core\Custom\TextRenderer.cpp" />
+    <ClCompile Include="..\..\core\objects\Text.cpp" />
-    <ClCompile Include="..\..\core\Custom\VoiceCallback.cpp" />
+    <ClCompile Include="..\..\core\tools\Data.cpp" />
-    <ClCompile Include="..\..\core\Event\Collision.cpp" />
+    <ClCompile Include="..\..\core\tools\File.cpp" />
-    <ClCompile Include="..\..\core\Event\KeyEvent.cpp" />
+    <ClCompile Include="..\..\core\tools\Music.cpp" />
-    <ClCompile Include="..\..\core\Event\MouseEvent.cpp" />
+    <ClCompile Include="..\..\core\tools\Path.cpp" />
-    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp" />
+    <ClCompile Include="..\..\core\tools\Player.cpp" />
-    <ClCompile Include="..\..\core\Node\Canvas.cpp" />
+    <ClCompile Include="..\..\core\tools\Random.cpp" />
-    <ClCompile Include="..\..\core\Node\Scene.cpp" />
+    <ClCompile Include="..\..\core\tools\Task.cpp" />
-    <ClCompile Include="..\..\core\Node\Node.cpp" />
+    <ClCompile Include="..\..\core\tools\Timer.cpp" />
-    <ClCompile Include="..\..\core\Node\Sprite.cpp" />
+    <ClCompile Include="..\..\core\transitions\BoxTransition.cpp" />
-    <ClCompile Include="..\..\core\Node\Text.cpp" />
+    <ClCompile Include="..\..\core\transitions\EmergeTransition.cpp" />
-    <ClCompile Include="..\..\core\Tool\Data.cpp" />
+    <ClCompile Include="..\..\core\transitions\FadeTransition.cpp" />
-    <ClCompile Include="..\..\core\Tool\File.cpp" />
+    <ClCompile Include="..\..\core\transitions\MoveTransition.cpp" />
-    <ClCompile Include="..\..\core\Tool\Music.cpp" />
+    <ClCompile Include="..\..\core\transitions\Transition.cpp" />
-    <ClCompile Include="..\..\core\Tool\Path.cpp" />
+    <ClCompile Include="..\..\core\utils\Color.cpp" />
-    <ClCompile Include="..\..\core\Tool\Player.cpp" />
+    <ClCompile Include="..\..\core\utils\Duration.cpp" />
-    <ClCompile Include="..\..\core\Tool\Random.cpp" />
+    <ClCompile Include="..\..\core\utils\Font.cpp" />
-    <ClCompile Include="..\..\core\Tool\Task.cpp" />
+    <ClCompile Include="..\..\core\utils\Function.cpp" />
-    <ClCompile Include="..\..\core\Tool\Timer.cpp" />
+    <ClCompile Include="..\..\core\utils\Point.cpp" />
-    <ClCompile Include="..\..\core\Transition\Transition.cpp" />
+    <ClCompile Include="..\..\core\utils\Rect.cpp" />
-    <ClCompile Include="..\..\core\Transition\BoxTransition.cpp" />
+    <ClCompile Include="..\..\core\utils\Resource.cpp" />
-    <ClCompile Include="..\..\core\Transition\EmergeTransition.cpp" />
+    <ClCompile Include="..\..\core\utils\Size.cpp" />
-    <ClCompile Include="..\..\core\Transition\FadeTransition.cpp" />
+    <ClCompile Include="..\..\core\utils\String.cpp" />
-    <ClCompile Include="..\..\core\Transition\MoveTransition.cpp" />
+    <ClCompile Include="..\..\core\utils\Time.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\core\e2dnode.h" />
+    <ClInclude Include="..\..\core\e2dobject.h" />
     <ClInclude Include="..\..\core\easy2d.h" />
     <ClInclude Include="..\..\core\e2daction.h" />
     <ClInclude Include="..\..\core\e2dutil.h" />

project/vs2017/Easy2D.vcxproj.filters

@@ -1,245 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Tool">
+    <Filter Include="utils">
-      <UniqueIdentifier>{42d46a92-c043-4667-8c20-358319e5c313}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Node">
-      <UniqueIdentifier>{51864c81-02ee-4043-bf09-9ce3cbe5b6da}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Base">
-      <UniqueIdentifier>{261633d3-3814-40c7-bd6d-201ede6c6ade}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Action">
-      <UniqueIdentifier>{50293f38-87fe-4dde-b938-cf1b7a2921f8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Transition">
-      <UniqueIdentifier>{563b19f2-4c5e-4362-983a-94d2ae724550}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Manager">
-      <UniqueIdentifier>{9031e36b-fa85-4b4e-8e80-657c7e68f283}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Common">
       <UniqueIdentifier>{be5d9314-b00a-4f11-bd2a-1f720dc32407}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Custom">
+    <Filter Include="modules">
-      <UniqueIdentifier>{3475b59d-d50c-43b1-8334-bcb9e1703ed2}</UniqueIdentifier>
+      <UniqueIdentifier>{261633d3-3814-40c7-bd6d-201ede6c6ade}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Event">
+    <Filter Include="actions">
-      <UniqueIdentifier>{6c9657de-02d5-4d3b-9e1d-bc921eb5aea3}</UniqueIdentifier>
+      <UniqueIdentifier>{50293f38-87fe-4dde-b938-cf1b7a2921f8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Component">
+    <Filter Include="components">
       <UniqueIdentifier>{7ffdcb87-b6a2-4815-be96-5598f74155ee}</UniqueIdentifier>
     </Filter>
-  </ItemGroup>
+    <Filter Include="impl">
-  <ItemGroup>
+      <UniqueIdentifier>{3475b59d-d50c-43b1-8334-bcb9e1703ed2}</UniqueIdentifier>
-    <ClCompile Include="..\..\core\Base\Input.cpp">
+    </Filter>
-      <Filter>Base</Filter>
+    <Filter Include="event">
-    </ClCompile>
+      <UniqueIdentifier>{6c9657de-02d5-4d3b-9e1d-bc921eb5aea3}</UniqueIdentifier>
-    <ClCompile Include="..\..\core\Common\Image.cpp">
+    </Filter>
-      <Filter>Common</Filter>
+    <Filter Include="manager">
-    </ClCompile>
+      <UniqueIdentifier>{9031e36b-fa85-4b4e-8e80-657c7e68f283}</UniqueIdentifier>
-    <ClCompile Include="..\..\core\Common\String.cpp">
+    </Filter>
-      <Filter>Common</Filter>
+    <Filter Include="transitions">
-    </ClCompile>
+      <UniqueIdentifier>{563b19f2-4c5e-4362-983a-94d2ae724550}</UniqueIdentifier>
-    <ClCompile Include="..\..\core\Node\Node.cpp">
+    </Filter>
-      <Filter>Node</Filter>
+    <Filter Include="tools">
-    </ClCompile>
+      <UniqueIdentifier>{42d46a92-c043-4667-8c20-358319e5c313}</UniqueIdentifier>
-    <ClCompile Include="..\..\core\Node\Sprite.cpp">
+    </Filter>
-      <Filter>Node</Filter>
+    <Filter Include="objects">
-    </ClCompile>
+      <UniqueIdentifier>{51864c81-02ee-4043-bf09-9ce3cbe5b6da}</UniqueIdentifier>
-    <ClCompile Include="..\..\core\Node\Text.cpp">
+    </Filter>
-      <Filter>Node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Random.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Timer.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Base\Game.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Base\Window.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Base\Renderer.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Common\Point.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Common\Size.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Data.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Path.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Common\Color.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Common\Function.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\Action.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\Sequence.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\ScaleTo.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\ScaleBy.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\RotateTo.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\RotateBy.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\OpacityTo.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\OpacityBy.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\MoveTo.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\MoveBy.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\Loop.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\Delay.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\Spawn.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Transition\Transition.cpp">
-      <Filter>Transition</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\Animate.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\JumpBy.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\JumpTo.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Player.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Music.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\Animation.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Base\GC.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Custom\VoiceCallback.cpp">
-      <Filter>Custom</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Custom\TextRenderer.cpp">
-      <Filter>Custom</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Common\Font.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Transition\BoxTransition.cpp">
-      <Filter>Transition</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Transition\EmergeTransition.cpp">
-      <Filter>Transition</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Transition\FadeTransition.cpp">
-      <Filter>Transition</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Transition\MoveTransition.cpp">
-      <Filter>Transition</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\FiniteTimeAction.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Common\Rect.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Custom\Exception.cpp">
-      <Filter>Custom</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Custom\SystemException.cpp">
-      <Filter>Custom</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Common\Collider.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Tool\Task.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Common\Ref.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Tool\File.cpp">
-      <Filter>Tool</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Common\Resource.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Manager\CollisionManager.cpp">
-      <Filter>Manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Event\MouseEvent.cpp">
-      <Filter>Event</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Event\KeyEvent.cpp">
-      <Filter>Event</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Event\Collision.cpp">
-      <Filter>Event</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Common\Time.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Common\Duration.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Node\Scene.cpp">
-      <Filter>Node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Node\Canvas.cpp">
-      <Filter>Node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Base\Audio.cpp">
-      <Filter>Base</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\FadeIn.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\FadeOut.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Action\Callback.cpp">
-      <Filter>Action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Component\Button.cpp">
-      <Filter>Component</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Component\Menu.cpp">
-      <Filter>Component</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\core\Component\ToggleButton.cpp">
-      <Filter>Component</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\core\easy2d.h" />
@@ -251,8 +42,217 @@
     <ClInclude Include="..\..\core\e2dmodule.h" />
     <ClInclude Include="..\..\core\e2dcomponent.h" />
     <ClInclude Include="..\..\core\e2dimpl.h" />
-    <ClInclude Include="..\..\core\e2dnode.h" />
     <ClInclude Include="..\..\core\e2dtool.h" />
     <ClInclude Include="..\..\core\e2dutil.h" />
+    <ClInclude Include="..\..\core\e2dobject.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\core\actions\Action.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\Animate.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\Animation.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\Callback.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\Delay.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\FadeIn.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\FadeOut.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\FiniteTimeAction.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\JumpBy.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\JumpTo.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\Loop.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\MoveBy.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\MoveTo.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\OpacityBy.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\OpacityTo.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\RotateBy.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\RotateTo.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\ScaleBy.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\ScaleTo.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\Sequence.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\actions\Spawn.cpp">
+      <Filter>actions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\modules\Audio.cpp">
+      <Filter>modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\modules\Game.cpp">
+      <Filter>modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\modules\GC.cpp">
+      <Filter>modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\modules\Input.cpp">
+      <Filter>modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\modules\Renderer.cpp">
+      <Filter>modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\modules\Window.cpp">
+      <Filter>modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\utils\Color.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\utils\Duration.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\utils\Font.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\utils\Function.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\utils\Point.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\utils\Rect.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\utils\Resource.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\utils\Size.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\utils\String.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\utils\Time.cpp">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\components\Button.cpp">
+      <Filter>components</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\components\Menu.cpp">
+      <Filter>components</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\components\ToggleButton.cpp">
+      <Filter>components</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\impl\Exception.cpp">
+      <Filter>impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\impl\SystemException.cpp">
+      <Filter>impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\impl\TextRenderer.cpp">
+      <Filter>impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\impl\VoiceCallback.cpp">
+      <Filter>impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\event\Collision.cpp">
+      <Filter>event</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\event\KeyEvent.cpp">
+      <Filter>event</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\event\MouseEvent.cpp">
+      <Filter>event</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\manager\CollisionManager.cpp">
+      <Filter>manager</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\tools\Data.cpp">
+      <Filter>tools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\tools\File.cpp">
+      <Filter>tools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\tools\Music.cpp">
+      <Filter>tools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\tools\Path.cpp">
+      <Filter>tools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\tools\Player.cpp">
+      <Filter>tools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\tools\Random.cpp">
+      <Filter>tools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\tools\Task.cpp">
+      <Filter>tools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\tools\Timer.cpp">
+      <Filter>tools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\transitions\BoxTransition.cpp">
+      <Filter>transitions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\transitions\EmergeTransition.cpp">
+      <Filter>transitions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\transitions\FadeTransition.cpp">
+      <Filter>transitions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\transitions\MoveTransition.cpp">
+      <Filter>transitions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\transitions\Transition.cpp">
+      <Filter>transitions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\objects\Canvas.cpp">
+      <Filter>objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\objects\Collider.cpp">
+      <Filter>objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\objects\Image.cpp">
+      <Filter>objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\objects\Node.cpp">
+      <Filter>objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\objects\Object.cpp">
+      <Filter>objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\objects\Scene.cpp">
+      <Filter>objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\objects\Sprite.cpp">
+      <Filter>objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\core\objects\Text.cpp">
+      <Filter>objects</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>