From 6d7550608cbe160a52f135f5dc9cdf912eba78e7 Mon Sep 17 00:00:00 2001 From: Nomango <569629550@qq.com> Date: Sat, 21 Apr 2018 21:24:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=89=80=E6=9C=89=E5=A4=B4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/Action/Action.cpp | 4 ++-- core/Action/ActionDelay.cpp | 2 +- core/Action/ActionFunc.cpp | 2 +- core/Action/ActionGradual.cpp | 2 +- core/Action/ActionLoop.cpp | 4 ++-- core/Action/ActionMoveBy.cpp | 2 +- core/Action/ActionMoveTo.cpp | 2 +- core/Action/ActionOpacityBy.cpp | 2 +- core/Action/ActionOpacityTo.cpp | 2 +- core/Action/ActionRotateBy.cpp | 2 +- core/Action/ActionRotateTo.cpp | 2 +- core/Action/ActionScaleBy.cpp | 2 +- core/Action/ActionScaleTo.cpp | 2 +- core/Action/ActionSequence.cpp | 2 +- core/Action/ActionTwo.cpp | 2 +- core/Action/Animation.cpp | 2 +- core/Base/Game.cpp | 4 ++-- core/Base/Input.cpp | 6 +++--- core/Base/Renderer.cpp | 6 +++--- core/Base/Time.cpp | 2 +- core/Base/Window.cpp | 4 ++-- core/Collider/Collider.cpp | 6 +++--- core/Collider/ColliderCircle.cpp | 4 ++-- core/Collider/ColliderEllipse.cpp | 4 ++-- core/Collider/ColliderRect.cpp | 4 ++-- core/Common/Font.cpp | 2 +- core/Common/Image.cpp | 2 +- core/Common/Object.cpp | 4 ++-- core/Common/Point.cpp | 2 +- core/Common/Scene.cpp | 6 +++--- core/Common/Size.cpp | 2 +- core/Common/String.cpp | 2 +- core/Manager/ActionManager.cpp | 4 ++-- core/Manager/ColliderManager.cpp | 8 ++++---- core/Manager/InputManager.cpp | 4 ++-- core/Manager/MusicManager.cpp | 4 ++-- core/Manager/ObjectManager.cpp | 4 ++-- core/Manager/SceneManager.cpp | 6 +++--- core/Manager/TimerManager.cpp | 6 +++--- core/Node/Button.cpp | 4 ++-- core/Node/ButtonToggle.cpp | 2 +- core/Node/Menu.cpp | 2 +- core/Node/Node.cpp | 10 +++++----- core/Node/Shape/Circle.cpp | 2 +- core/Node/Shape/Ellipse.cpp | 2 +- core/Node/Shape/Rect.cpp | 2 +- core/Node/Shape/RoundRect.cpp | 2 +- core/Node/Shape/Shape.cpp | 2 +- core/Node/Sprite.cpp | 2 +- core/Node/Text.cpp | 2 +- core/Tool/Data.cpp | 2 +- core/Tool/Listener/CollisionListener.cpp | 4 ++-- core/Tool/Listener/InputListener.cpp | 4 ++-- core/Tool/Listener/Listener.cpp | 2 +- core/Tool/Music.cpp | 4 ++-- core/Tool/Path.cpp | 2 +- core/Tool/Random.cpp | 2 +- core/Tool/Timer.cpp | 6 +++--- core/Transition/Transition.cpp | 6 +++--- core/Transition/TransitionEmerge.cpp | 4 ++-- core/Transition/TransitionFade.cpp | 4 ++-- core/Transition/TransitionMove.cpp | 4 ++-- core/{eaction.h => e2daction.h} | 2 +- core/{ebase.h => e2dbase.h} | 4 ++-- core/{ecollider.h => e2dcollider.h} | 2 +- core/{ecommon.h => e2dcommon.h} | 2 +- core/{emacros.h => e2dmacros.h} | 0 core/{emanager.h => e2dmanager.h} | 4 ++-- core/{enode.h => e2dnode.h} | 2 +- core/{eshape.h => e2dshape.h} | 2 +- core/{etool.h => e2dtool.h} | 2 +- core/{etransition.h => e2dtransition.h} | 2 +- core/easy2d.h | 20 ++++++++++---------- project/vs2017/Easy2D.vcxproj | 20 ++++++++++---------- project/vs2017/Easy2D.vcxproj.filters | 20 ++++++++++---------- 75 files changed, 145 insertions(+), 145 deletions(-) rename core/{eaction.h => e2daction.h} (99%) rename core/{ebase.h => e2dbase.h} (98%) rename core/{ecollider.h => e2dcollider.h} (99%) rename core/{ecommon.h => e2dcommon.h} (99%) rename core/{emacros.h => e2dmacros.h} (100%) rename core/{emanager.h => e2dmanager.h} (99%) rename core/{enode.h => e2dnode.h} (99%) rename core/{eshape.h => e2dshape.h} (99%) rename core/{etool.h => e2dtool.h} (99%) rename core/{etransition.h => e2dtransition.h} (98%) diff --git a/core/Action/Action.cpp b/core/Action/Action.cpp index 0035cb11..a93d4b01 100644 --- a/core/Action/Action.cpp +++ b/core/Action/Action.cpp @@ -1,5 +1,5 @@ -#include "..\eaction.h" -#include "..\emanager.h" +#include "..\e2daction.h" +#include "..\e2dmanager.h" e2d::Action::Action() : m_bRunning(false) diff --git a/core/Action/ActionDelay.cpp b/core/Action/ActionDelay.cpp index 0f2c2ac4..fb3008b4 100644 --- a/core/Action/ActionDelay.cpp +++ b/core/Action/ActionDelay.cpp @@ -1,4 +1,4 @@ -#include "..\eaction.h" +#include "..\e2daction.h" e2d::ActionDelay::ActionDelay(double duration) { diff --git a/core/Action/ActionFunc.cpp b/core/Action/ActionFunc.cpp index 0c5ba799..91942a60 100644 --- a/core/Action/ActionFunc.cpp +++ b/core/Action/ActionFunc.cpp @@ -1,4 +1,4 @@ -#include "..\eaction.h" +#include "..\e2daction.h" e2d::ActionFunc::ActionFunc(Function func) : m_Callback(func) diff --git a/core/Action/ActionGradual.cpp b/core/Action/ActionGradual.cpp index 06fddf34..14299573 100644 --- a/core/Action/ActionGradual.cpp +++ b/core/Action/ActionGradual.cpp @@ -1,4 +1,4 @@ -#include "..\eaction.h" +#include "..\e2daction.h" e2d::ActionGradual::ActionGradual(double duration) : m_fRateOfProgress(0) diff --git a/core/Action/ActionLoop.cpp b/core/Action/ActionLoop.cpp index 3fc664db..1c08cb08 100644 --- a/core/Action/ActionLoop.cpp +++ b/core/Action/ActionLoop.cpp @@ -1,5 +1,5 @@ -#include "..\eaction.h" -#include "..\emanager.h" +#include "..\e2daction.h" +#include "..\e2dmanager.h" e2d::ActionLoop::ActionLoop(Action * action, int times /* = -1 */) : m_pAction(action) diff --git a/core/Action/ActionMoveBy.cpp b/core/Action/ActionMoveBy.cpp index c2fae766..7d64b79c 100644 --- a/core/Action/ActionMoveBy.cpp +++ b/core/Action/ActionMoveBy.cpp @@ -1,4 +1,4 @@ -#include "..\eaction.h" +#include "..\e2daction.h" e2d::ActionMoveBy::ActionMoveBy(double duration, Vector vector) : diff --git a/core/Action/ActionMoveTo.cpp b/core/Action/ActionMoveTo.cpp index d3e5472a..060e8185 100644 --- a/core/Action/ActionMoveTo.cpp +++ b/core/Action/ActionMoveTo.cpp @@ -1,4 +1,4 @@ -#include "..\eaction.h" +#include "..\e2daction.h" e2d::ActionMoveTo::ActionMoveTo(double duration, Point pos) : ActionMoveBy(duration, Vector()) diff --git a/core/Action/ActionOpacityBy.cpp b/core/Action/ActionOpacityBy.cpp index 5b284ac8..004f9cc6 100644 --- a/core/Action/ActionOpacityBy.cpp +++ b/core/Action/ActionOpacityBy.cpp @@ -1,4 +1,4 @@ -#include "..\eaction.h" +#include "..\e2daction.h" e2d::ActionOpacityBy::ActionOpacityBy(double duration, double opacity) : diff --git a/core/Action/ActionOpacityTo.cpp b/core/Action/ActionOpacityTo.cpp index 1938d1b7..ede2eeb2 100644 --- a/core/Action/ActionOpacityTo.cpp +++ b/core/Action/ActionOpacityTo.cpp @@ -1,4 +1,4 @@ -#include "..\eaction.h" +#include "..\e2daction.h" e2d::ActionOpacityTo::ActionOpacityTo(double duration, double opacity) : diff --git a/core/Action/ActionRotateBy.cpp b/core/Action/ActionRotateBy.cpp index cf86ddb3..d7aecd63 100644 --- a/core/Action/ActionRotateBy.cpp +++ b/core/Action/ActionRotateBy.cpp @@ -1,4 +1,4 @@ -#include "..\eaction.h" +#include "..\e2daction.h" e2d::ActionRotateBy::ActionRotateBy(double duration, double rotation) : diff --git a/core/Action/ActionRotateTo.cpp b/core/Action/ActionRotateTo.cpp index 4943c186..449cce2f 100644 --- a/core/Action/ActionRotateTo.cpp +++ b/core/Action/ActionRotateTo.cpp @@ -1,4 +1,4 @@ -#include "..\eaction.h" +#include "..\e2daction.h" e2d::ActionRotateTo::ActionRotateTo(double duration, double rotation) : diff --git a/core/Action/ActionScaleBy.cpp b/core/Action/ActionScaleBy.cpp index 51d6af57..fb5c03df 100644 --- a/core/Action/ActionScaleBy.cpp +++ b/core/Action/ActionScaleBy.cpp @@ -1,4 +1,4 @@ -#include "..\eaction.h" +#include "..\e2daction.h" e2d::ActionScaleBy::ActionScaleBy(double duration, double scale) diff --git a/core/Action/ActionScaleTo.cpp b/core/Action/ActionScaleTo.cpp index 01c40982..2fa68ad3 100644 --- a/core/Action/ActionScaleTo.cpp +++ b/core/Action/ActionScaleTo.cpp @@ -1,4 +1,4 @@ -#include "..\eaction.h" +#include "..\e2daction.h" e2d::ActionScaleTo::ActionScaleTo(double duration, double scale) : ActionScaleBy(duration, 0, 0) diff --git a/core/Action/ActionSequence.cpp b/core/Action/ActionSequence.cpp index 8f8cae91..ebf7d07a 100644 --- a/core/Action/ActionSequence.cpp +++ b/core/Action/ActionSequence.cpp @@ -1,4 +1,4 @@ -#include "..\eaction.h" +#include "..\e2daction.h" e2d::ActionSequence::ActionSequence() : m_nActionIndex(0) diff --git a/core/Action/ActionTwo.cpp b/core/Action/ActionTwo.cpp index ff30efb4..0743130c 100644 --- a/core/Action/ActionTwo.cpp +++ b/core/Action/ActionTwo.cpp @@ -1,4 +1,4 @@ -#include "..\eaction.h" +#include "..\e2daction.h" e2d::ActionTwo::ActionTwo(Action * pActionFirst, Action * pActionSecond, bool bAtSameTime/* = false*/) : m_pFirstAction(pActionFirst) diff --git a/core/Action/Animation.cpp b/core/Action/Animation.cpp index 12803ebd..adbe207c 100644 --- a/core/Action/Animation.cpp +++ b/core/Action/Animation.cpp @@ -1,4 +1,4 @@ -#include "..\eaction.h" +#include "..\e2daction.h" e2d::Animation::Animation() : m_nFrameIndex(0) diff --git a/core/Base/Game.cpp b/core/Base/Game.cpp index a9690107..b14187f3 100644 --- a/core/Base/Game.cpp +++ b/core/Base/Game.cpp @@ -1,5 +1,5 @@ -#include "..\ebase.h" -#include "..\emanager.h" +#include "..\e2dbase.h" +#include "..\e2dmanager.h" // 控制游戏终止 diff --git a/core/Base/Input.cpp b/core/Base/Input.cpp index 7f70c396..56207bb5 100644 --- a/core/Base/Input.cpp +++ b/core/Base/Input.cpp @@ -1,6 +1,6 @@ -#include "..\ebase.h" -#include "..\etool.h" -#include "..\emanager.h" +#include "..\e2dbase.h" +#include "..\e2dtool.h" +#include "..\e2dmanager.h" #pragma comment(lib, "dinput8.lib") diff --git a/core/Base/Renderer.cpp b/core/Base/Renderer.cpp index 035b11f2..aca67cbc 100644 --- a/core/Base/Renderer.cpp +++ b/core/Base/Renderer.cpp @@ -1,6 +1,6 @@ -#include "..\ebase.h" -#include "..\emanager.h" -#include "..\enode.h" +#include "..\e2dbase.h" +#include "..\e2dmanager.h" +#include "..\e2dnode.h" static bool s_bShowFps = false; static IDWriteTextFormat * s_pTextFormat = nullptr; diff --git a/core/Base/Time.cpp b/core/Base/Time.cpp index f5e381dd..3c23e999 100644 --- a/core/Base/Time.cpp +++ b/core/Base/Time.cpp @@ -1,4 +1,4 @@ -#include "..\ebase.h" +#include "..\e2dbase.h" // 上一帧与当前帧的时间间隔 static int s_nInterval = 0; diff --git a/core/Base/Window.cpp b/core/Base/Window.cpp index 2d16371d..a7ce19f0 100644 --- a/core/Base/Window.cpp +++ b/core/Base/Window.cpp @@ -1,5 +1,5 @@ -#include "..\ebase.h" -#include "..\emanager.h" +#include "..\e2dbase.h" +#include "..\e2dmanager.h" #include #pragma comment (lib ,"imm32.lib") diff --git a/core/Collider/Collider.cpp b/core/Collider/Collider.cpp index 71b8d5d6..bc67b86a 100644 --- a/core/Collider/Collider.cpp +++ b/core/Collider/Collider.cpp @@ -1,6 +1,6 @@ -#include "..\ecollider.h" -#include "..\emanager.h" -#include "..\enode.h" +#include "..\e2dcollider.h" +#include "..\e2dmanager.h" +#include "..\e2dnode.h" e2d::Collider::Collider() : m_bIsVisiable(true) diff --git a/core/Collider/ColliderCircle.cpp b/core/Collider/ColliderCircle.cpp index c73ef4ed..bc7339c3 100644 --- a/core/Collider/ColliderCircle.cpp +++ b/core/Collider/ColliderCircle.cpp @@ -1,5 +1,5 @@ -#include "..\ecollider.h" -#include "..\enode.h" +#include "..\e2dcollider.h" +#include "..\e2dnode.h" e2d::ColliderCircle::ColliderCircle() : m_pD2dCircle(nullptr) diff --git a/core/Collider/ColliderEllipse.cpp b/core/Collider/ColliderEllipse.cpp index 7ab01daa..1f39280a 100644 --- a/core/Collider/ColliderEllipse.cpp +++ b/core/Collider/ColliderEllipse.cpp @@ -1,5 +1,5 @@ -#include "..\ecollider.h" -#include "..\enode.h" +#include "..\e2dcollider.h" +#include "..\e2dnode.h" e2d::ColliderEllipse::ColliderEllipse() : m_pD2dEllipse(nullptr) diff --git a/core/Collider/ColliderRect.cpp b/core/Collider/ColliderRect.cpp index 0767c518..47e68dd9 100644 --- a/core/Collider/ColliderRect.cpp +++ b/core/Collider/ColliderRect.cpp @@ -1,5 +1,5 @@ -#include "..\ecollider.h" -#include "..\enode.h" +#include "..\e2dcollider.h" +#include "..\e2dnode.h" e2d::ColliderRect::ColliderRect() : m_pD2dRectangle(nullptr) diff --git a/core/Common/Font.cpp b/core/Common/Font.cpp index 7a3fe1e2..88d8d54c 100644 --- a/core/Common/Font.cpp +++ b/core/Common/Font.cpp @@ -1,4 +1,4 @@ -#include "..\enode.h" +#include "..\e2dnode.h" e2d::Font::Font() : fontFamily("") diff --git a/core/Common/Image.cpp b/core/Common/Image.cpp index 8a106ae1..80f9bcca 100644 --- a/core/Common/Image.cpp +++ b/core/Common/Image.cpp @@ -1,4 +1,4 @@ -#include "..\enode.h" +#include "..\e2dnode.h" #include static std::map s_mBitmapsFromFile; diff --git a/core/Common/Object.cpp b/core/Common/Object.cpp index c895f467..a2f8846f 100644 --- a/core/Common/Object.cpp +++ b/core/Common/Object.cpp @@ -1,5 +1,5 @@ -#include "..\ebase.h" -#include "..\emanager.h" +#include "..\e2dbase.h" +#include "..\e2dmanager.h" e2d::Object::Object() : m_nRefCount(0) diff --git a/core/Common/Point.cpp b/core/Common/Point.cpp index d0336859..f78246ce 100644 --- a/core/Common/Point.cpp +++ b/core/Common/Point.cpp @@ -1,4 +1,4 @@ -#include "..\ecommon.h" +#include "..\e2dcommon.h" e2d::Point::Point() diff --git a/core/Common/Scene.cpp b/core/Common/Scene.cpp index 3bf8c5ed..c4c300be 100644 --- a/core/Common/Scene.cpp +++ b/core/Common/Scene.cpp @@ -1,6 +1,6 @@ -#include "..\ebase.h" -#include "..\enode.h" -#include "..\emanager.h" +#include "..\e2dbase.h" +#include "..\e2dnode.h" +#include "..\e2dmanager.h" e2d::Scene::Scene() : m_bWillSave(true) diff --git a/core/Common/Size.cpp b/core/Common/Size.cpp index 198efe3f..e626418d 100644 --- a/core/Common/Size.cpp +++ b/core/Common/Size.cpp @@ -1,4 +1,4 @@ -#include "..\ecommon.h" +#include "..\e2dcommon.h" e2d::Size::Size() { diff --git a/core/Common/String.cpp b/core/Common/String.cpp index cace3304..2567fe7c 100644 --- a/core/Common/String.cpp +++ b/core/Common/String.cpp @@ -1,4 +1,4 @@ -#include "..\ecommon.h" +#include "..\e2dcommon.h" #include #include #pragma comment(lib, "comsuppw.lib") diff --git a/core/Manager/ActionManager.cpp b/core/Manager/ActionManager.cpp index de223ffd..5d47817b 100644 --- a/core/Manager/ActionManager.cpp +++ b/core/Manager/ActionManager.cpp @@ -1,5 +1,5 @@ -#include "..\emanager.h" -#include "..\eaction.h" +#include "..\e2dmanager.h" +#include "..\e2daction.h" static std::vector s_vActions; static std::vector s_vRunningActions; diff --git a/core/Manager/ColliderManager.cpp b/core/Manager/ColliderManager.cpp index 5bc525dd..d2c04191 100644 --- a/core/Manager/ColliderManager.cpp +++ b/core/Manager/ColliderManager.cpp @@ -1,7 +1,7 @@ -#include "..\emanager.h" -#include "..\enode.h" -#include "..\ecollider.h" -#include "..\etool.h" +#include "..\e2dmanager.h" +#include "..\e2dnode.h" +#include "..\e2dcollider.h" +#include "..\e2dtool.h" // 碰撞体集合 static std::vector s_vColliders; diff --git a/core/Manager/InputManager.cpp b/core/Manager/InputManager.cpp index 6b6b2267..f1b63e9d 100644 --- a/core/Manager/InputManager.cpp +++ b/core/Manager/InputManager.cpp @@ -1,5 +1,5 @@ -#include "..\emanager.h" -#include "..\etool.h" +#include "..\e2dmanager.h" +#include "..\e2dtool.h" // 监听器容器 static std::vector s_vListeners; diff --git a/core/Manager/MusicManager.cpp b/core/Manager/MusicManager.cpp index b3367718..3b46f1b5 100644 --- a/core/Manager/MusicManager.cpp +++ b/core/Manager/MusicManager.cpp @@ -1,5 +1,5 @@ -#include "..\emanager.h" -#include "..\etool.h" +#include "..\e2dmanager.h" +#include "..\e2dtool.h" #include #if HIGHER_THAN_VS2010 diff --git a/core/Manager/ObjectManager.cpp b/core/Manager/ObjectManager.cpp index aa8abfe0..4986c01d 100644 --- a/core/Manager/ObjectManager.cpp +++ b/core/Manager/ObjectManager.cpp @@ -1,5 +1,5 @@ -#include "..\emanager.h" -#include "..\ebase.h" +#include "..\e2dmanager.h" +#include "..\e2dbase.h" // ObjectManager 释放池的实现机制： // Object 类中的引用计数（m_nRefCount）在一定程度上保证了指针的使用安全 diff --git a/core/Manager/SceneManager.cpp b/core/Manager/SceneManager.cpp index 1d156cb8..c380459d 100644 --- a/core/Manager/SceneManager.cpp +++ b/core/Manager/SceneManager.cpp @@ -1,6 +1,6 @@ -#include "..\emanager.h" -#include "..\ebase.h" -#include "..\etransition.h" +#include "..\e2dmanager.h" +#include "..\e2dbase.h" +#include "..\e2dtransition.h" static e2d::Scene * s_pCurrScene = nullptr; static e2d::Scene * s_pNextScene = nullptr; diff --git a/core/Manager/TimerManager.cpp b/core/Manager/TimerManager.cpp index 0ce45471..7c3c02da 100644 --- a/core/Manager/TimerManager.cpp +++ b/core/Manager/TimerManager.cpp @@ -1,6 +1,6 @@ -#include "..\emanager.h" -#include "..\etool.h" -#include "..\enode.h" +#include "..\e2dmanager.h" +#include "..\e2dtool.h" +#include "..\e2dnode.h" static std::vector s_vTimers; diff --git a/core/Node/Button.cpp b/core/Node/Button.cpp index 14aeb281..83c64966 100644 --- a/core/Node/Button.cpp +++ b/core/Node/Button.cpp @@ -1,5 +1,5 @@ -#include "..\enode.h" -#include "..\emanager.h" +#include "..\e2dnode.h" +#include "..\e2dmanager.h" #define SAFE_SETTER(pointer, func, ...) if (pointer) { pointer->##func(__VA_ARGS__); } diff --git a/core/Node/ButtonToggle.cpp b/core/Node/ButtonToggle.cpp index 22b9f997..94d741ef 100644 --- a/core/Node/ButtonToggle.cpp +++ b/core/Node/ButtonToggle.cpp @@ -1,4 +1,4 @@ -#include "..\enode.h" +#include "..\e2dnode.h" e2d::ButtonToggle::ButtonToggle() : Button() diff --git a/core/Node/Menu.cpp b/core/Node/Menu.cpp index 0a7702bf..4b637cbc 100644 --- a/core/Node/Menu.cpp +++ b/core/Node/Menu.cpp @@ -1,4 +1,4 @@ -#include "..\enode.h" +#include "..\e2dnode.h" e2d::Menu::Menu() : m_bEnable(true) diff --git a/core/Node/Node.cpp b/core/Node/Node.cpp index 0e75e10a..ddd99210 100644 --- a/core/Node/Node.cpp +++ b/core/Node/Node.cpp @@ -1,8 +1,8 @@ -#include "..\enode.h" -#include "..\emanager.h" -#include "..\etool.h" -#include "..\eaction.h" -#include "..\ecollider.h" +#include "..\e2dnode.h" +#include "..\e2dmanager.h" +#include "..\e2dtool.h" +#include "..\e2daction.h" +#include "..\e2dcollider.h" #include // 默认中心点位置 diff --git a/core/Node/Shape/Circle.cpp b/core/Node/Shape/Circle.cpp index fd8da981..a3cf9eb7 100644 --- a/core/Node/Shape/Circle.cpp +++ b/core/Node/Shape/Circle.cpp @@ -1,4 +1,4 @@ -#include "..\..\eshape.h" +#include "..\..\e2dshape.h" e2d::Circle::Circle() : m_fRadius(0) diff --git a/core/Node/Shape/Ellipse.cpp b/core/Node/Shape/Ellipse.cpp index db50050c..d31eb287 100644 --- a/core/Node/Shape/Ellipse.cpp +++ b/core/Node/Shape/Ellipse.cpp @@ -1,4 +1,4 @@ -#include "..\..\eshape.h" +#include "..\..\e2dshape.h" e2d::Ellipse::Ellipse() : m_fRadiusX(0) diff --git a/core/Node/Shape/Rect.cpp b/core/Node/Shape/Rect.cpp index 46b2329f..ede01f61 100644 --- a/core/Node/Shape/Rect.cpp +++ b/core/Node/Shape/Rect.cpp @@ -1,4 +1,4 @@ -#include "..\..\eshape.h" +#include "..\..\e2dshape.h" e2d::Rect::Rect() { diff --git a/core/Node/Shape/RoundRect.cpp b/core/Node/Shape/RoundRect.cpp index bdeb1a1c..34dcd622 100644 --- a/core/Node/Shape/RoundRect.cpp +++ b/core/Node/Shape/RoundRect.cpp @@ -1,4 +1,4 @@ -#include "..\..\eshape.h" +#include "..\..\e2dshape.h" e2d::RoundRect::RoundRect() : m_fRadiusX(0) diff --git a/core/Node/Shape/Shape.cpp b/core/Node/Shape/Shape.cpp index 38329226..e3b47f5a 100644 --- a/core/Node/Shape/Shape.cpp +++ b/core/Node/Shape/Shape.cpp @@ -1,4 +1,4 @@ -#include "..\..\eshape.h" +#include "..\..\e2dshape.h" e2d::Shape::Shape() : m_nStyle(ShapeStyle::SOLID) diff --git a/core/Node/Sprite.cpp b/core/Node/Sprite.cpp index 95acc5f4..c621ed1d 100644 --- a/core/Node/Sprite.cpp +++ b/core/Node/Sprite.cpp @@ -1,4 +1,4 @@ -#include "..\enode.h" +#include "..\e2dnode.h" e2d::Sprite::Sprite() diff --git a/core/Node/Text.cpp b/core/Node/Text.cpp index 9ee02a17..cc03a0a4 100644 --- a/core/Node/Text.cpp +++ b/core/Node/Text.cpp @@ -1,4 +1,4 @@ -#include "..\enode.h" +#include "..\e2dnode.h" e2d::Text::Text() diff --git a/core/Tool/Data.cpp b/core/Tool/Data.cpp index 215eda24..ec5617ed 100644 --- a/core/Tool/Data.cpp +++ b/core/Tool/Data.cpp @@ -1,4 +1,4 @@ -#include "..\etool.h" +#include "..\e2dtool.h" static e2d::String s_sDataFileName = L"DefaultData.ini"; diff --git a/core/Tool/Listener/CollisionListener.cpp b/core/Tool/Listener/CollisionListener.cpp index 0592b516..2b1ba8f3 100644 --- a/core/Tool/Listener/CollisionListener.cpp +++ b/core/Tool/Listener/CollisionListener.cpp @@ -1,5 +1,5 @@ -#include "..\..\etool.h" -#include "..\..\emanager.h" +#include "..\..\e2dtool.h" +#include "..\..\e2dmanager.h" e2d::CollisionListener::CollisionListener() : Listener() diff --git a/core/Tool/Listener/InputListener.cpp b/core/Tool/Listener/InputListener.cpp index 0950b3a2..4d212f7d 100644 --- a/core/Tool/Listener/InputListener.cpp +++ b/core/Tool/Listener/InputListener.cpp @@ -1,5 +1,5 @@ -#include "..\..\etool.h" -#include "..\..\emanager.h" +#include "..\..\e2dtool.h" +#include "..\..\e2dmanager.h" e2d::InputListener::InputListener() : Listener() diff --git a/core/Tool/Listener/Listener.cpp b/core/Tool/Listener/Listener.cpp index 1a62b50f..e235244a 100644 --- a/core/Tool/Listener/Listener.cpp +++ b/core/Tool/Listener/Listener.cpp @@ -1,4 +1,4 @@ -#include "..\..\etool.h" +#include "..\..\e2dtool.h" e2d::Listener::Listener() : m_bRunning(false) diff --git a/core/Tool/Music.cpp b/core/Tool/Music.cpp index 87379e01..08c3ec62 100644 --- a/core/Tool/Music.cpp +++ b/core/Tool/Music.cpp @@ -1,5 +1,5 @@ -#include "..\etool.h" -#include "..\emanager.h" +#include "..\e2dtool.h" +#include "..\e2dmanager.h" using namespace e2d; diff --git a/core/Tool/Path.cpp b/core/Tool/Path.cpp index 8b841346..2b9db6a7 100644 --- a/core/Tool/Path.cpp +++ b/core/Tool/Path.cpp @@ -1,4 +1,4 @@ -#include "..\etool.h" +#include "..\e2dtool.h" #include #include diff --git a/core/Tool/Random.cpp b/core/Tool/Random.cpp index 8f753d19..ca65fac9 100644 --- a/core/Tool/Random.cpp +++ b/core/Tool/Random.cpp @@ -1,4 +1,4 @@ -#include "..\etool.h" +#include "..\e2dtool.h" std::default_random_engine &e2d::Random::__getEngine() { diff --git a/core/Tool/Timer.cpp b/core/Tool/Timer.cpp index f0063dab..1d7b20a2 100644 --- a/core/Tool/Timer.cpp +++ b/core/Tool/Timer.cpp @@ -1,6 +1,6 @@ -#include "..\etool.h" -#include "..\enode.h" -#include "..\emanager.h" +#include "..\e2dtool.h" +#include "..\e2dnode.h" +#include "..\e2dmanager.h" e2d::Timer::Timer(String name, Function func, double interval /* = 0 */, int updateTimes /* = -1 */, bool atOnce /* = false */, bool autoRelease /* = false */) : m_bRunning(false) diff --git a/core/Transition/Transition.cpp b/core/Transition/Transition.cpp index f8d0c70b..806338a0 100644 --- a/core/Transition/Transition.cpp +++ b/core/Transition/Transition.cpp @@ -1,6 +1,6 @@ -#include "..\ebase.h" -#include "..\etransition.h" -#include "..\enode.h" +#include "..\e2dbase.h" +#include "..\e2dtransition.h" +#include "..\e2dnode.h" e2d::Transition::Transition(double duration) : m_bEnd(false) diff --git a/core/Transition/TransitionEmerge.cpp b/core/Transition/TransitionEmerge.cpp index 54c27dfd..cd1532ba 100644 --- a/core/Transition/TransitionEmerge.cpp +++ b/core/Transition/TransitionEmerge.cpp @@ -1,5 +1,5 @@ -#include "..\etransition.h" -#include "..\enode.h" +#include "..\e2dtransition.h" +#include "..\e2dnode.h" e2d::TransitionEmerge::TransitionEmerge(double duration) : Transition(duration) diff --git a/core/Transition/TransitionFade.cpp b/core/Transition/TransitionFade.cpp index 910f0e3b..63e5ac91 100644 --- a/core/Transition/TransitionFade.cpp +++ b/core/Transition/TransitionFade.cpp @@ -1,5 +1,5 @@ -#include "..\etransition.h" -#include "..\enode.h" +#include "..\e2dtransition.h" +#include "..\e2dnode.h" e2d::TransitionFade::TransitionFade(double duration) : Transition(0) diff --git a/core/Transition/TransitionMove.cpp b/core/Transition/TransitionMove.cpp index 18e5741c..41c23097 100644 --- a/core/Transition/TransitionMove.cpp +++ b/core/Transition/TransitionMove.cpp @@ -1,5 +1,5 @@ -#include "..\etransition.h" -#include "..\enode.h" +#include "..\e2dtransition.h" +#include "..\e2dnode.h" e2d::TransitionMove::TransitionMove(double duration, int direct) : Transition(duration) diff --git a/core/eaction.h b/core/e2daction.h similarity index 99% rename from core/eaction.h rename to core/e2daction.h index fa060ce1..de458db3 100644 --- a/core/eaction.h +++ b/core/e2daction.h @@ -1,5 +1,5 @@ #pragma once -#include "enode.h" +#include "e2dnode.h" namespace e2d { diff --git a/core/ebase.h b/core/e2dbase.h similarity index 98% rename from core/ebase.h rename to core/e2dbase.h index d8a04f67..04efb98b 100644 --- a/core/ebase.h +++ b/core/e2dbase.h @@ -1,6 +1,6 @@ #pragma once -#include "emacros.h" -#include "ecommon.h" +#include "e2dmacros.h" +#include "e2dcommon.h" // Base Classes diff --git a/core/ecollider.h b/core/e2dcollider.h similarity index 99% rename from core/ecollider.h rename to core/e2dcollider.h index db9a7632..cd3ac15d 100644 --- a/core/ecollider.h +++ b/core/e2dcollider.h @@ -1,5 +1,5 @@ #pragma once -#include "ebase.h" +#include "e2dbase.h" namespace e2d diff --git a/core/ecommon.h b/core/e2dcommon.h similarity index 99% rename from core/ecommon.h rename to core/e2dcommon.h index 9abe9804..9bf4f01e 100644 --- a/core/ecommon.h +++ b/core/e2dcommon.h @@ -1,5 +1,5 @@ #pragma once -#include "emacros.h" +#include "e2dmacros.h" #include #include #include diff --git a/core/emacros.h b/core/e2dmacros.h similarity index 100% rename from core/emacros.h rename to core/e2dmacros.h diff --git a/core/emanager.h b/core/e2dmanager.h similarity index 99% rename from core/emanager.h rename to core/e2dmanager.h index 25fa94c3..bf5ba7db 100644 --- a/core/emanager.h +++ b/core/e2dmanager.h @@ -1,6 +1,6 @@ #pragma once -#include "emacros.h" -#include "ecommon.h" +#include "e2dmacros.h" +#include "e2dcommon.h" namespace e2d { diff --git a/core/enode.h b/core/e2dnode.h similarity index 99% rename from core/enode.h rename to core/e2dnode.h index a271187a..a748ddae 100644 --- a/core/enode.h +++ b/core/e2dnode.h @@ -1,5 +1,5 @@ #pragma once -#include "ebase.h" +#include "e2dbase.h" namespace e2d { diff --git a/core/eshape.h b/core/e2dshape.h similarity index 99% rename from core/eshape.h rename to core/e2dshape.h index 1a2ea67d..8c58b964 100644 --- a/core/eshape.h +++ b/core/e2dshape.h @@ -1,5 +1,5 @@ #pragma once -#include "enode.h" +#include "e2dnode.h" namespace e2d { diff --git a/core/etool.h b/core/e2dtool.h similarity index 99% rename from core/etool.h rename to core/e2dtool.h index 2b1ece94..68599b9f 100644 --- a/core/etool.h +++ b/core/e2dtool.h @@ -1,5 +1,5 @@ #pragma once -#include "ebase.h" +#include "e2dbase.h" #include namespace e2d diff --git a/core/etransition.h b/core/e2dtransition.h similarity index 98% rename from core/etransition.h rename to core/e2dtransition.h index 7eb80fa1..5d77e91f 100644 --- a/core/etransition.h +++ b/core/e2dtransition.h @@ -1,5 +1,5 @@ #pragma once -#include "ecommon.h" +#include "e2dcommon.h" namespace e2d { diff --git a/core/easy2d.h b/core/easy2d.h index 382a53e7..d1a44e20 100644 --- a/core/easy2d.h +++ b/core/easy2d.h @@ -17,16 +17,16 @@ #endif -#include "emacros.h" -#include "ecommon.h" -#include "ebase.h" -#include "emanager.h" -#include "enode.h" -#include "eshape.h" -#include "etool.h" -#include "eaction.h" -#include "etransition.h" -#include "ecollider.h" +#include "e2dmacros.h" +#include "e2dcommon.h" +#include "e2dbase.h" +#include "e2dmanager.h" +#include "e2dnode.h" +#include "e2dshape.h" +#include "e2dtool.h" +#include "e2daction.h" +#include "e2dtransition.h" +#include "e2dcollider.h" #if defined(DEBUG) || defined(_DEBUG) diff --git a/project/vs2017/Easy2D.vcxproj b/project/vs2017/Easy2D.vcxproj index 59f22bec..8e4c9bdc 100644 --- a/project/vs2017/Easy2D.vcxproj +++ b/project/vs2017/Easy2D.vcxproj @@ -254,17 +254,17 @@ - + - - - - - - - - - + + + + + + + + + diff --git a/project/vs2017/Easy2D.vcxproj.filters b/project/vs2017/Easy2D.vcxproj.filters index 5761c759..3e6e7963 100644 --- a/project/vs2017/Easy2D.vcxproj.filters +++ b/project/vs2017/Easy2D.vcxproj.filters @@ -221,16 +221,16 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file