更改所有头文件名称

This commit is contained in:
Nomango 2018-04-21 21:24:46 +08:00
parent c8abe14a8d
commit 6d7550608c
75 changed files with 145 additions and 145 deletions

View File

@ -1,5 +1,5 @@
#include "..\eaction.h" #include "..\e2daction.h"
#include "..\emanager.h" #include "..\e2dmanager.h"
e2d::Action::Action() e2d::Action::Action()
: m_bRunning(false) : m_bRunning(false)

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
#include "..\eaction.h" #include "..\e2daction.h"
#include "..\emanager.h" #include "..\e2dmanager.h"
e2d::ActionLoop::ActionLoop(Action * action, int times /* = -1 */) e2d::ActionLoop::ActionLoop(Action * action, int times /* = -1 */)
: m_pAction(action) : m_pAction(action)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
#include "..\eaction.h" #include "..\e2daction.h"
e2d::ActionTwo::ActionTwo(Action * pActionFirst, Action * pActionSecond, bool bAtSameTime/* = false*/) e2d::ActionTwo::ActionTwo(Action * pActionFirst, Action * pActionSecond, bool bAtSameTime/* = false*/)
: m_pFirstAction(pActionFirst) : m_pFirstAction(pActionFirst)

View File

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

View File

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

View File

@ -1,6 +1,6 @@
#include "..\ebase.h" #include "..\e2dbase.h"
#include "..\etool.h" #include "..\e2dtool.h"
#include "..\emanager.h" #include "..\e2dmanager.h"
#pragma comment(lib, "dinput8.lib") #pragma comment(lib, "dinput8.lib")

View File

@ -1,6 +1,6 @@
#include "..\ebase.h" #include "..\e2dbase.h"
#include "..\emanager.h" #include "..\e2dmanager.h"
#include "..\enode.h" #include "..\e2dnode.h"
static bool s_bShowFps = false; static bool s_bShowFps = false;
static IDWriteTextFormat * s_pTextFormat = nullptr; static IDWriteTextFormat * s_pTextFormat = nullptr;

View File

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

View File

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

View File

@ -1,6 +1,6 @@
#include "..\ecollider.h" #include "..\e2dcollider.h"
#include "..\emanager.h" #include "..\e2dmanager.h"
#include "..\enode.h" #include "..\e2dnode.h"
e2d::Collider::Collider() e2d::Collider::Collider()
: m_bIsVisiable(true) : m_bIsVisiable(true)

View File

@ -1,5 +1,5 @@
#include "..\ecollider.h" #include "..\e2dcollider.h"
#include "..\enode.h" #include "..\e2dnode.h"
e2d::ColliderCircle::ColliderCircle() e2d::ColliderCircle::ColliderCircle()
: m_pD2dCircle(nullptr) : m_pD2dCircle(nullptr)

View File

@ -1,5 +1,5 @@
#include "..\ecollider.h" #include "..\e2dcollider.h"
#include "..\enode.h" #include "..\e2dnode.h"
e2d::ColliderEllipse::ColliderEllipse() e2d::ColliderEllipse::ColliderEllipse()
: m_pD2dEllipse(nullptr) : m_pD2dEllipse(nullptr)

View File

@ -1,5 +1,5 @@
#include "..\ecollider.h" #include "..\e2dcollider.h"
#include "..\enode.h" #include "..\e2dnode.h"
e2d::ColliderRect::ColliderRect() e2d::ColliderRect::ColliderRect()
: m_pD2dRectangle(nullptr) : m_pD2dRectangle(nullptr)

View File

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

View File

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

View File

@ -1,5 +1,5 @@
#include "..\ebase.h" #include "..\e2dbase.h"
#include "..\emanager.h" #include "..\e2dmanager.h"
e2d::Object::Object() e2d::Object::Object()
: m_nRefCount(0) : m_nRefCount(0)

View File

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

View File

@ -1,6 +1,6 @@
#include "..\ebase.h" #include "..\e2dbase.h"
#include "..\enode.h" #include "..\e2dnode.h"
#include "..\emanager.h" #include "..\e2dmanager.h"
e2d::Scene::Scene() e2d::Scene::Scene()
: m_bWillSave(true) : m_bWillSave(true)

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
#include "..\emanager.h" #include "..\e2dmanager.h"
#include "..\enode.h" #include "..\e2dnode.h"
#include "..\ecollider.h" #include "..\e2dcollider.h"
#include "..\etool.h" #include "..\e2dtool.h"
// ÅöײÌ弯ºÏ // ÅöײÌ弯ºÏ
static std::vector<e2d::Collider*> s_vColliders; static std::vector<e2d::Collider*> s_vColliders;

View File

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

View File

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

View File

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

View File

@ -1,6 +1,6 @@
#include "..\emanager.h" #include "..\e2dmanager.h"
#include "..\ebase.h" #include "..\e2dbase.h"
#include "..\etransition.h" #include "..\e2dtransition.h"
static e2d::Scene * s_pCurrScene = nullptr; static e2d::Scene * s_pCurrScene = nullptr;
static e2d::Scene * s_pNextScene = nullptr; static e2d::Scene * s_pNextScene = nullptr;

View File

@ -1,6 +1,6 @@
#include "..\emanager.h" #include "..\e2dmanager.h"
#include "..\etool.h" #include "..\e2dtool.h"
#include "..\enode.h" #include "..\e2dnode.h"
static std::vector<e2d::Timer*> s_vTimers; static std::vector<e2d::Timer*> s_vTimers;

View File

@ -1,5 +1,5 @@
#include "..\enode.h" #include "..\e2dnode.h"
#include "..\emanager.h" #include "..\e2dmanager.h"
#define SAFE_SETTER(pointer, func, ...) if (pointer) { pointer->##func(__VA_ARGS__); } #define SAFE_SETTER(pointer, func, ...) if (pointer) { pointer->##func(__VA_ARGS__); }

View File

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

View File

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

View File

@ -1,8 +1,8 @@
#include "..\enode.h" #include "..\e2dnode.h"
#include "..\emanager.h" #include "..\e2dmanager.h"
#include "..\etool.h" #include "..\e2dtool.h"
#include "..\eaction.h" #include "..\e2daction.h"
#include "..\ecollider.h" #include "..\e2dcollider.h"
#include <algorithm> #include <algorithm>
// 默认中心点位置 // 默认中心点位置

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,6 +1,6 @@
#include "..\etool.h" #include "..\e2dtool.h"
#include "..\enode.h" #include "..\e2dnode.h"
#include "..\emanager.h" #include "..\e2dmanager.h"
e2d::Timer::Timer(String name, Function func, double interval /* = 0 */, int updateTimes /* = -1 */, bool atOnce /* = false */, bool autoRelease /* = false */) e2d::Timer::Timer(String name, Function func, double interval /* = 0 */, int updateTimes /* = -1 */, bool atOnce /* = false */, bool autoRelease /* = false */)
: m_bRunning(false) : m_bRunning(false)

View File

@ -1,6 +1,6 @@
#include "..\ebase.h" #include "..\e2dbase.h"
#include "..\etransition.h" #include "..\e2dtransition.h"
#include "..\enode.h" #include "..\e2dnode.h"
e2d::Transition::Transition(double duration) e2d::Transition::Transition(double duration)
: m_bEnd(false) : m_bEnd(false)

View File

@ -1,5 +1,5 @@
#include "..\etransition.h" #include "..\e2dtransition.h"
#include "..\enode.h" #include "..\e2dnode.h"
e2d::TransitionEmerge::TransitionEmerge(double duration) e2d::TransitionEmerge::TransitionEmerge(double duration)
: Transition(duration) : Transition(duration)

View File

@ -1,5 +1,5 @@
#include "..\etransition.h" #include "..\e2dtransition.h"
#include "..\enode.h" #include "..\e2dnode.h"
e2d::TransitionFade::TransitionFade(double duration) e2d::TransitionFade::TransitionFade(double duration)
: Transition(0) : Transition(0)

View File

@ -1,5 +1,5 @@
#include "..\etransition.h" #include "..\e2dtransition.h"
#include "..\enode.h" #include "..\e2dnode.h"
e2d::TransitionMove::TransitionMove(double duration, int direct) e2d::TransitionMove::TransitionMove(double duration, int direct)
: Transition(duration) : Transition(duration)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -17,16 +17,16 @@
#endif #endif
#include "emacros.h" #include "e2dmacros.h"
#include "ecommon.h" #include "e2dcommon.h"
#include "ebase.h" #include "e2dbase.h"
#include "emanager.h" #include "e2dmanager.h"
#include "enode.h" #include "e2dnode.h"
#include "eshape.h" #include "e2dshape.h"
#include "etool.h" #include "e2dtool.h"
#include "eaction.h" #include "e2daction.h"
#include "etransition.h" #include "e2dtransition.h"
#include "ecollider.h" #include "e2dcollider.h"
#if defined(DEBUG) || defined(_DEBUG) #if defined(DEBUG) || defined(_DEBUG)

View File

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

View File

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