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

refactoring project

This commit is contained in:
Nomango 2020-05-24 11:26:21 +08:00
parent 093e422135
commit 5d7c3f4f9a
81 changed files with 236 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
projects/kiwano/kiwano.vcxproj
View File

@ -12,16 +12,14 @@
<ClInclude Include="..\..\src\kiwano\2d\Button.h" />
<ClInclude Include="..\..\src\kiwano\2d\Component.h" />
<ClInclude Include="..\..\src\kiwano\2d\GifSprite.h" />
<ClInclude Include="..\..\src\kiwano\base\Director.h" />
<ClInclude Include="..\..\src\kiwano\base\Module.h" />
<ClInclude Include="..\..\src\kiwano\base\ObjectBase.h" />
<ClInclude Include="..\..\src\kiwano\base\RefCounter.h" />
<ClInclude Include="..\..\src\kiwano\core\Allocator.h" />
<ClInclude Include="..\..\src\kiwano\core\Any.h" />
<ClInclude Include="..\..\src\kiwano\core\Cloneable.h" />
<ClInclude Include="..\..\src\kiwano\core\Common.h" />
<ClInclude Include="..\..\src\kiwano\core\Director.h" />
<ClInclude Include="..\..\src\kiwano\core\event\Event.h" />
<ClInclude Include="..\..\src\kiwano\core\event\EventType.h" />
<ClInclude Include="..\..\src\kiwano\core\event\KeyEvent.h" />
<ClInclude Include="..\..\src\kiwano\core\event\MouseEvent.h" />
<ClInclude Include="..\..\src\kiwano\core\event\WindowEvent.h" />
<ClInclude Include="..\..\src\kiwano\core\Exception.h" />
<ClInclude Include="..\..\src\kiwano\core\Function.h" />
<ClInclude Include="..\..\src\kiwano\core\IntrusiveList.h" />
@ -31,6 +29,14 @@
<ClInclude Include="..\..\src\kiwano\core\Singleton.h" />
<ClInclude Include="..\..\src\kiwano\core\String.h" />
<ClInclude Include="..\..\src\kiwano\core\Time.h" />
<ClInclude Include="..\..\src\kiwano\event\Event.h" />
<ClInclude Include="..\..\src\kiwano\event\EventDispatcher.h" />
<ClInclude Include="..\..\src\kiwano\event\EventListener.h" />
<ClInclude Include="..\..\src\kiwano\event\Events.h" />
<ClInclude Include="..\..\src\kiwano\event\EventType.h" />
<ClInclude Include="..\..\src\kiwano\event\KeyEvent.h" />
<ClInclude Include="..\..\src\kiwano\event\MouseEvent.h" />
<ClInclude Include="..\..\src\kiwano\event\WindowEvent.h" />
<ClInclude Include="..\..\src\kiwano\kiwano.h" />
<ClInclude Include="..\..\src\kiwano\config.h" />
<ClInclude Include="..\..\src\kiwano\macros.h" />
@ -43,12 +49,6 @@
<ClInclude Include="..\..\src\kiwano\2d\Sprite.h" />
<ClInclude Include="..\..\src\kiwano\2d\TextActor.h" />
<ClInclude Include="..\..\src\kiwano\2d\Transition.h" />
<ClInclude Include="..\..\src\kiwano\core\Module.h" />
<ClInclude Include="..\..\src\kiwano\core\EventDispatcher.h" />
<ClInclude Include="..\..\src\kiwano\core\EventListener.h" />
<ClInclude Include="..\..\src\kiwano\core\Logger.h" />
<ClInclude Include="..\..\src\kiwano\core\ObjectBase.h" />
<ClInclude Include="..\..\src\kiwano\core\RefCounter.h" />
<ClInclude Include="..\..\src\kiwano\core\Resource.h" />
<ClInclude Include="..\..\src\kiwano\core\SmartPtr.hpp" />
<ClInclude Include="..\..\src\kiwano\math\Constants.h" />
@ -98,6 +98,7 @@
<ClInclude Include="..\..\src\kiwano\utils\EventTicker.h" />
<ClInclude Include="..\..\src\kiwano\utils\Json.h" />
<ClInclude Include="..\..\src\kiwano\utils\LocalStorage.h" />
<ClInclude Include="..\..\src\kiwano\utils\Logger.h" />
<ClInclude Include="..\..\src\kiwano\utils\ResourceCache.h" />
<ClInclude Include="..\..\src\kiwano\utils\Task.h" />
<ClInclude Include="..\..\src\kiwano\utils\TaskScheduler.h" />
@ -126,23 +127,22 @@
<ClCompile Include="..\..\src\kiwano\2d\Sprite.cpp" />
<ClCompile Include="..\..\src\kiwano\2d\TextActor.cpp" />
<ClCompile Include="..\..\src\kiwano\2d\Transition.cpp" />
<ClCompile Include="..\..\src\kiwano\base\Director.cpp" />
<ClCompile Include="..\..\src\kiwano\base\Module.cpp" />
<ClCompile Include="..\..\src\kiwano\base\ObjectBase.cpp" />
<ClCompile Include="..\..\src\kiwano\base\RefCounter.cpp" />
<ClCompile Include="..\..\src\kiwano\core\Allocator.cpp" />
<ClCompile Include="..\..\src\kiwano\core\Module.cpp" />
<ClCompile Include="..\..\src\kiwano\core\Director.cpp" />
<ClCompile Include="..\..\src\kiwano\core\EventDispatcher.cpp" />
<ClCompile Include="..\..\src\kiwano\core\EventListener.cpp" />
<ClCompile Include="..\..\src\kiwano\core\event\Event.cpp" />
<ClCompile Include="..\..\src\kiwano\core\event\KeyEvent.cpp" />
<ClCompile Include="..\..\src\kiwano\core\event\MouseEvent.cpp" />
<ClCompile Include="..\..\src\kiwano\core\event\WindowEvent.cpp" />
<ClCompile Include="..\..\src\kiwano\core\Exception.cpp" />
<ClCompile Include="..\..\src\kiwano\core\Library.cpp" />
<ClCompile Include="..\..\src\kiwano\core\Logger.cpp" />
<ClCompile Include="..\..\src\kiwano\core\ObjectBase.cpp" />
<ClCompile Include="..\..\src\kiwano\core\RefCounter.cpp" />
<ClCompile Include="..\..\src\kiwano\core\Resource.cpp" />
<ClCompile Include="..\..\src\kiwano\core\String.cpp" />
<ClCompile Include="..\..\src\kiwano\core\Time.cpp" />
<ClCompile Include="..\..\src\kiwano\event\Event.cpp" />
<ClCompile Include="..\..\src\kiwano\event\EventDispatcher.cpp" />
<ClCompile Include="..\..\src\kiwano\event\EventListener.cpp" />
<ClCompile Include="..\..\src\kiwano\event\KeyEvent.cpp" />
<ClCompile Include="..\..\src\kiwano\event\MouseEvent.cpp" />
<ClCompile Include="..\..\src\kiwano\event\WindowEvent.cpp" />
<ClCompile Include="..\..\src\kiwano\platform\Application.cpp" />
<ClCompile Include="..\..\src\kiwano\platform\FileSystem.cpp" />
<ClCompile Include="..\..\src\kiwano\platform\Input.cpp" />
@ -174,6 +174,7 @@
<ClCompile Include="..\..\src\kiwano\render\TextureCache.cpp" />
<ClCompile Include="..\..\src\kiwano\utils\EventTicker.cpp" />
<ClCompile Include="..\..\src\kiwano\utils\LocalStorage.cpp" />
<ClCompile Include="..\..\src\kiwano\utils\Logger.cpp" />
<ClCompile Include="..\..\src\kiwano\utils\ResourceCache.cpp" />
<ClCompile Include="..\..\src\kiwano\utils\Task.cpp" />
<ClCompile Include="..\..\src\kiwano\utils\TaskScheduler.cpp" />

