diff --git a/projects/kiwano/kiwano.vcxproj b/projects/kiwano/kiwano.vcxproj index 2161d336..3946e0bf 100644 --- a/projects/kiwano/kiwano.vcxproj +++ b/projects/kiwano/kiwano.vcxproj @@ -12,16 +12,14 @@ + + + + - - - - - - @@ -31,6 +29,14 @@ + + + + + + + + @@ -43,12 +49,6 @@ - - - - - - @@ -98,6 +98,7 @@ + @@ -126,23 +127,22 @@ + + + + - - - - - - - - - - - + + + + + + @@ -174,6 +174,7 @@ + diff --git a/projects/kiwano/kiwano.vcxproj.filters b/projects/kiwano/kiwano.vcxproj.filters index 4bbf8004..06293856 100644 --- a/projects/kiwano/kiwano.vcxproj.filters +++ b/projects/kiwano/kiwano.vcxproj.filters @@ -22,15 +22,18 @@ {e84dcf9a-e650-473e-8c9c-193804ab9e76} - - {c629aedd-ffb9-4bc1-82c3-f50e77c82e77} - {adb44ca9-674a-4b77-993f-d65193d8ab06} {fd281702-0006-46d2-8fd1-28c502464164} + + {f514ae4f-2f6a-4d47-aa38-245628d6e01c} + + + {b0d28d20-bfaf-4816-8415-28c20ecf9fac} + @@ -42,12 +45,6 @@ 2d - - core - - - core - core @@ -108,12 +105,6 @@ 2d\action - - core - - - core - utils @@ -135,36 +126,15 @@ 2d - - core - platform\win32 platform\win32 - - core\event - - - core\event - - - core\event - - - core\event - - - core\event - 2d - - core - core @@ -267,9 +237,6 @@ render - - core - platform @@ -339,6 +306,45 @@ render\DirectX + + utils + + + base + + + base + + + base + + + base + + + event + + + event + + + event + + + event + + + event + + + event + + + event + + + event + @@ -350,12 +356,6 @@ 2d - - core - - - core - core @@ -398,12 +398,6 @@ 2d\action - - core - - - core - utils @@ -425,30 +419,12 @@ 2d - - core - platform\win32 - - core\event - - - core\event - - - core\event - - - core\event - 2d - - core - platform\win32 @@ -518,9 +494,6 @@ render - - core - platform @@ -560,6 +533,39 @@ 2d\action + + utils + + + base + + + base + + + base + + + base + + + event + + + event + + + event + + + event + + + event + + + event + diff --git a/src/kiwano-audio/AudioModule.cpp b/src/kiwano-audio/AudioModule.cpp index 8b0fbeb2..d8d2c189 100644 --- a/src/kiwano-audio/AudioModule.cpp +++ b/src/kiwano-audio/AudioModule.cpp @@ -20,8 +20,8 @@ #include #include -#include #include +#include namespace kiwano { diff --git a/src/kiwano-audio/AudioModule.h b/src/kiwano-audio/AudioModule.h index 9d69c4de..a97e4078 100644 --- a/src/kiwano-audio/AudioModule.h +++ b/src/kiwano-audio/AudioModule.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include namespace kiwano diff --git a/src/kiwano-audio/Sound.cpp b/src/kiwano-audio/Sound.cpp index f344e118..99a590c3 100644 --- a/src/kiwano-audio/Sound.cpp +++ b/src/kiwano-audio/Sound.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include namespace kiwano diff --git a/src/kiwano-audio/Sound.h b/src/kiwano-audio/Sound.h index 375da28d..299d9083 100644 --- a/src/kiwano-audio/Sound.h +++ b/src/kiwano-audio/Sound.h @@ -20,8 +20,8 @@ #pragma once #include -#include #include +#include #include #include diff --git a/src/kiwano-audio/SoundPlayer.h b/src/kiwano-audio/SoundPlayer.h index 62d4e25c..789c66b5 100644 --- a/src/kiwano-audio/SoundPlayer.h +++ b/src/kiwano-audio/SoundPlayer.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano-audio/Transcoder.cpp b/src/kiwano-audio/Transcoder.cpp index 64af27c7..448e999e 100644 --- a/src/kiwano-audio/Transcoder.cpp +++ b/src/kiwano-audio/Transcoder.cpp @@ -25,9 +25,8 @@ #include #include #include -#include #include -#include +#include #include #include diff --git a/src/kiwano-imgui/ImGuiModule.cpp b/src/kiwano-imgui/ImGuiModule.cpp index 4d9763f9..d5025254 100644 --- a/src/kiwano-imgui/ImGuiModule.cpp +++ b/src/kiwano-imgui/ImGuiModule.cpp @@ -2,8 +2,7 @@ #include -#include -#include +#include #include #include #include diff --git a/src/kiwano-imgui/ImGuiModule.h b/src/kiwano-imgui/ImGuiModule.h index ce4ac610..b5c2d159 100644 --- a/src/kiwano-imgui/ImGuiModule.h +++ b/src/kiwano-imgui/ImGuiModule.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include #include namespace kiwano diff --git a/src/kiwano-network/HttpModule.cpp b/src/kiwano-network/HttpModule.cpp index 6b3865e2..7bd9f26a 100644 --- a/src/kiwano-network/HttpModule.cpp +++ b/src/kiwano-network/HttpModule.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/kiwano-network/HttpModule.h b/src/kiwano-network/HttpModule.h index 59264e64..60d326d2 100644 --- a/src/kiwano-network/HttpModule.h +++ b/src/kiwano-network/HttpModule.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano-network/HttpRequest.h b/src/kiwano-network/HttpRequest.h index 626c3b56..1760c3ea 100644 --- a/src/kiwano-network/HttpRequest.h +++ b/src/kiwano-network/HttpRequest.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/2d/Actor.cpp b/src/kiwano/2d/Actor.cpp index 85cc83c3..f94ae3fa 100644 --- a/src/kiwano/2d/Actor.cpp +++ b/src/kiwano/2d/Actor.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/2d/Actor.h b/src/kiwano/2d/Actor.h index 8ebc92d2..802a70ed 100644 --- a/src/kiwano/2d/Actor.h +++ b/src/kiwano/2d/Actor.h @@ -20,9 +20,9 @@ #pragma once #include -#include +#include #include -#include +#include #include #include #include diff --git a/src/kiwano/2d/Canvas.cpp b/src/kiwano/2d/Canvas.cpp index 0a272d3e..aa9a0694 100644 --- a/src/kiwano/2d/Canvas.cpp +++ b/src/kiwano/2d/Canvas.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/Component.h b/src/kiwano/2d/Component.h index 3830b8ba..9d486cc6 100644 --- a/src/kiwano/2d/Component.h +++ b/src/kiwano/2d/Component.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/kiwano/2d/DebugActor.cpp b/src/kiwano/2d/DebugActor.cpp index 65d78975..9e39f268 100644 --- a/src/kiwano/2d/DebugActor.cpp +++ b/src/kiwano/2d/DebugActor.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include -#include +#include #include #include diff --git a/src/kiwano/2d/ShapeActor.cpp b/src/kiwano/2d/ShapeActor.cpp index a9714e48..5186451a 100644 --- a/src/kiwano/2d/ShapeActor.cpp +++ b/src/kiwano/2d/ShapeActor.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/2d/Stage.cpp b/src/kiwano/2d/Stage.cpp index 24ae8606..ad4b3d36 100644 --- a/src/kiwano/2d/Stage.cpp +++ b/src/kiwano/2d/Stage.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/2d/TextActor.cpp b/src/kiwano/2d/TextActor.cpp index 5c8b7ea4..dfe0010d 100644 --- a/src/kiwano/2d/TextActor.cpp +++ b/src/kiwano/2d/TextActor.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/2d/Transition.cpp b/src/kiwano/2d/Transition.cpp index d831bc10..acf0c722 100644 --- a/src/kiwano/2d/Transition.cpp +++ b/src/kiwano/2d/Transition.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/kiwano/2d/action/Action.h b/src/kiwano/2d/action/Action.h index 8bc67bbb..0df4595a 100644 --- a/src/kiwano/2d/action/Action.h +++ b/src/kiwano/2d/action/Action.h @@ -21,7 +21,7 @@ #pragma once #include #include -#include +#include #include #include #include diff --git a/src/kiwano/2d/action/ActionGroup.cpp b/src/kiwano/2d/action/ActionGroup.cpp index 520065c3..3aa633d5 100644 --- a/src/kiwano/2d/action/ActionGroup.cpp +++ b/src/kiwano/2d/action/ActionGroup.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/action/ActionScheduler.cpp b/src/kiwano/2d/action/ActionScheduler.cpp index 4d8b8765..4e1fb3fb 100644 --- a/src/kiwano/2d/action/ActionScheduler.cpp +++ b/src/kiwano/2d/action/ActionScheduler.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/action/ActionTween.h b/src/kiwano/2d/action/ActionTween.h index 6f271cd9..82b777ed 100644 --- a/src/kiwano/2d/action/ActionTween.h +++ b/src/kiwano/2d/action/ActionTween.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/Director.cpp b/src/kiwano/base/Director.cpp similarity index 99% rename from src/kiwano/core/Director.cpp rename to src/kiwano/base/Director.cpp index 84f4612f..6b221030 100644 --- a/src/kiwano/core/Director.cpp +++ b/src/kiwano/base/Director.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/core/Director.h b/src/kiwano/base/Director.h similarity index 98% rename from src/kiwano/core/Director.h rename to src/kiwano/base/Director.h index 8aca9387..fd054672 100644 --- a/src/kiwano/core/Director.h +++ b/src/kiwano/base/Director.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/Module.cpp b/src/kiwano/base/Module.cpp similarity index 97% rename from src/kiwano/core/Module.cpp rename to src/kiwano/base/Module.cpp index 38a3182b..009100bb 100644 --- a/src/kiwano/core/Module.cpp +++ b/src/kiwano/base/Module.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include +#include namespace kiwano { diff --git a/src/kiwano/core/Module.h b/src/kiwano/base/Module.h similarity index 100% rename from src/kiwano/core/Module.h rename to src/kiwano/base/Module.h diff --git a/src/kiwano/core/ObjectBase.cpp b/src/kiwano/base/ObjectBase.cpp similarity index 98% rename from src/kiwano/core/ObjectBase.cpp rename to src/kiwano/base/ObjectBase.cpp index 7fa059f2..588e0a6e 100644 --- a/src/kiwano/core/ObjectBase.cpp +++ b/src/kiwano/base/ObjectBase.cpp @@ -18,8 +18,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include -#include +#include +#include #include #include diff --git a/src/kiwano/core/ObjectBase.h b/src/kiwano/base/ObjectBase.h similarity index 98% rename from src/kiwano/core/ObjectBase.h rename to src/kiwano/base/ObjectBase.h index 38f3d653..6761c77c 100644 --- a/src/kiwano/core/ObjectBase.h +++ b/src/kiwano/base/ObjectBase.h @@ -19,11 +19,11 @@ // THE SOFTWARE. #pragma once +#include #include #include -#include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/RefCounter.cpp b/src/kiwano/base/RefCounter.cpp similarity index 97% rename from src/kiwano/core/RefCounter.cpp rename to src/kiwano/base/RefCounter.cpp index dec905ba..27e44e5e 100644 --- a/src/kiwano/core/RefCounter.cpp +++ b/src/kiwano/base/RefCounter.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include +#include namespace kiwano { diff --git a/src/kiwano/core/RefCounter.h b/src/kiwano/base/RefCounter.h similarity index 100% rename from src/kiwano/core/RefCounter.h rename to src/kiwano/base/RefCounter.h diff --git a/src/kiwano/core/Exception.cpp b/src/kiwano/core/Exception.cpp index 09f454ac..f5346406 100644 --- a/src/kiwano/core/Exception.cpp +++ b/src/kiwano/core/Exception.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #if defined(KGE_PLATFORM_WINDOWS) #include diff --git a/src/kiwano/core/Exception.h b/src/kiwano/core/Exception.h index 9994c376..3ad24cfc 100644 --- a/src/kiwano/core/Exception.h +++ b/src/kiwano/core/Exception.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/kiwano/core/Resource.cpp b/src/kiwano/core/Resource.cpp index ad44a5ff..99424288 100644 --- a/src/kiwano/core/Resource.cpp +++ b/src/kiwano/core/Resource.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/core/SmartPtr.hpp b/src/kiwano/core/SmartPtr.hpp index ad01496c..f569bb2b 100644 --- a/src/kiwano/core/SmartPtr.hpp +++ b/src/kiwano/core/SmartPtr.hpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/Time.cpp b/src/kiwano/core/Time.cpp index cd3a1f1d..e08fba77 100644 --- a/src/kiwano/core/Time.cpp +++ b/src/kiwano/core/Time.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include -#include +#include #include #include #include diff --git a/src/kiwano/core/event/Event.cpp b/src/kiwano/event/Event.cpp similarity index 76% rename from src/kiwano/core/event/Event.cpp rename to src/kiwano/event/Event.cpp index d793f723..b39e0fb0 100644 --- a/src/kiwano/core/event/Event.cpp +++ b/src/kiwano/event/Event.cpp @@ -1,4 +1,4 @@ -#include +#include namespace kiwano { diff --git a/src/kiwano/core/event/Event.h b/src/kiwano/event/Event.h similarity index 98% rename from src/kiwano/core/event/Event.h rename to src/kiwano/event/Event.h index 09d182e4..16242d27 100644 --- a/src/kiwano/core/event/Event.h +++ b/src/kiwano/event/Event.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/core/EventDispatcher.cpp b/src/kiwano/event/EventDispatcher.cpp similarity index 98% rename from src/kiwano/core/EventDispatcher.cpp rename to src/kiwano/event/EventDispatcher.cpp index 8bde41f2..fa97b779 100644 --- a/src/kiwano/core/EventDispatcher.cpp +++ b/src/kiwano/event/EventDispatcher.cpp @@ -18,8 +18,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include -#include +#include +#include namespace kiwano { diff --git a/src/kiwano/core/EventDispatcher.h b/src/kiwano/event/EventDispatcher.h similarity index 98% rename from src/kiwano/core/EventDispatcher.h rename to src/kiwano/event/EventDispatcher.h index 2eff0bf2..3f53cd81 100644 --- a/src/kiwano/core/EventDispatcher.h +++ b/src/kiwano/event/EventDispatcher.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include namespace kiwano { diff --git a/src/kiwano/core/EventListener.cpp b/src/kiwano/event/EventListener.cpp similarity index 97% rename from src/kiwano/core/EventListener.cpp rename to src/kiwano/event/EventListener.cpp index 79846f30..1549d5d3 100644 --- a/src/kiwano/core/EventListener.cpp +++ b/src/kiwano/event/EventListener.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include namespace kiwano { diff --git a/src/kiwano/core/EventListener.h b/src/kiwano/event/EventListener.h similarity index 96% rename from src/kiwano/core/EventListener.h rename to src/kiwano/event/EventListener.h index 2aee0e19..59d9a10d 100644 --- a/src/kiwano/core/EventListener.h +++ b/src/kiwano/event/EventListener.h @@ -20,13 +20,10 @@ #pragma once #include -#include +#include #include #include -#include -#include -#include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/event/EventType.h b/src/kiwano/event/EventType.h similarity index 100% rename from src/kiwano/core/event/EventType.h rename to src/kiwano/event/EventType.h diff --git a/src/kiwano/event/Events.h b/src/kiwano/event/Events.h new file mode 100644 index 00000000..13312ad8 --- /dev/null +++ b/src/kiwano/event/Events.h @@ -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 +#include +#include +#include diff --git a/src/kiwano/core/event/KeyEvent.cpp b/src/kiwano/event/KeyEvent.cpp similarity index 90% rename from src/kiwano/core/event/KeyEvent.cpp rename to src/kiwano/event/KeyEvent.cpp index 0d60eb22..f654ffd1 100644 --- a/src/kiwano/core/event/KeyEvent.cpp +++ b/src/kiwano/event/KeyEvent.cpp @@ -1,4 +1,4 @@ -#include +#include namespace kiwano { diff --git a/src/kiwano/core/event/KeyEvent.h b/src/kiwano/event/KeyEvent.h similarity index 98% rename from src/kiwano/core/event/KeyEvent.h rename to src/kiwano/event/KeyEvent.h index 66ac2cb7..a56ed119 100644 --- a/src/kiwano/core/event/KeyEvent.h +++ b/src/kiwano/event/KeyEvent.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/event/MouseEvent.cpp b/src/kiwano/event/MouseEvent.cpp similarity index 94% rename from src/kiwano/core/event/MouseEvent.cpp rename to src/kiwano/event/MouseEvent.cpp index 81c84d1d..7833bea4 100644 --- a/src/kiwano/core/event/MouseEvent.cpp +++ b/src/kiwano/event/MouseEvent.cpp @@ -1,4 +1,4 @@ -#include +#include namespace kiwano { diff --git a/src/kiwano/core/event/MouseEvent.h b/src/kiwano/event/MouseEvent.h similarity index 98% rename from src/kiwano/core/event/MouseEvent.h rename to src/kiwano/event/MouseEvent.h index b6371797..29731d39 100644 --- a/src/kiwano/core/event/MouseEvent.h +++ b/src/kiwano/event/MouseEvent.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/core/event/WindowEvent.cpp b/src/kiwano/event/WindowEvent.cpp similarity index 94% rename from src/kiwano/core/event/WindowEvent.cpp rename to src/kiwano/event/WindowEvent.cpp index 37cafb2b..1d07214d 100644 --- a/src/kiwano/core/event/WindowEvent.cpp +++ b/src/kiwano/event/WindowEvent.cpp @@ -1,4 +1,4 @@ -#include +#include namespace kiwano { diff --git a/src/kiwano/core/event/WindowEvent.h b/src/kiwano/event/WindowEvent.h similarity index 98% rename from src/kiwano/core/event/WindowEvent.h rename to src/kiwano/event/WindowEvent.h index 26a28e0d..4370422d 100644 --- a/src/kiwano/core/event/WindowEvent.h +++ b/src/kiwano/event/WindowEvent.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include namespace kiwano { diff --git a/src/kiwano/kiwano.h b/src/kiwano/kiwano.h index 86e32e0f..8062e660 100644 --- a/src/kiwano/kiwano.h +++ b/src/kiwano/kiwano.h @@ -44,18 +44,30 @@ // #include -#include -#include -#include -#include -#include #include #include #include -#include -#include -#include -#include + +// +// base +// + +#include +#include +#include +#include + + +// +// event +// + +#include +#include +#include +#include +#include +#include // // renderer @@ -112,6 +124,7 @@ // utils // +#include #include #include #include diff --git a/src/kiwano/platform/Application.cpp b/src/kiwano/platform/Application.cpp index b3f0c3c2..78ac7109 100644 --- a/src/kiwano/platform/Application.cpp +++ b/src/kiwano/platform/Application.cpp @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/kiwano/platform/Application.h b/src/kiwano/platform/Application.h index 5c2d4e87..2a803e1c 100644 --- a/src/kiwano/platform/Application.h +++ b/src/kiwano/platform/Application.h @@ -21,10 +21,10 @@ #pragma once #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/src/kiwano/platform/Input.cpp b/src/kiwano/platform/Input.cpp index d79c49a5..8dd82307 100644 --- a/src/kiwano/platform/Input.cpp +++ b/src/kiwano/platform/Input.cpp @@ -18,9 +18,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include -#include -#include +#include +#include #include namespace kiwano diff --git a/src/kiwano/platform/Input.h b/src/kiwano/platform/Input.h index 0759bc55..d2a72793 100644 --- a/src/kiwano/platform/Input.h +++ b/src/kiwano/platform/Input.h @@ -21,9 +21,9 @@ #pragma once #include #include -#include +#include #include -#include +#include #include #include diff --git a/src/kiwano/platform/Window.h b/src/kiwano/platform/Window.h index 284cb1db..61324ba9 100644 --- a/src/kiwano/platform/Window.h +++ b/src/kiwano/platform/Window.h @@ -20,8 +20,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace kiwano diff --git a/src/kiwano/platform/win32/WindowImpl.cpp b/src/kiwano/platform/win32/WindowImpl.cpp index 4bf1f36c..83116760 100644 --- a/src/kiwano/platform/win32/WindowImpl.cpp +++ b/src/kiwano/platform/win32/WindowImpl.cpp @@ -26,10 +26,8 @@ #include #include #include -#include -#include -#include -#include +#include +#include #include #include #include diff --git a/src/kiwano/platform/win32/libraries.cpp b/src/kiwano/platform/win32/libraries.cpp index ac0f6bbb..4505ee66 100644 --- a/src/kiwano/platform/win32/libraries.cpp +++ b/src/kiwano/platform/win32/libraries.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/render/Brush.cpp b/src/kiwano/render/Brush.cpp index bab76f91..f106f2de 100644 --- a/src/kiwano/render/Brush.cpp +++ b/src/kiwano/render/Brush.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include +#include #include #include diff --git a/src/kiwano/render/DirectX/D2DDeviceResources.cpp b/src/kiwano/render/DirectX/D2DDeviceResources.cpp index 538725de..2062ac2d 100644 --- a/src/kiwano/render/DirectX/D2DDeviceResources.cpp +++ b/src/kiwano/render/DirectX/D2DDeviceResources.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include -#include +#include #pragma comment(lib, "d2d1.lib") #pragma comment(lib, "dwrite.lib") diff --git a/src/kiwano/render/DirectX/D3D10DeviceResources.cpp b/src/kiwano/render/DirectX/D3D10DeviceResources.cpp index a5bc29e5..e10427db 100644 --- a/src/kiwano/render/DirectX/D3D10DeviceResources.cpp +++ b/src/kiwano/render/DirectX/D3D10DeviceResources.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include +#include #include #pragma comment(lib, "d3d10_1.lib") diff --git a/src/kiwano/render/DirectX/D3D11DeviceResources.cpp b/src/kiwano/render/DirectX/D3D11DeviceResources.cpp index 65da7e5f..e767c848 100644 --- a/src/kiwano/render/DirectX/D3D11DeviceResources.cpp +++ b/src/kiwano/render/DirectX/D3D11DeviceResources.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include +#include #include #include diff --git a/src/kiwano/render/DirectX/RenderContextImpl.cpp b/src/kiwano/render/DirectX/RenderContextImpl.cpp index cbf90978..25a4ada6 100644 --- a/src/kiwano/render/DirectX/RenderContextImpl.cpp +++ b/src/kiwano/render/DirectX/RenderContextImpl.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/render/DirectX/RendererImpl.cpp b/src/kiwano/render/DirectX/RendererImpl.cpp index de86e279..13e325b7 100644 --- a/src/kiwano/render/DirectX/RendererImpl.cpp +++ b/src/kiwano/render/DirectX/RendererImpl.cpp @@ -19,8 +19,8 @@ // THE SOFTWARE. #include -#include -#include +#include +#include #include #include #include diff --git a/src/kiwano/render/Frame.h b/src/kiwano/render/Frame.h index a425f22b..f0679724 100644 --- a/src/kiwano/render/Frame.h +++ b/src/kiwano/render/Frame.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include #include namespace kiwano diff --git a/src/kiwano/render/FrameSequence.cpp b/src/kiwano/render/FrameSequence.cpp index a5ce48fa..03fd4a85 100644 --- a/src/kiwano/render/FrameSequence.cpp +++ b/src/kiwano/render/FrameSequence.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include -#include +#include namespace kiwano { diff --git a/src/kiwano/render/GifImage.cpp b/src/kiwano/render/GifImage.cpp index 79e942f5..da775009 100644 --- a/src/kiwano/render/GifImage.cpp +++ b/src/kiwano/render/GifImage.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include +#include #include #include diff --git a/src/kiwano/render/NativeObject.h b/src/kiwano/render/NativeObject.h index 4b83b322..fc020b23 100644 --- a/src/kiwano/render/NativeObject.h +++ b/src/kiwano/render/NativeObject.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include #if KGE_RENDER_ENGINE == KGE_RENDER_ENGINE_DIRECTX #include diff --git a/src/kiwano/render/Renderer.cpp b/src/kiwano/render/Renderer.cpp index f25086ef..be2226b2 100644 --- a/src/kiwano/render/Renderer.cpp +++ b/src/kiwano/render/Renderer.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/render/Renderer.h b/src/kiwano/render/Renderer.h index 7b80dae3..68077fa1 100644 --- a/src/kiwano/render/Renderer.h +++ b/src/kiwano/render/Renderer.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include #include #include #include diff --git a/src/kiwano/render/TextureCache.cpp b/src/kiwano/render/TextureCache.cpp index 27b74545..847ece2b 100644 --- a/src/kiwano/render/TextureCache.cpp +++ b/src/kiwano/render/TextureCache.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include +#include #include #include diff --git a/src/kiwano/utils/EventTicker.h b/src/kiwano/utils/EventTicker.h index 3fffff84..c1fd82d3 100644 --- a/src/kiwano/utils/EventTicker.h +++ b/src/kiwano/utils/EventTicker.h @@ -20,8 +20,8 @@ #pragma once #include -#include -#include +#include +#include namespace kiwano { diff --git a/src/kiwano/utils/LocalStorage.h b/src/kiwano/utils/LocalStorage.h index 6972a5c9..d3475cab 100644 --- a/src/kiwano/utils/LocalStorage.h +++ b/src/kiwano/utils/LocalStorage.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/Logger.cpp b/src/kiwano/utils/Logger.cpp similarity index 99% rename from src/kiwano/core/Logger.cpp rename to src/kiwano/utils/Logger.cpp index 25400f0a..cc1c42e9 100644 --- a/src/kiwano/core/Logger.cpp +++ b/src/kiwano/utils/Logger.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include namespace { diff --git a/src/kiwano/core/Logger.h b/src/kiwano/utils/Logger.h similarity index 100% rename from src/kiwano/core/Logger.h rename to src/kiwano/utils/Logger.h diff --git a/src/kiwano/utils/ResourceCache.cpp b/src/kiwano/utils/ResourceCache.cpp index 11398a40..be4b75bb 100644 --- a/src/kiwano/utils/ResourceCache.cpp +++ b/src/kiwano/utils/ResourceCache.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include -#include +#include #include #include #include diff --git a/src/kiwano/utils/TaskScheduler.cpp b/src/kiwano/utils/TaskScheduler.cpp index c06d88da..40030c4d 100644 --- a/src/kiwano/utils/TaskScheduler.cpp +++ b/src/kiwano/utils/TaskScheduler.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include +#include #include namespace kiwano diff --git a/src/kiwano/utils/Timer.h b/src/kiwano/utils/Timer.h index 29cb6a1a..ab20f4dc 100644 --- a/src/kiwano/utils/Timer.h +++ b/src/kiwano/utils/Timer.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano {