Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring : header files name

This commit is contained in:
Nomango 2018-09-05 13:17:07 +08:00
parent 860e0fe08e
commit 745bd994a8
55 changed files with 90 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Action/Animate.cpp
View File

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

2
core/Action/JumpBy.cpp
View File

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

2
core/Action/JumpTo.cpp
View File

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

2
core/Action/MoveBy.cpp
View File

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

2
core/Action/MoveTo.cpp
View File

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

2
core/Action/OpacityBy.cpp
View File

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

2
core/Action/OpacityTo.cpp
View File

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

2
core/Action/RotateBy.cpp
View File

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

2
core/Action/RotateTo.cpp
View File

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

2
core/Action/ScaleBy.cpp
View File

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

2
core/Action/ScaleTo.cpp
View File

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

2
core/Base/Audio.cpp
View File

@ -1,4 +1,4 @@
#include "..\e2dbase.h" #include "..\e2dmodule.h"
e2d::Audio * e2d::Audio::instance_ = nullptr; e2d::Audio * e2d::Audio::instance_ = nullptr;

6
core/Base/GC.cpp
View File

@ -1,5 +1,5 @@
#include "..\e2dbase.h" #include "..\e2dmodule.h"
#include "..\e2dtool.h" #include "..\e2dutil.h"
#include "..\e2dmanager.h" #include "..\e2dmanager.h"
using namespace e2d; using namespace e2d;
@ -38,8 +38,6 @@ e2d::GC::GC()
e2d::GC::~GC() e2d::GC::~GC()
{ {
// 删除所有对象 // 删除所有对象
Timer::GetInstance()->ClearAllTasks();
cleanup_ = true; cleanup_ = true;
for (const auto& ref : pool_) for (const auto& ref : pool_)
{ {

6
core/Base/Game.cpp
View File

@ -1,8 +1,8 @@
#include "..\e2dbase.h" #include "..\e2dmodule.h"
#include "..\e2dnode.h" #include "..\e2dcomponent.h"
#include "..\e2dtransition.h" #include "..\e2dtransition.h"
#include "..\e2dmanager.h" #include "..\e2dmanager.h"
#include "..\e2dtool.h" #include "..\e2dutil.h"
#include <thread> #include <thread>

4
core/Base/Input.cpp
View File

@ -1,5 +1,5 @@
#include "..\e2dbase.h" #include "..\e2dmodule.h"
#include "..\e2dtool.h" #include "..\e2dutil.h"
#include "..\e2dmanager.h" #include "..\e2dmanager.h"
#pragma comment(lib, "dinput8.lib") #pragma comment(lib, "dinput8.lib")

4
core/Base/Renderer.cpp
View File

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

4
core/Base/Window.cpp
View File

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

4
core/Common/Collider.cpp
View File

@ -1,6 +1,8 @@
#include "..\e2dcommon.h" #include "..\e2dcommon.h"
#include "..\e2dimpl.h"
#include "..\e2dmodule.h"
#include "..\e2dmanager.h" #include "..\e2dmanager.h"
#include "..\e2dnode.h" #include "..\e2dcomponent.h"
e2d::Collider::Collider(Node * parent) e2d::Collider::Collider(Node * parent)
: visible_(true) : visible_(true)

4
core/Common/Image.cpp
View File

@ -1,6 +1,6 @@
#include "..\e2dcommon.h" #include "..\e2dcommon.h"
#include "..\e2dbase.h" #include "..\e2dmodule.h"
#include "..\e2dtool.h" #include "..\e2dutil.h"
std::map<size_t, ID2D1Bitmap*> e2d::Image::bitmap_cache_; std::map<size_t, ID2D1Bitmap*> e2d::Image::bitmap_cache_;

2
core/Common/Resource.cpp
View File

@ -1,4 +1,4 @@
#include "..\e2dtool.h" #include "..\e2dutil.h"
e2d::Resource::Resource(size_t resource_name, const String & resource_type) e2d::Resource::Resource(size_t resource_name, const String & resource_type)

2
core/Custom/Exception.cpp
View File

@ -1,4 +1,4 @@
#include "..\e2dcustom.h" #include "..\e2dimpl.h"
e2d::Exception::Exception() E2D_NOEXCEPT e2d::Exception::Exception() E2D_NOEXCEPT

2
core/Custom/SystemException.cpp
View File

@ -1,4 +1,4 @@
#include "..\e2dcustom.h" #include "..\e2dimpl.h"
e2d::SystemException::SystemException() E2D_NOEXCEPT e2d::SystemException::SystemException() E2D_NOEXCEPT
: Exception("Unknown system exception") : Exception("Unknown system exception")

4
core/Custom/TextRenderer.cpp
View File

@ -1,5 +1,5 @@
#include "..\e2dcustom.h" #include "..\e2dimpl.h"
#include "..\e2dbase.h" #include "..\e2dmodule.h"
using namespace e2d; using namespace e2d;

2
core/Custom/VoiceCallback.cpp
View File

@ -1,4 +1,4 @@
#include "..\e2dcustom.h" #include "..\e2dimpl.h"
#include "..\e2dcommon.h" #include "..\e2dcommon.h"
e2d::VoiceCallback::VoiceCallback() e2d::VoiceCallback::VoiceCallback()

2
core/Event/MouseEvent.cpp
View File

@ -1,5 +1,5 @@
#include "..\e2devent.h" #include "..\e2devent.h"
#include "..\e2dbase.h" #include "..\e2dmodule.h"
e2d::MouseEvent::MouseEvent(HWND hWnd, UINT message, WPARAM w_param, LPARAM l_param, float dpi) e2d::MouseEvent::MouseEvent(HWND hWnd, UINT message, WPARAM w_param, LPARAM l_param, float dpi)
: message_(message) : message_(message)

5
core/Manager/CollisionManager.cpp
View File

@ -1,6 +1,7 @@
#include "..\e2dmanager.h" #include "..\e2dmanager.h"
#include "..\e2dnode.h" #include "..\e2dcomponent.h"
#include "..\e2dtool.h" #include "..\e2dutil.h"
#include "..\e2dmodule.h"
e2d::CollisionManager * e2d::CollisionManager::GetInstance() e2d::CollisionManager * e2d::CollisionManager::GetInstance()

3
core/Node/Button.cpp
View File

@ -1,5 +1,6 @@
#include "..\e2dnode.h" #include "..\e2dcomponent.h"
#include "..\e2dmanager.h" #include "..\e2dmanager.h"
#include "..\e2dmodule.h"
#define SAFE_SET(pointer, func, ...) if (pointer) { pointer->##func(__VA_ARGS__); } #define SAFE_SET(pointer, func, ...) if (pointer) { pointer->##func(__VA_ARGS__); }

3
core/Node/Canvas.cpp
View File

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

2
core/Node/Menu.cpp
View File

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

2
core/Node/Node.cpp
View File

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

4
core/Node/Scene.cpp
View File

@ -1,5 +1,5 @@
#include "..\e2dbase.h" #include "..\e2dmodule.h"
#include "..\e2dnode.h" #include "..\e2dcomponent.h"
#include "..\e2dmanager.h" #include "..\e2dmanager.h"
e2d::Scene::Scene() e2d::Scene::Scene()

4
core/Node/Sprite.cpp
View File

@ -1,5 +1,5 @@
#include "..\e2dnode.h" #include "..\e2dcomponent.h"
#include "..\e2dmodule.h"
e2d::Sprite::Sprite() e2d::Sprite::Sprite()
: image_(nullptr) : image_(nullptr)

3
core/Node/Text.cpp
View File

@ -1,4 +1,5 @@
#include "..\e2dnode.h" #include "..\e2dcomponent.h"
#include "..\e2dmodule.h"
//------------------------------------------------------- //-------------------------------------------------------
// Style // Style

2
core/Node/ToggleButton.cpp
View File

@ -1,4 +1,4 @@
#include "..\e2dnode.h" #include "..\e2dcomponent.h"
#define SAFE_SET(pointer, func, ...) if (pointer) { pointer->##func(__VA_ARGS__); } #define SAFE_SET(pointer, func, ...) if (pointer) { pointer->##func(__VA_ARGS__); }

2
core/Tool/Data.cpp
View File

@ -1,4 +1,4 @@
#include "..\e2dtool.h" #include "..\e2dutil.h"
e2d::Data::Data(const String & key, const String & field) e2d::Data::Data(const String & key, const String & field)

3
core/Tool/File.cpp
View File

@ -1,4 +1,5 @@
#include "..\e2dtool.h" #include "..\e2dutil.h"
#include "..\e2dmodule.h"
#include <shobjidl.h> #include <shobjidl.h>
std::list<e2d::String> e2d::File::search_paths_; std::list<e2d::String> e2d::File::search_paths_;

3
core/Tool/Music.cpp
View File

@ -1,4 +1,5 @@
#include "..\e2dtool.h" #include "..\e2dutil.h"
#include "..\e2dmodule.h"
#ifndef SAFE_DELETE #ifndef SAFE_DELETE

3
core/Tool/Path.cpp
View File

@ -1,4 +1,5 @@
#include "..\e2dtool.h" #include "..\e2dutil.h"
#include "..\e2dmodule.h"
#include <shlobj.h> #include <shlobj.h>
const e2d::String& e2d::Path::GetDataPath() const e2d::String& e2d::Path::GetDataPath()

2
core/Tool/Player.cpp
View File

@ -1,4 +1,4 @@
#include "..\e2dtool.h" #include "..\e2dutil.h"
e2d::Player * e2d::Player::instance_ = nullptr; e2d::Player * e2d::Player::instance_ = nullptr;

2
core/Tool/Random.cpp
View File

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

2
core/Tool/Task.cpp
View File

@ -1,4 +1,4 @@
#include "..\e2dtool.h" #include "..\e2dutil.h"
e2d::Task::Task(const Function & func, const String & name) e2d::Task::Task(const Function & func, const String & name)

14
core/Tool/Timer.cpp
View File

@ -1,4 +1,4 @@
#include "..\e2dtool.h" #include "..\e2dutil.h"
e2d::Timer * e2d::Timer::GetInstance() e2d::Timer * e2d::Timer::GetInstance()
@ -87,18 +87,6 @@ void e2d::Timer::RemoveAllTasks()
} }
} }
void e2d::Timer::ClearAllTasks()
{
if (tasks_.empty())
return;
for (const auto& task : tasks_)
{
task->Release();
}
tasks_.clear();
}
void e2d::Timer::Update() void e2d::Timer::Update()
{ {
if (tasks_.empty()) if (tasks_.empty())

3
core/Transition/BoxTransition.cpp
View File

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

2
core/Transition/EmergeTransition.cpp
View File

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

2
core/Transition/FadeTransition.cpp
View File

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

3
core/Transition/MoveTransition.cpp
View File

@ -1,5 +1,6 @@
#include "..\e2dtransition.h" #include "..\e2dtransition.h"
#include "..\e2dnode.h" #include "..\e2dcomponent.h"
#include "..\e2dmodule.h"
e2d::MoveTransition::MoveTransition(Scene* scene, float duration, Direction direction) e2d::MoveTransition::MoveTransition(Scene* scene, float duration, Direction direction)
: Transition(scene, duration) : Transition(scene, duration)

4
core/Transition/Transition.cpp
View File

@ -1,6 +1,6 @@
#include "..\e2dbase.h" #include "..\e2dmodule.h"
#include "..\e2dtransition.h" #include "..\e2dtransition.h"
#include "..\e2dnode.h" #include "..\e2dcomponent.h"
e2d::Transition::Transition(Scene* scene, float duration) e2d::Transition::Transition(Scene* scene, float duration)
: done_(false) : done_(false)

2
core/e2daction.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "e2dcommon.h" #include "e2dcommon.h"
#include "e2dbase.h" #include "e2dmodule.h"
namespace e2d namespace e2d
{ {

3
core/e2dnode.h → core/e2dcomponent.h
View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "e2dbase.h" #include "e2dcommon.h"
#include "e2devent.h" #include "e2devent.h"
namespace e2d namespace e2d
@ -7,6 +7,7 @@ namespace e2d
class Action; class Action;
class Scene;
// »æͼ½Ó¿Ú // »æͼ½Ó¿Ú

1
core/e2dcustom.h → core/e2dimpl.h
View File

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

11
core/e2dbase.h → core/e2dmodule.h
View File

@ -1,11 +1,9 @@
#pragma once #pragma once
#include "e2dmacros.h" #include "e2dimpl.h"
#include "e2dcommon.h" #include "e2dcomponent.h"
#include "e2dcustom.h" #include "e2dtransition.h"
// Base Classes
namespace e2d namespace e2d
{ {
@ -314,9 +312,6 @@ protected:
}; };
class Scene;
class Transition;
// ÓÎÏ· // ÓÎÏ·
class Game class Game
{ {

8
core/e2dtool.h → core/e2dutil.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "e2dbase.h" #include "e2dcommon.h"
#include "e2dimpl.h"
namespace e2d namespace e2d
{ {
@ -292,7 +293,7 @@ protected:
// 任务是否就绪 // 任务是否就绪
bool IsReady() const; bool IsReady() const;
private: protected:
bool running_; bool running_;
bool stopped_; bool stopped_;
int run_times_; int run_times_;
@ -340,9 +341,6 @@ public:
// 移除所有任务 // 移除所有任务
void RemoveAllTasks(); void RemoveAllTasks();
// 强制清空所有任务
void ClearAllTasks();
// 更新定时器 // 更新定时器
void Update(); void Update();

6
core/easy2d.h
View File

@ -19,12 +19,12 @@
#include "e2dmacros.h" #include "e2dmacros.h"
#include "e2dcommon.h" #include "e2dcommon.h"
#include "e2dbase.h"
#include "e2dmanager.h" #include "e2dmanager.h"
#include "e2dnode.h" #include "e2dcomponent.h"
#include "e2dtool.h" #include "e2dutil.h"
#include "e2daction.h" #include "e2daction.h"
#include "e2dtransition.h" #include "e2dtransition.h"
#include "e2dmodule.h"
#if defined(DEBUG) || defined(_DEBUG) #if defined(DEBUG) || defined(_DEBUG)

8
project/vs2017/Easy2D.vcxproj
View File

@ -268,15 +268,15 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\core\e2daction.h" /> <ClInclude Include="..\..\core\e2daction.h" />
<ClInclude Include="..\..\core\e2dcustom.h" /> <ClInclude Include="..\..\core\e2dimpl.h" />
<ClInclude Include="..\..\core\e2devent.h" /> <ClInclude Include="..\..\core\e2devent.h" />
<ClInclude Include="..\..\core\easy2d.h" /> <ClInclude Include="..\..\core\easy2d.h" />
<ClInclude Include="..\..\core\e2dbase.h" /> <ClInclude Include="..\..\core\e2dmodule.h" />
<ClInclude Include="..\..\core\e2dcommon.h" /> <ClInclude Include="..\..\core\e2dcommon.h" />
<ClInclude Include="..\..\core\e2dmacros.h" /> <ClInclude Include="..\..\core\e2dmacros.h" />
<ClInclude Include="..\..\core\e2dmanager.h" /> <ClInclude Include="..\..\core\e2dmanager.h" />
<ClInclude Include="..\..\core\e2dnode.h" /> <ClInclude Include="..\..\core\e2dcomponent.h" />
<ClInclude Include="..\..\core\e2dtool.h" /> <ClInclude Include="..\..\core\e2dutil.h" />
<ClInclude Include="..\..\core\e2dtransition.h" /> <ClInclude Include="..\..\core\e2dtransition.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

8
project/vs2017/Easy2D.vcxproj.filters
View File

@ -241,14 +241,14 @@
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\core\easy2d.h" /> <ClInclude Include="..\..\core\easy2d.h" />
<ClInclude Include="..\..\core\e2daction.h" /> <ClInclude Include="..\..\core\e2daction.h" />
<ClInclude Include="..\..\core\e2dbase.h" />
<ClInclude Include="..\..\core\e2dcommon.h" /> <ClInclude Include="..\..\core\e2dcommon.h" />
<ClInclude Include="..\..\core\e2dmacros.h" /> <ClInclude Include="..\..\core\e2dmacros.h" />
<ClInclude Include="..\..\core\e2dmanager.h" /> <ClInclude Include="..\..\core\e2dmanager.h" />
<ClInclude Include="..\..\core\e2dnode.h" />
<ClInclude Include="..\..\core\e2dtool.h" />
<ClInclude Include="..\..\core\e2dtransition.h" /> <ClInclude Include="..\..\core\e2dtransition.h" />
<ClInclude Include="..\..\core\e2dcustom.h" />
<ClInclude Include="..\..\core\e2devent.h" /> <ClInclude Include="..\..\core\e2devent.h" />
<ClInclude Include="..\..\core\e2dutil.h" />
<ClInclude Include="..\..\core\e2dmodule.h" />
<ClInclude Include="..\..\core\e2dcomponent.h" />
<ClInclude Include="..\..\core\e2dimpl.h" />
</ItemGroup> </ItemGroup>
</Project> </Project>