150
projects/kiwano/kiwano.vcxproj.filters
View File

@ -22,15 +22,18 @@
<Filter Include="platform\win32">
<UniqueIdentifier>{e84dcf9a-e650-473e-8c9c-193804ab9e76}</UniqueIdentifier>
</Filter>
<Filter Include="core\event">
<UniqueIdentifier>{c629aedd-ffb9-4bc1-82c3-f50e77c82e77}</UniqueIdentifier>
</Filter>
<Filter Include="render">
<UniqueIdentifier>{adb44ca9-674a-4b77-993f-d65193d8ab06}</UniqueIdentifier>
</Filter>
<Filter Include="render\DirectX">
<UniqueIdentifier>{fd281702-0006-46d2-8fd1-28c502464164}</UniqueIdentifier>
</Filter>
<Filter Include="base">
<UniqueIdentifier>{f514ae4f-2f6a-4d47-aa38-245628d6e01c}</UniqueIdentifier>
</Filter>
<Filter Include="event">
<UniqueIdentifier>{b0d28d20-bfaf-4816-8415-28c20ecf9fac}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\kiwano\2d\Canvas.h">
@ -42,12 +45,6 @@
<ClInclude Include="..\..\src\kiwano\2d\Transition.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\EventDispatcher.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\EventListener.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\Resource.h">
<Filter>core</Filter>
</ClInclude>
@ -108,12 +105,6 @@
<ClInclude Include="..\..\src\kiwano\2d\action\ActionWalk.h">
<Filter>2d\action</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\Logger.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\ObjectBase.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\utils\LocalStorage.h">
<Filter>utils</Filter>
</ClInclude>
@ -135,36 +126,15 @@
<ClInclude Include="..\..\src\kiwano\2d\TextActor.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\RefCounter.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\platform\win32\ComPtr.hpp">
<Filter>platform\win32</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\platform\win32\libraries.h">
<Filter>platform\win32</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\event\Event.h">
<Filter>core\event</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\event\EventType.h">
<Filter>core\event</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\event\KeyEvent.h">
<Filter>core\event</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\event\MouseEvent.h">
<Filter>core\event</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\event\WindowEvent.h">
<Filter>core\event</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\2d\Button.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\Director.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\Singleton.h">
<Filter>core</Filter>
</ClInclude>
@ -267,9 +237,6 @@
<ClInclude Include="..\..\src\kiwano\render\Layer.h">
<Filter>render</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\Module.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\platform\Runner.h">
<Filter>platform</Filter>
</ClInclude>
@ -339,6 +306,45 @@
<ClInclude Include="..\..\src\kiwano\render\DirectX\D3DDeviceResources.h">
<Filter>render\DirectX</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\utils\Logger.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\base\Director.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\base\Module.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\base\ObjectBase.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\base\RefCounter.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\event\Event.h">
<Filter>event</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\event\EventDispatcher.h">
<Filter>event</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\event\EventListener.h">
<Filter>event</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\event\Events.h">
<Filter>event</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\event\EventType.h">
<Filter>event</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\event\KeyEvent.h">
<Filter>event</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\event\MouseEvent.h">
<Filter>event</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\event\WindowEvent.h">
<Filter>event</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\kiwano\2d\Canvas.cpp">
@ -350,12 +356,6 @@
<ClCompile Include="..\..\src\kiwano\2d\Transition.cpp">
<Filter>2d</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\core\EventDispatcher.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\core\EventListener.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\core\Resource.cpp">
<Filter>core</Filter>
</ClCompile>
@ -398,12 +398,6 @@
<ClCompile Include="..\..\src\kiwano\2d\action\ActionWalk.cpp">
<Filter>2d\action</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\core\Logger.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\core\ObjectBase.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\utils\LocalStorage.cpp">
<Filter>utils</Filter>
</ClCompile>
@ -425,30 +419,12 @@
<ClCompile Include="..\..\src\kiwano\2d\TextActor.cpp">
<Filter>2d</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\core\RefCounter.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\platform\win32\libraries.cpp">
<Filter>platform\win32</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\core\event\Event.cpp">
<Filter>core\event</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\core\event\KeyEvent.cpp">
<Filter>core\event</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\core\event\MouseEvent.cpp">
<Filter>core\event</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\core\event\WindowEvent.cpp">
<Filter>core\event</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\2d\Button.cpp">
<Filter>2d</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\core\Director.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\platform\win32\WindowImpl.cpp">
<Filter>platform\win32</Filter>
</ClCompile>
@ -518,9 +494,6 @@
<ClCompile Include="..\..\src\kiwano\render\Layer.cpp">
<Filter>render</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\core\Module.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\platform\Runner.cpp">
<Filter>platform</Filter>
</ClCompile>
@ -560,6 +533,39 @@
<ClCompile Include="..\..\src\kiwano\2d\action\ActionScheduler.cpp">
<Filter>2d\action</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\utils\Logger.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\base\Director.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\base\Module.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\base\ObjectBase.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\base\RefCounter.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\event\Event.cpp">
<Filter>event</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\event\EventDispatcher.cpp">
<Filter>event</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\event\EventListener.cpp">
<Filter>event</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\event\KeyEvent.cpp">
<Filter>event</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\event\MouseEvent.cpp">
<Filter>event</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\event\WindowEvent.cpp">
<Filter>event</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="suppress_warning.ruleset" />

