更改所有头文件名称

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)

core/Action/ActionDelay.cpp

@@ -1,4 +1,4 @@
-#include "..\eaction.h"
+#include "..\e2daction.h"
 
 e2d::ActionDelay::ActionDelay(double duration)
 {

core/Action/ActionFunc.cpp

@@ -1,4 +1,4 @@
-#include "..\eaction.h"
+#include "..\e2daction.h"
 
 e2d::ActionFunc::ActionFunc(Function func) :
 	m_Callback(func)

core/Action/ActionGradual.cpp

@@ -1,4 +1,4 @@
-#include "..\eaction.h"
+#include "..\e2daction.h"
 
 e2d::ActionGradual::ActionGradual(double duration)
 	: m_fRateOfProgress(0)

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)

core/Action/ActionMoveBy.cpp

@@ -1,4 +1,4 @@
-#include "..\eaction.h"
+#include "..\e2daction.h"
 
 
 e2d::ActionMoveBy::ActionMoveBy(double duration, Vector vector) :

core/Action/ActionMoveTo.cpp

@@ -1,4 +1,4 @@
-#include "..\eaction.h"
+#include "..\e2daction.h"
 
 e2d::ActionMoveTo::ActionMoveTo(double duration, Point pos) :
 	ActionMoveBy(duration, Vector())

core/Action/ActionOpacityBy.cpp

@@ -1,4 +1,4 @@
-#include "..\eaction.h"
+#include "..\e2daction.h"
 
 
 e2d::ActionOpacityBy::ActionOpacityBy(double duration, double opacity) :

core/Action/ActionOpacityTo.cpp

@@ -1,4 +1,4 @@
-#include "..\eaction.h"
+#include "..\e2daction.h"
 
 
 e2d::ActionOpacityTo::ActionOpacityTo(double duration, double opacity) :

core/Action/ActionRotateBy.cpp

@@ -1,4 +1,4 @@
-#include "..\eaction.h"
+#include "..\e2daction.h"
 
 
 e2d::ActionRotateBy::ActionRotateBy(double duration, double rotation) :

core/Action/ActionRotateTo.cpp

@@ -1,4 +1,4 @@
-#include "..\eaction.h"
+#include "..\e2daction.h"
 
 
 e2d::ActionRotateTo::ActionRotateTo(double duration, double rotation) :

core/Action/ActionScaleBy.cpp

@@ -1,4 +1,4 @@
-#include "..\eaction.h"
+#include "..\e2daction.h"
 
 
 e2d::ActionScaleBy::ActionScaleBy(double duration, double scale)

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)

core/Action/ActionSequence.cpp

@@ -1,4 +1,4 @@
-#include "..\eaction.h"
+#include "..\e2daction.h"
 
 e2d::ActionSequence::ActionSequence()
 	: m_nActionIndex(0)

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)

core/Action/Animation.cpp

@@ -1,4 +1,4 @@
-#include "..\eaction.h"
+#include "..\e2daction.h"
 
 e2d::Animation::Animation() 
 	: m_nFrameIndex(0)

core/Base/Game.cpp

@@ -1,5 +1,5 @@
-#include "..\ebase.h"
-#include "..\emanager.h"
+#include "..\e2dbase.h"
+#include "..\e2dmanager.h"
 
 
 // ©ьжфсно╥жуж╧

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")
 

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;

core/Base/Time.cpp

@@ -1,4 +1,4 @@
-#include "..\ebase.h"
+#include "..\e2dbase.h"
 
 // 上一帧与当前帧的时间间隔
 static int s_nInterval = 0;

core/Base/Window.cpp

@@ -1,5 +1,5 @@
-#include "..\ebase.h"
-#include "..\emanager.h"
+#include "..\e2dbase.h"
+#include "..\e2dmanager.h"
 #include <imm.h>
 #pragma comment (lib ,"imm32.lib")
 

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)

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)

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)

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)

core/Common/Font.cpp

@@ -1,4 +1,4 @@
-#include "..\enode.h"
+#include "..\e2dnode.h"
 
 e2d::Font::Font() 
 	: fontFamily("")

core/Common/Image.cpp

@@ -1,4 +1,4 @@
-#include "..\enode.h"
+#include "..\e2dnode.h"
 #include <map>
 
 static std::map<size_t, ID2D1Bitmap*> s_mBitmapsFromFile;

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)

core/Common/Point.cpp

@@ -1,4 +1,4 @@
-#include "..\ecommon.h"
+#include "..\e2dcommon.h"
 
 
 e2d::Point::Point()

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)

core/Common/Size.cpp

@@ -1,4 +1,4 @@
-#include "..\ecommon.h"
+#include "..\e2dcommon.h"
 
 e2d::Size::Size()
 {

core/Common/String.cpp

@@ -1,4 +1,4 @@
-#include "..\ecommon.h"
+#include "..\e2dcommon.h"
 #include <iomanip>
 #include <comutil.h>
 #pragma comment(lib, "comsuppw.lib")

core/Manager/ActionManager.cpp

@@ -1,5 +1,5 @@
-#include "..\emanager.h"
-#include "..\eaction.h"
+#include "..\e2dmanager.h"
+#include "..\e2daction.h"
 
 static std::vector<e2d::Action*> s_vActions;
 static std::vector<e2d::Action*> s_vRunningActions;

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<e2d::Collider*> s_vColliders;

core/Manager/InputManager.cpp

@@ -1,5 +1,5 @@
-#include "..\emanager.h"
-#include "..\etool.h"
+#include "..\e2dmanager.h"
+#include "..\e2dtool.h"
 
 // 监听器容器
 static std::vector<e2d::InputListener*> s_vListeners;

core/Manager/MusicManager.cpp

@@ -1,5 +1,5 @@
-#include "..\emanager.h"
-#include "..\etool.h"
+#include "..\e2dmanager.h"
+#include "..\e2dtool.h"
 #include <map>
 
 #if HIGHER_THAN_VS2010

core/Manager/ObjectManager.cpp

@@ -1,5 +1,5 @@
-#include "..\emanager.h"
-#include "..\ebase.h"
+#include "..\e2dmanager.h"
+#include "..\e2dbase.h"
 
 // ObjectManager 释放池的实现机制：
 // Object 类中的引用计数（m_nRefCount）在一定程度上保证了指针的使用安全

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;

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<e2d::Timer*> s_vTimers;
 

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__); }
 

core/Node/ButtonToggle.cpp

@@ -1,4 +1,4 @@
-#include "..\enode.h"
+#include "..\e2dnode.h"
 
 e2d::ButtonToggle::ButtonToggle()
 	: Button()

core/Node/Menu.cpp

@@ -1,4 +1,4 @@
-#include "..\enode.h"
+#include "..\e2dnode.h"
 
 e2d::Menu::Menu()
 	: m_bEnable(true)

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 <algorithm>
 
 // 默认中心点位置

core/Node/Shape/Circle.cpp

@@ -1,4 +1,4 @@
-#include "..\..\eshape.h"
+#include "..\..\e2dshape.h"
 
 e2d::Circle::Circle()
 	: m_fRadius(0)

core/Node/Shape/Ellipse.cpp

@@ -1,4 +1,4 @@
-#include "..\..\eshape.h"
+#include "..\..\e2dshape.h"
 
 e2d::Ellipse::Ellipse()
 	: m_fRadiusX(0)

core/Node/Shape/Rect.cpp

@@ -1,4 +1,4 @@
-#include "..\..\eshape.h"
+#include "..\..\e2dshape.h"
 
 e2d::Rect::Rect()
 {

core/Node/Shape/RoundRect.cpp

@@ -1,4 +1,4 @@
-#include "..\..\eshape.h"
+#include "..\..\e2dshape.h"
 
 e2d::RoundRect::RoundRect()
 	: m_fRadiusX(0)

core/Node/Shape/Shape.cpp

@@ -1,4 +1,4 @@
-#include "..\..\eshape.h"
+#include "..\..\e2dshape.h"
 
 e2d::Shape::Shape()
 	: m_nStyle(ShapeStyle::SOLID)

core/Node/Sprite.cpp

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

core/Node/Text.cpp

@@ -1,4 +1,4 @@
-#include "..\enode.h"
+#include "..\e2dnode.h"
 
 
 e2d::Text::Text()

core/Tool/Data.cpp

@@ -1,4 +1,4 @@
-#include "..\etool.h"
+#include "..\e2dtool.h"
 
 static e2d::String s_sDataFileName = L"DefaultData.ini";
 

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()

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()

core/Tool/Listener/Listener.cpp

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

core/Tool/Music.cpp

@@ -1,5 +1,5 @@
-#include "..\etool.h"
-#include "..\emanager.h"
+#include "..\e2dtool.h"
+#include "..\e2dmanager.h"
 
 using namespace e2d;
 

core/Tool/Path.cpp

@@ -1,4 +1,4 @@
-#include "..\etool.h"
+#include "..\e2dtool.h"
 #include <algorithm>
 #include <commdlg.h>
 

core/Tool/Random.cpp

@@ -1,4 +1,4 @@
-#include "..\etool.h"
+#include "..\e2dtool.h"
 
 std::default_random_engine &e2d::Random::__getEngine()
 {

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)

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)

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)

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)

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)

core/e2daction.h

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

core/e2dbase.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "emacros.h"
-#include "ecommon.h"
+#include "e2dmacros.h"
+#include "e2dcommon.h"
 
 
 // Base Classes

core/e2dcollider.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "ebase.h"
+#include "e2dbase.h"
 
 
 namespace e2d

core/e2dcommon.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "emacros.h"
+#include "e2dmacros.h"
 #include <set>
 #include <stack>
 #include <vector>

core/e2dmanager.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "emacros.h"
-#include "ecommon.h"
+#include "e2dmacros.h"
+#include "e2dcommon.h"
 
 namespace e2d
 {

core/e2dnode.h

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

core/e2dshape.h

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

core/e2dtool.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "ebase.h"
+#include "e2dbase.h"
 #include <random>
 
 namespace e2d

core/e2dtransition.h

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

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)

project/vs2017/Easy2D.vcxproj

@@ -254,17 +254,17 @@
     <ClCompile Include="..\..\core\Transition\TransitionMove.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\core\eaction.h" />
+    <ClInclude Include="..\..\core\e2daction.h" />
     <ClInclude Include="..\..\core\easy2d.h" />
-    <ClInclude Include="..\..\core\ebase.h" />
-    <ClInclude Include="..\..\core\ecommon.h" />
-    <ClInclude Include="..\..\core\ecollider.h" />
-    <ClInclude Include="..\..\core\emacros.h" />
-    <ClInclude Include="..\..\core\emanager.h" />
-    <ClInclude Include="..\..\core\enode.h" />
-    <ClInclude Include="..\..\core\eshape.h" />
-    <ClInclude Include="..\..\core\etool.h" />
-    <ClInclude Include="..\..\core\etransition.h" />
+    <ClInclude Include="..\..\core\e2dbase.h" />
+    <ClInclude Include="..\..\core\e2dcommon.h" />
+    <ClInclude Include="..\..\core\e2dcollider.h" />
+    <ClInclude Include="..\..\core\e2dmacros.h" />
+    <ClInclude Include="..\..\core\e2dmanager.h" />
+    <ClInclude Include="..\..\core\e2dnode.h" />
+    <ClInclude Include="..\..\core\e2dshape.h" />
+    <ClInclude Include="..\..\core\e2dtool.h" />
+    <ClInclude Include="..\..\core\e2dtransition.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

project/vs2017/Easy2D.vcxproj.filters

@@ -221,16 +221,16 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\core\emacros.h" />
-    <ClInclude Include="..\..\core\ecommon.h" />
-    <ClInclude Include="..\..\core\ebase.h" />
     <ClInclude Include="..\..\core\easy2d.h" />
-    <ClInclude Include="..\..\core\ecollider.h" />
-    <ClInclude Include="..\..\core\eshape.h" />
-    <ClInclude Include="..\..\core\etransition.h" />
-    <ClInclude Include="..\..\core\emanager.h" />
-    <ClInclude Include="..\..\core\enode.h" />
-    <ClInclude Include="..\..\core\etool.h" />
-    <ClInclude Include="..\..\core\eaction.h" />
+    <ClInclude Include="..\..\core\e2daction.h" />
+    <ClInclude Include="..\..\core\e2dbase.h" />
+    <ClInclude Include="..\..\core\e2dcollider.h" />
+    <ClInclude Include="..\..\core\e2dcommon.h" />
+    <ClInclude Include="..\..\core\e2dmacros.h" />
+    <ClInclude Include="..\..\core\e2dmanager.h" />
+    <ClInclude Include="..\..\core\e2dnode.h" />
+    <ClInclude Include="..\..\core\e2dshape.h" />
+    <ClInclude Include="..\..\core\e2dtool.h" />
+    <ClInclude Include="..\..\core\e2dtransition.h" />
   </ItemGroup>
 </Project>