2
src/kiwano-audio/AudioModule.cpp
View File

@ -20,8 +20,8 @@
#include <kiwano-audio/AudioModule.h>
#include <kiwano-audio/libraries.h>
#include <kiwano/core/Logger.h>
#include <kiwano/core/Exception.h>
#include <kiwano/utils/Logger.h>
namespace kiwano
{

2
src/kiwano-audio/AudioModule.h
View File

@ -22,7 +22,7 @@
#include <kiwano-audio/Sound.h>
#include <kiwano-audio/Transcoder.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/Module.h>
#include <kiwano/base/Module.h>
#include <xaudio2.h>
namespace kiwano

2
src/kiwano-audio/Sound.cpp
View File

@ -20,7 +20,7 @@
#include <kiwano-audio/AudioModule.h>
#include <kiwano-audio/Sound.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/platform/FileSystem.h>
namespace kiwano

2
src/kiwano-audio/Sound.h
View File

@ -20,8 +20,8 @@
#pragma once
#include <kiwano-audio/Transcoder.h>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/core/Resource.h>
#include <kiwano/base/ObjectBase.h>
#include <kiwano/platform/win32/ComPtr.hpp>
#include <xaudio2.h>

2
src/kiwano-audio/SoundPlayer.h
View File

@ -20,7 +20,7 @@
#pragma once
#include <kiwano-audio/Sound.h>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/base/ObjectBase.h>
namespace kiwano
{

3
src/kiwano-audio/Transcoder.cpp
View File

@ -25,9 +25,8 @@
#include <kiwano-audio/Transcoder.h>
#include <kiwano-audio/libraries.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/Logger.h>
#include <kiwano/core/Resource.h>
#include <kiwano/macros.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/platform/win32/ComPtr.hpp>
#include <kiwano/platform/win32/libraries.h>

3
src/kiwano-imgui/ImGuiModule.cpp
View File

@ -2,8 +2,7 @@
#include <kiwano/core/Common.h>
#include <kiwano/core/event/KeyEvent.h>
#include <kiwano/core/event/MouseEvent.h>
#include <kiwano/event/Events.h>
#include <kiwano/platform/Input.h>
#include <kiwano/platform/Application.h>
#include <kiwano/render/Renderer.h>

2
src/kiwano-imgui/ImGuiModule.h
View File

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/core/Common.h>
#include <kiwano/core/Module.h>
#include <kiwano/base/Module.h>
#include <kiwano/platform/Window.h>
namespace kiwano

2
src/kiwano-network/HttpModule.cpp
View File

@ -20,7 +20,7 @@
#include <chrono>
#include <thread>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/platform/Application.h>
#include <kiwano-network/HttpRequest.h>
#include <kiwano-network/HttpResponse.hpp>

2
src/kiwano-network/HttpModule.h
View File

@ -23,7 +23,7 @@
#include <mutex>
#include <condition_variable>
#include <kiwano/core/Common.h>
#include <kiwano/core/Module.h>
#include <kiwano/base/Module.h>
namespace kiwano
{

2
src/kiwano-network/HttpRequest.h
View File

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/core/Common.h>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/base/ObjectBase.h>
#include <kiwano/utils/Json.h>
namespace kiwano

2
src/kiwano/2d/Actor.cpp
View File

@ -20,7 +20,7 @@
#include <kiwano/2d/Actor.h>
#include <kiwano/2d/Stage.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/render/Renderer.h>
namespace kiwano

4
src/kiwano/2d/Actor.h
View File

@ -20,9 +20,9 @@
#pragma once
#include <kiwano/math/Math.h>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/base/ObjectBase.h>
#include <kiwano/core/Time.h>
#include <kiwano/core/EventDispatcher.h>
#include <kiwano/event/EventDispatcher.h>
#include <kiwano/utils/TaskScheduler.h>
#include <kiwano/2d/action/ActionScheduler.h>
#include <kiwano/2d/Component.h>

2
src/kiwano/2d/Canvas.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#include <kiwano/2d/Canvas.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
namespace kiwano
{

2
src/kiwano/2d/Component.h
View File

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/core/Time.h>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/base/ObjectBase.h>
#include <kiwano/core/IntrusiveList.h>
#include <kiwano/render/RenderContext.h>

2
src/kiwano/2d/DebugActor.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#include <kiwano/2d/DebugActor.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/render/Renderer.h>
#include <psapi.h>

2
src/kiwano/2d/ShapeActor.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#include <kiwano/2d/ShapeActor.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/render/Renderer.h>
namespace kiwano

2
src/kiwano/2d/Stage.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#include <kiwano/2d/Stage.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/render/Renderer.h>
namespace kiwano

2
src/kiwano/2d/TextActor.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#include <kiwano/2d/TextActor.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/render/Renderer.h>
namespace kiwano

2
src/kiwano/2d/Transition.cpp
View File

@ -21,7 +21,7 @@
#include <kiwano/2d/Actor.h>
#include <kiwano/2d/Stage.h>
#include <kiwano/2d/Transition.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/platform/Window.h>
#include <kiwano/render/Renderer.h>

2
src/kiwano/2d/action/Action.h
View File

@ -21,7 +21,7 @@
#pragma once
#include <kiwano/core/Common.h>
#include <kiwano/core/Cloneable.h>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/base/ObjectBase.h>
#include <kiwano/core/SmartPtr.hpp>
#include <kiwano/core/Time.h>
#include <kiwano/core/IntrusiveList.h>

2
src/kiwano/2d/action/ActionGroup.cpp
View File

@ -20,7 +20,7 @@
#include <kiwano/2d/Actor.h>
#include <kiwano/2d/action/ActionGroup.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
namespace kiwano
{

2
src/kiwano/2d/action/ActionScheduler.cpp
View File

@ -20,7 +20,7 @@
#include <kiwano/2d/Actor.h>
#include <kiwano/2d/action/ActionScheduler.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
namespace kiwano
{

2
src/kiwano/2d/action/ActionTween.h
View File

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/2d/action/Action.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
namespace kiwano
{

2
src/kiwano/core/Director.cpp → src/kiwano/base/Director.cpp
View File

@ -22,7 +22,7 @@
#include <kiwano/2d/DebugActor.h>
#include <kiwano/2d/Stage.h>
#include <kiwano/2d/Transition.h>
#include <kiwano/core/Director.h>
#include <kiwano/base/Director.h>
#include <kiwano/render/RenderContext.h>
namespace kiwano

2
src/kiwano/core/Director.h → src/kiwano/base/Director.h
View File

@ -22,7 +22,7 @@
#include <kiwano/2d/Actor.h>
#include <kiwano/2d/Stage.h>
#include <kiwano/2d/Transition.h>
#include <kiwano/core/Module.h>
#include <kiwano/base/Module.h>
namespace kiwano
{

2
src/kiwano/core/Module.cpp → src/kiwano/base/Module.cpp
View File

@ -18,7 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <kiwano/core/Module.h>
#include <kiwano/base/Module.h>
namespace kiwano
{

0
src/kiwano/core/Module.h → src/kiwano/base/Module.h
View File

4
src/kiwano/core/ObjectBase.cpp → src/kiwano/base/ObjectBase.cpp
View File

@ -18,8 +18,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <kiwano/core/ObjectBase.h>
#include <kiwano/core/Logger.h>
#include <kiwano/base/ObjectBase.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/utils/Json.h>
#include <typeinfo>

4
src/kiwano/core/ObjectBase.h → src/kiwano/base/ObjectBase.h
View File

@ -19,11 +19,11 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/macros.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/Serializable.h>
#include <kiwano/core/RefCounter.h>
#include <kiwano/core/SmartPtr.hpp>
#include <kiwano/macros.h>
#include <kiwano/base/RefCounter.h>
namespace kiwano
{

2
src/kiwano/core/RefCounter.cpp → src/kiwano/base/RefCounter.cpp
View File

@ -18,7 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <kiwano/core/RefCounter.h>
#include <kiwano/base/RefCounter.h>
namespace kiwano
{

0
src/kiwano/core/RefCounter.h → src/kiwano/base/RefCounter.h
View File

2
src/kiwano/core/Exception.cpp
View File

@ -20,7 +20,7 @@
#include <kiwano/core/Exception.h>
#include <kiwano/core/Library.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#if defined(KGE_PLATFORM_WINDOWS)
#include <memory>

2
src/kiwano/core/Exception.h
View File

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/core/Common.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <stdexcept>
#include <system_error>

2
src/kiwano/core/Resource.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#include <iostream>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/core/Resource.h>
namespace kiwano

2
src/kiwano/core/SmartPtr.hpp
View File

@ -22,7 +22,7 @@
#include <utility>
#include <type_traits>
#include <kiwano/core/Common.h>
#include <kiwano/core/RefCounter.h>
#include <kiwano/base/RefCounter.h>
namespace kiwano
{

2
src/kiwano/core/Time.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#include <kiwano/core/Exception.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/core/Time.h>
#include <regex>
#include <unordered_map>

2
src/kiwano/core/event/Event.cpp → src/kiwano/event/Event.cpp
View File

@ -1,4 +1,4 @@
#include <kiwano/core/event/Event.h>
#include <kiwano/event/Event.h>
namespace kiwano
{

2
src/kiwano/core/event/Event.h → src/kiwano/event/Event.h
View File

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/core/SmartPtr.hpp>
#include <kiwano/core/event/EventType.h>
#include <kiwano/event/EventType.h>
#include <kiwano/math/Math.h>
namespace kiwano

4
src/kiwano/core/EventDispatcher.cpp → src/kiwano/event/EventDispatcher.cpp
View File

@ -18,8 +18,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <kiwano/core/EventDispatcher.h>
#include <kiwano/core/Logger.h>
#include <kiwano/event/EventDispatcher.h>
#include <kiwano/utils/Logger.h>
namespace kiwano
{

2
src/kiwano/core/EventDispatcher.h → src/kiwano/event/EventDispatcher.h
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/EventListener.h>
#include <kiwano/event/EventListener.h>
namespace kiwano
{

2
src/kiwano/core/EventListener.cpp → src/kiwano/event/EventListener.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/EventListener.h>
#include <kiwano/event/EventListener.h>
namespace kiwano
{

7
src/kiwano/core/EventListener.h → src/kiwano/event/EventListener.h
View File

@ -20,13 +20,10 @@
#pragma once
#include <kiwano/core/Common.h>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/base/ObjectBase.h>
#include <kiwano/core/SmartPtr.hpp>
#include <kiwano/core/IntrusiveList.h>
#include <kiwano/core/event/Event.h>
#include <kiwano/core/event/KeyEvent.h>
#include <kiwano/core/event/MouseEvent.h>
#include <kiwano/core/event/WindowEvent.h>
#include <kiwano/event/Events.h>
namespace kiwano
{

0
src/kiwano/core/event/EventType.h → src/kiwano/event/EventType.h
View File

26
src/kiwano/event/Events.h Normal file
View File

@ -0,0 +1,26 @@
// Copyright (c) 2016-2018 Kiwano - Nomango
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#pragma once
#include <kiwano/event/Event.h>
#include <kiwano/event/KeyEvent.h>
#include <kiwano/event/MouseEvent.h>
#include <kiwano/event/WindowEvent.h>

2
src/kiwano/core/event/KeyEvent.cpp → src/kiwano/event/KeyEvent.cpp
View File

@ -1,4 +1,4 @@
#include <kiwano/core/event/KeyEvent.h>
#include <kiwano/event/KeyEvent.h>
namespace kiwano
{

2
src/kiwano/core/event/KeyEvent.h → src/kiwano/event/KeyEvent.h
View File

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/core/Keys.h>
#include <kiwano/core/event/Event.h>
#include <kiwano/event/Event.h>
namespace kiwano
{

2
src/kiwano/core/event/MouseEvent.cpp → src/kiwano/event/MouseEvent.cpp
View File

@ -1,4 +1,4 @@
#include <kiwano/core/event/MouseEvent.h>
#include <kiwano/event/MouseEvent.h>
namespace kiwano
{

2
src/kiwano/core/event/MouseEvent.h → src/kiwano/event/MouseEvent.h
View File

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/core/Keys.h>
#include <kiwano/core/event/Event.h>
#include <kiwano/event/Event.h>
#include <kiwano/math/Math.h>
namespace kiwano

2
src/kiwano/core/event/WindowEvent.cpp → src/kiwano/event/WindowEvent.cpp
View File

@ -1,4 +1,4 @@
#include <kiwano/core/event/WindowEvent.h>
#include <kiwano/event/WindowEvent.h>
namespace kiwano
{

2
src/kiwano/core/event/WindowEvent.h → src/kiwano/event/WindowEvent.h
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/event/Event.h>
#include <kiwano/event/Event.h>
namespace kiwano
{

31
src/kiwano/kiwano.h
View File

@ -44,18 +44,30 @@
//
#include <kiwano/core/Common.h>
#include <kiwano/core/Director.h>
#include <kiwano/core/EventDispatcher.h>
#include <kiwano/core/EventListener.h>
#include <kiwano/core/Logger.h>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/core/Resource.h>
#include <kiwano/core/SmartPtr.hpp>
#include <kiwano/core/Time.h>
#include <kiwano/core/event/Event.h>
#include <kiwano/core/event/KeyEvent.h>
#include <kiwano/core/event/MouseEvent.h>
#include <kiwano/core/event/WindowEvent.h>
//
// base
//
#include <kiwano/base/RefCounter.h>
#include <kiwano/base/ObjectBase.h>
#include <kiwano/base/Director.h>
#include <kiwano/base/Module.h>
//
// event
//
#include <kiwano/event/Event.h>
#include <kiwano/event/KeyEvent.h>
#include <kiwano/event/MouseEvent.h>
#include <kiwano/event/WindowEvent.h>
#include <kiwano/event/EventListener.h>
#include <kiwano/event/EventDispatcher.h>
//
// renderer
@ -112,6 +124,7 @@
// utils
//
#include <kiwano/utils/Logger.h>
#include <kiwano/utils/LocalStorage.h>
#include <kiwano/utils/ResourceCache.h>
#include <kiwano/utils/UserData.h>

4
src/kiwano/platform/Application.cpp
View File

@ -20,8 +20,8 @@
#include <kiwano/platform/Application.h>
#include <kiwano/platform/Input.h>
#include <kiwano/core/Director.h>
#include <kiwano/core/Logger.h>
#include <kiwano/base/Director.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/render/Renderer.h>
#include <kiwano/render/TextureCache.h>
#include <kiwano/utils/ResourceCache.h>

4
src/kiwano/platform/Application.h
View File

@ -21,10 +21,10 @@
#pragma once
#include <mutex>
#include <kiwano/core/Common.h>
#include <kiwano/core/Module.h>
#include <kiwano/base/Module.h>
#include <kiwano/core/Time.h>
#include <kiwano/core/Singleton.h>
#include <kiwano/core/event/Event.h>
#include <kiwano/event/Event.h>
#include <kiwano/platform/Runner.h>
#include <kiwano/platform/Window.h>
#include <kiwano/utils/Timer.h>

5
src/kiwano/platform/Input.cpp
View File

@ -18,9 +18,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <kiwano/core/Logger.h>
#include <kiwano/core/event/KeyEvent.h>
#include <kiwano/core/event/MouseEvent.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/event/Events.h>
#include <kiwano/platform/Input.h>
namespace kiwano

4
src/kiwano/platform/Input.h
View File

@ -21,9 +21,9 @@
#pragma once
#include <array>
#include <kiwano/core/Common.h>
#include <kiwano/core/Module.h>
#include <kiwano/base/Module.h>
#include <kiwano/core/Keys.h>
#include <kiwano/core/event/Event.h>
#include <kiwano/event/Event.h>
#include <kiwano/macros.h>
#include <kiwano/math/Math.h>

4
src/kiwano/platform/Window.h
View File

@ -20,8 +20,8 @@
#pragma once
#include <kiwano/core/Common.h>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/core/event/Event.h>
#include <kiwano/base/ObjectBase.h>
#include <kiwano/event/Event.h>
#include <kiwano/math/Math.h>
namespace kiwano

6
src/kiwano/platform/win32/WindowImpl.cpp
View File

@ -26,10 +26,8 @@
#include <array>
#include <kiwano/core/Keys.h>
#include <kiwano/core/Exception.h>
#include <kiwano/core/Logger.h>
#include <kiwano/core/event/KeyEvent.h>
#include <kiwano/core/event/MouseEvent.h>
#include <kiwano/core/event/WindowEvent.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/event/Events.h>
#include <kiwano/platform/Application.h>
#include <kiwano/render/Renderer.h>
#include <kiwano/render/DirectX/D3DDeviceResources.h>

2
src/kiwano/platform/win32/libraries.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#include <kiwano/core/Exception.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/platform/win32/libraries.h>
namespace kiwano

2
src/kiwano/render/Brush.cpp
View File

@ -18,7 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/render/Brush.h>
#include <kiwano/render/Renderer.h>

2
src/kiwano/render/DirectX/D2DDeviceResources.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#include <kiwano/render/DirectX/D2DDeviceResources.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#pragma comment(lib, "d2d1.lib")
#pragma comment(lib, "dwrite.lib")

2
src/kiwano/render/DirectX/D3D10DeviceResources.cpp
View File

@ -18,7 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/render/DirectX/D3D10DeviceResources.h>
#pragma comment(lib, "d3d10_1.lib")

2
src/kiwano/render/DirectX/D3D11DeviceResources.cpp
View File

@ -18,7 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/render/DirectX/D3D11DeviceResources.h>
#include <memory>

2
src/kiwano/render/DirectX/RenderContextImpl.cpp
View File

@ -21,7 +21,7 @@
#include <kiwano/render/DirectX/RenderContextImpl.h>
#include <kiwano/render/DirectX/NativePtr.h>
#include <kiwano/render/Renderer.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
namespace kiwano
{

4
src/kiwano/render/DirectX/RendererImpl.cpp
View File

@ -19,8 +19,8 @@
// THE SOFTWARE.
#include <kiwano/core/Exception.h>
#include <kiwano/core/Logger.h>
#include <kiwano/core/event/WindowEvent.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/event/WindowEvent.h>
#include <kiwano/platform/FileSystem.h>
#include <kiwano/platform/Application.h>
#include <kiwano/render/ShapeMaker.h>

2
src/kiwano/render/Frame.h
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/ObjectBase.h>
#include <kiwano/base/ObjectBase.h>
#include <kiwano/render/Texture.h>
namespace kiwano

2
src/kiwano/render/FrameSequence.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#include <kiwano/render/FrameSequence.h>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
namespace kiwano
{

2
src/kiwano/render/GifImage.cpp
View File

@ -18,7 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/render/GifImage.h>
#include <kiwano/render/Renderer.h>

2
src/kiwano/render/NativeObject.h
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/ObjectBase.h>
#include <kiwano/base/ObjectBase.h>
#if KGE_RENDER_ENGINE == KGE_RENDER_ENGINE_DIRECTX
#include <kiwano/render/DirectX/D2DDeviceResources.h>

2
src/kiwano/render/Renderer.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#include <kiwano/render/Renderer.h>
#include <kiwano/core/event/WindowEvent.h>
#include <kiwano/event/WindowEvent.h>
#include <kiwano/platform/Application.h>
namespace kiwano

2
src/kiwano/render/Renderer.h
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/Module.h>
#include <kiwano/base/Module.h>
#include <kiwano/render/Font.h>
#include <kiwano/render/GifImage.h>
#include <kiwano/render/TextStyle.hpp>

2
src/kiwano/render/TextureCache.cpp
View File

@ -18,7 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/render/Renderer.h>
#include <kiwano/render/TextureCache.h>

4
src/kiwano/utils/EventTicker.h
View File

@ -20,8 +20,8 @@
#pragma once
#include <kiwano/utils/Ticker.h>
#include <kiwano/core/EventDispatcher.h>
#include <kiwano/core/event/Event.h>
#include <kiwano/event/EventDispatcher.h>
#include <kiwano/event/Event.h>
namespace kiwano
{

2
src/kiwano/utils/LocalStorage.h
View File

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/core/Common.h>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/base/ObjectBase.h>
namespace kiwano
{

2
src/kiwano/core/Logger.cpp → src/kiwano/utils/Logger.cpp
View File

@ -21,7 +21,7 @@
#include <ctime>
#include <fstream>
#include <iostream>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
namespace
{

0
src/kiwano/core/Logger.h → src/kiwano/utils/Logger.h
View File

2
src/kiwano/utils/ResourceCache.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#include <fstream>
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/core/Exception.h>
#include <kiwano/platform/FileSystem.h>
#include <kiwano/utils/ResourceCache.h>

2
src/kiwano/utils/TaskScheduler.cpp
View File

@ -18,7 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <kiwano/core/Logger.h>
#include <kiwano/utils/Logger.h>
#include <kiwano/utils/TaskScheduler.h>
namespace kiwano

2
src/kiwano/utils/Timer.h
View File

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/core/Time.h>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/base/ObjectBase.h>
namespace kiwano
{