diff --git a/projects/kiwano/kiwano.vcxproj b/projects/kiwano/kiwano.vcxproj index 5de1b87d..e829f7cc 100644 --- a/projects/kiwano/kiwano.vcxproj +++ b/projects/kiwano/kiwano.vcxproj @@ -12,15 +12,17 @@ - + + + @@ -39,7 +41,6 @@ - @@ -47,7 +48,6 @@ - @@ -63,27 +63,27 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -124,9 +124,9 @@ + - @@ -134,24 +134,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/projects/kiwano/kiwano.vcxproj.filters b/projects/kiwano/kiwano.vcxproj.filters index 0aad2c21..dc22d2b5 100644 --- a/projects/kiwano/kiwano.vcxproj.filters +++ b/projects/kiwano/kiwano.vcxproj.filters @@ -16,21 +16,21 @@ {2e18d99a-e906-499a-9e29-4e0783202644} - - {7897afce-24cb-42b4-9443-56508e4ec89c} - {9314f30d-5742-48b6-94e5-e3b4284106f6} - - {30333461-e9bc-4709-84bd-ce6e0e1a3079} - {e84dcf9a-e650-473e-8c9c-193804ab9e76} {c629aedd-ffb9-4bc1-82c3-f50e77c82e77} + + {adb44ca9-674a-4b77-993f-d65193d8ab06} + + + {fd281702-0006-46d2-8fd1-28c502464164} + @@ -57,9 +57,6 @@ core - - core - math @@ -147,60 +144,9 @@ core - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer\win32 - - - renderer\win32 - - - renderer\win32 - - - renderer\win32 - - - renderer\win32 - - - renderer\win32 - 2d - - renderer - - - renderer - - - renderer - - - renderer - math @@ -222,9 +168,6 @@ platform - - core - platform @@ -234,21 +177,9 @@ 2d - - core - core - - renderer - - - renderer\win32 - - - renderer - platform\win32 @@ -276,15 +207,84 @@ 2d - - renderer - core core + + core + + + core + + + core + + + render\dx + + + render\dx + + + render\dx + + + render\dx + + + render\dx + + + render\dx + + + render\dx + + + render + + + render + + + render + + + render + + + render + + + render + + + render + + + render + + + render + + + render + + + render + + + render + + + render + + + render + @@ -308,9 +308,6 @@ core - - core - platform @@ -374,54 +371,9 @@ core - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer\win32 - - - renderer\win32 - - - renderer\win32 - - - renderer\win32 - - - renderer\win32 - 2d - - renderer - - - renderer - - - renderer - core @@ -449,9 +401,6 @@ core - - renderer - platform\win32 @@ -473,17 +422,68 @@ 2d - - renderer - - - renderer - core platform\win32 + + core + + + render\dx + + + render\dx + + + render\dx + + + render\dx + + + render\dx + + + render + + + render + + + render + + + render + + + render + + + render + + + render + + + render + + + render + + + render + + + render + + + render + + + render + \ No newline at end of file diff --git a/src/kiwano-audio/AudioEngine.h b/src/kiwano-audio/AudioEngine.h index 4321ac3a..7a39c09a 100644 --- a/src/kiwano-audio/AudioEngine.h +++ b/src/kiwano-audio/AudioEngine.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include #include #include #include diff --git a/src/kiwano-audio/Transcoder.cpp b/src/kiwano-audio/Transcoder.cpp index 08ff08e6..d55b1a67 100644 --- a/src/kiwano-audio/Transcoder.cpp +++ b/src/kiwano-audio/Transcoder.cpp @@ -23,7 +23,7 @@ #endif #include -#include +#include #include #include #include diff --git a/src/kiwano-imgui/ImGuiModule.cpp b/src/kiwano-imgui/ImGuiModule.cpp index db42aff2..0d5ff03f 100644 --- a/src/kiwano-imgui/ImGuiModule.cpp +++ b/src/kiwano-imgui/ImGuiModule.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2019 Nomango -#include +#include #include #include #include #include -#include +#include #include #include diff --git a/src/kiwano-imgui/ImGuiModule.h b/src/kiwano-imgui/ImGuiModule.h index b4087c12..d609edc8 100644 --- a/src/kiwano-imgui/ImGuiModule.h +++ b/src/kiwano-imgui/ImGuiModule.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include #include namespace kiwano diff --git a/src/kiwano-network/HttpClient.h b/src/kiwano-network/HttpClient.h index 600252ae..660380a3 100644 --- a/src/kiwano-network/HttpClient.h +++ b/src/kiwano-network/HttpClient.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include #include #include #include diff --git a/src/kiwano-network/HttpRequest.h b/src/kiwano-network/HttpRequest.h index 36362a49..69609be4 100644 --- a/src/kiwano-network/HttpRequest.h +++ b/src/kiwano-network/HttpRequest.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include #include #include diff --git a/src/kiwano/2d/Actor.cpp b/src/kiwano/2d/Actor.cpp index 5ebc692b..0ff27515 100644 --- a/src/kiwano/2d/Actor.cpp +++ b/src/kiwano/2d/Actor.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/Actor.h b/src/kiwano/2d/Actor.h index 96334877..d3925ebb 100644 --- a/src/kiwano/2d/Actor.h +++ b/src/kiwano/2d/Actor.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/kiwano/2d/Canvas.cpp b/src/kiwano/2d/Canvas.cpp index 20d06830..4d52d390 100644 --- a/src/kiwano/2d/Canvas.cpp +++ b/src/kiwano/2d/Canvas.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/Canvas.h b/src/kiwano/2d/Canvas.h index 935f95b4..a5774da1 100644 --- a/src/kiwano/2d/Canvas.h +++ b/src/kiwano/2d/Canvas.h @@ -20,8 +20,8 @@ #pragma once #include -#include -#include +#include +#include namespace kiwano { diff --git a/src/kiwano/2d/DebugActor.cpp b/src/kiwano/2d/DebugActor.cpp index 7174d952..e67dc8a2 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/DebugActor.h b/src/kiwano/2d/DebugActor.h index 01a7317d..a681ee50 100644 --- a/src/kiwano/2d/DebugActor.h +++ b/src/kiwano/2d/DebugActor.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/Frame.cpp b/src/kiwano/2d/Frame.cpp index f20419c9..9a254924 100644 --- a/src/kiwano/2d/Frame.cpp +++ b/src/kiwano/2d/Frame.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/Frame.h b/src/kiwano/2d/Frame.h index e2aaff02..2732f2cd 100644 --- a/src/kiwano/2d/Frame.h +++ b/src/kiwano/2d/Frame.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/FrameSequence.h b/src/kiwano/2d/FrameSequence.h index 96321608..9975ddce 100644 --- a/src/kiwano/2d/FrameSequence.h +++ b/src/kiwano/2d/FrameSequence.h @@ -19,8 +19,8 @@ // THE SOFTWARE. #pragma once -#include -#include +#include +#include #include namespace kiwano diff --git a/src/kiwano/2d/GifSprite.cpp b/src/kiwano/2d/GifSprite.cpp index b343d143..fd3a87a7 100644 --- a/src/kiwano/2d/GifSprite.cpp +++ b/src/kiwano/2d/GifSprite.cpp @@ -19,8 +19,8 @@ // THE SOFTWARE. #include -#include -#include +#include +#include namespace kiwano { diff --git a/src/kiwano/2d/GifSprite.h b/src/kiwano/2d/GifSprite.h index 8fab359e..b407d443 100644 --- a/src/kiwano/2d/GifSprite.h +++ b/src/kiwano/2d/GifSprite.h @@ -21,8 +21,8 @@ #pragma once #include #include -#include -#include +#include +#include namespace kiwano { diff --git a/src/kiwano/2d/Layer.cpp b/src/kiwano/2d/Layer.cpp index 8b652d6c..5880a134 100644 --- a/src/kiwano/2d/Layer.cpp +++ b/src/kiwano/2d/Layer.cpp @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/Layer.h b/src/kiwano/2d/Layer.h index b28aa085..74c84d13 100644 --- a/src/kiwano/2d/Layer.h +++ b/src/kiwano/2d/Layer.h @@ -20,8 +20,8 @@ #pragma once #include -#include -#include +#include +#include namespace kiwano { diff --git a/src/kiwano/2d/ShapeActor.cpp b/src/kiwano/2d/ShapeActor.cpp index 9bc1c0a7..38b27881 100644 --- a/src/kiwano/2d/ShapeActor.cpp +++ b/src/kiwano/2d/ShapeActor.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/ShapeActor.h b/src/kiwano/2d/ShapeActor.h index 052c633a..aa347012 100644 --- a/src/kiwano/2d/ShapeActor.h +++ b/src/kiwano/2d/ShapeActor.h @@ -20,10 +20,10 @@ #pragma once #include -#include -#include -#include -#include +#include +#include +#include +#include namespace kiwano { diff --git a/src/kiwano/2d/Sprite.cpp b/src/kiwano/2d/Sprite.cpp index f6c22809..5474b14b 100644 --- a/src/kiwano/2d/Sprite.cpp +++ b/src/kiwano/2d/Sprite.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/Stage.cpp b/src/kiwano/2d/Stage.cpp index e8d7cf7a..dfc06e0b 100644 --- a/src/kiwano/2d/Stage.cpp +++ b/src/kiwano/2d/Stage.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/Stage.h b/src/kiwano/2d/Stage.h index 7e182a01..59848ca6 100644 --- a/src/kiwano/2d/Stage.h +++ b/src/kiwano/2d/Stage.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/TextActor.cpp b/src/kiwano/2d/TextActor.cpp index b7180231..2c3cac1e 100644 --- a/src/kiwano/2d/TextActor.cpp +++ b/src/kiwano/2d/TextActor.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/TextActor.h b/src/kiwano/2d/TextActor.h index a7576d91..9ab4163e 100644 --- a/src/kiwano/2d/TextActor.h +++ b/src/kiwano/2d/TextActor.h @@ -20,8 +20,8 @@ #pragma once #include -#include -#include +#include +#include namespace kiwano { diff --git a/src/kiwano/2d/Transition.cpp b/src/kiwano/2d/Transition.cpp index a25822d4..7a2a97ab 100644 --- a/src/kiwano/2d/Transition.cpp +++ b/src/kiwano/2d/Transition.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/Transition.h b/src/kiwano/2d/Transition.h index d79c0939..92df93a7 100644 --- a/src/kiwano/2d/Transition.h +++ b/src/kiwano/2d/Transition.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/action/Action.h b/src/kiwano/2d/action/Action.h index 0bc67352..57b2687c 100644 --- a/src/kiwano/2d/action/Action.h +++ b/src/kiwano/2d/action/Action.h @@ -19,8 +19,8 @@ // THE SOFTWARE. #pragma once -#include -#include +#include +#include #include #include #include diff --git a/src/kiwano/2d/action/ActionWalk.h b/src/kiwano/2d/action/ActionWalk.h index 5368ad22..c89df2cc 100644 --- a/src/kiwano/2d/action/ActionWalk.h +++ b/src/kiwano/2d/action/ActionWalk.h @@ -20,8 +20,8 @@ #pragma once #include -#include -#include +#include +#include namespace kiwano { diff --git a/src/kiwano/core/common.h b/src/kiwano/core/Common.h similarity index 100% rename from src/kiwano/core/common.h rename to src/kiwano/core/Common.h diff --git a/src/kiwano/core/Component.h b/src/kiwano/core/Component.h index 514809aa..3f9c38b6 100644 --- a/src/kiwano/core/Component.h +++ b/src/kiwano/core/Component.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/Director.cpp b/src/kiwano/core/Director.cpp index 60f8e215..30a9e75d 100644 --- a/src/kiwano/core/Director.cpp +++ b/src/kiwano/core/Director.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/EventListener.h b/src/kiwano/core/EventListener.h index d3be9f56..afdebcab 100644 --- a/src/kiwano/core/EventListener.h +++ b/src/kiwano/core/EventListener.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include #include #include #include diff --git a/src/kiwano/core/keys.h b/src/kiwano/core/Keys.h similarity index 100% rename from src/kiwano/core/keys.h rename to src/kiwano/core/Keys.h diff --git a/src/kiwano/core/Library.h b/src/kiwano/core/Library.h index 9d8ed576..95c188e1 100644 --- a/src/kiwano/core/Library.h +++ b/src/kiwano/core/Library.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/Logger.h b/src/kiwano/core/Logger.h index 3aedd7ec..5bc76527 100644 --- a/src/kiwano/core/Logger.h +++ b/src/kiwano/core/Logger.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #ifndef KGE_SYS_LOG # ifdef KGE_DEBUG diff --git a/src/kiwano/core/ObjectBase.h b/src/kiwano/core/ObjectBase.h index 3459f859..78a95710 100644 --- a/src/kiwano/core/ObjectBase.h +++ b/src/kiwano/core/ObjectBase.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/kiwano/core/RefCounter.h b/src/kiwano/core/RefCounter.h index f570c2d9..3f3146df 100644 --- a/src/kiwano/core/RefCounter.h +++ b/src/kiwano/core/RefCounter.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/Resource.h b/src/kiwano/core/Resource.h index 0c2a57e5..0bbfb988 100644 --- a/src/kiwano/core/Resource.h +++ b/src/kiwano/core/Resource.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/SmartPtr.hpp b/src/kiwano/core/SmartPtr.hpp index 7bda42fe..ed767fbe 100644 --- a/src/kiwano/core/SmartPtr.hpp +++ b/src/kiwano/core/SmartPtr.hpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include #include namespace kiwano diff --git a/src/kiwano/core/time.cpp b/src/kiwano/core/Time.cpp similarity index 99% rename from src/kiwano/core/time.cpp rename to src/kiwano/core/Time.cpp index b12bde7b..5f406ed1 100644 --- a/src/kiwano/core/time.cpp +++ b/src/kiwano/core/Time.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/core/time.h b/src/kiwano/core/Time.h similarity index 99% rename from src/kiwano/core/time.h rename to src/kiwano/core/Time.h index 37bd02b9..94502d0d 100644 --- a/src/kiwano/core/time.h +++ b/src/kiwano/core/Time.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/Timer.h b/src/kiwano/core/Timer.h index a68d11a8..680b20d6 100644 --- a/src/kiwano/core/Timer.h +++ b/src/kiwano/core/Timer.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/event/Event.h b/src/kiwano/core/event/Event.h index 751d8201..7b5a0fe2 100644 --- a/src/kiwano/core/event/Event.h +++ b/src/kiwano/core/event/Event.h @@ -21,7 +21,7 @@ #pragma once #include #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/core/event/EventType.h b/src/kiwano/core/event/EventType.h index d10341a4..aa838c43 100644 --- a/src/kiwano/core/event/EventType.h +++ b/src/kiwano/core/event/EventType.h @@ -21,7 +21,7 @@ #pragma once #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/event/KeyEvent.h b/src/kiwano/core/event/KeyEvent.h index 7a1d3053..5a34a9c2 100644 --- a/src/kiwano/core/event/KeyEvent.h +++ b/src/kiwano/core/event/KeyEvent.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/event/MouseEvent.h b/src/kiwano/core/event/MouseEvent.h index 332b2e5e..ba3ac761 100644 --- a/src/kiwano/core/event/MouseEvent.h +++ b/src/kiwano/core/event/MouseEvent.h @@ -21,7 +21,7 @@ #pragma once #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/kiwano.h b/src/kiwano/kiwano.h index 6992eeb4..3153e6d7 100644 --- a/src/kiwano/kiwano.h +++ b/src/kiwano/kiwano.h @@ -44,8 +44,8 @@ // core // -#include -#include +#include +#include #include #include #include @@ -66,15 +66,15 @@ // renderer // -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // diff --git a/src/kiwano/math/math.h b/src/kiwano/math/math.h index 0cd8eeb9..504a6d3d 100644 --- a/src/kiwano/math/math.h +++ b/src/kiwano/math/math.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include #include #include #include diff --git a/src/kiwano/platform/Application.cpp b/src/kiwano/platform/Application.cpp index b32f98ab..2569c315 100644 --- a/src/kiwano/platform/Application.cpp +++ b/src/kiwano/platform/Application.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/platform/Application.h b/src/kiwano/platform/Application.h index 8f2151d5..02f16165 100644 --- a/src/kiwano/platform/Application.h +++ b/src/kiwano/platform/Application.h @@ -19,15 +19,15 @@ // THE SOFTWARE. #pragma once -#include -#include +#include +#include #include #include #include #include #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/platform/Input.h b/src/kiwano/platform/Input.h index 2c81194b..c8717216 100644 --- a/src/kiwano/platform/Input.h +++ b/src/kiwano/platform/Input.h @@ -21,7 +21,7 @@ #pragma once #include #include -#include +#include #include #include diff --git a/src/kiwano/platform/Window.h b/src/kiwano/platform/Window.h index e27e41e8..4b5663b9 100644 --- a/src/kiwano/platform/Window.h +++ b/src/kiwano/platform/Window.h @@ -21,7 +21,7 @@ #pragma once #include #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/platform/win32/ComPtr.hpp b/src/kiwano/platform/win32/ComPtr.hpp index eaf3a075..d59f7d0a 100644 --- a/src/kiwano/platform/win32/ComPtr.hpp +++ b/src/kiwano/platform/win32/ComPtr.hpp @@ -20,7 +20,7 @@ #pragma once #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/renderer/Brush.cpp b/src/kiwano/render/Brush.cpp similarity index 97% rename from src/kiwano/renderer/Brush.cpp rename to src/kiwano/render/Brush.cpp index 718685e7..cc431e70 100644 --- a/src/kiwano/renderer/Brush.cpp +++ b/src/kiwano/render/Brush.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 namespace kiwano diff --git a/src/kiwano/renderer/Brush.h b/src/kiwano/render/Brush.h similarity index 98% rename from src/kiwano/renderer/Brush.h rename to src/kiwano/render/Brush.h index 5c09af0b..a65322aa 100644 --- a/src/kiwano/renderer/Brush.h +++ b/src/kiwano/render/Brush.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/renderer/Color.cpp b/src/kiwano/render/Color.cpp similarity index 98% rename from src/kiwano/renderer/Color.cpp rename to src/kiwano/render/Color.cpp index ea91eb7a..8a24d1db 100644 --- a/src/kiwano/renderer/Color.cpp +++ b/src/kiwano/render/Color.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/renderer/Color.h b/src/kiwano/render/Color.h similarity index 99% rename from src/kiwano/renderer/Color.h rename to src/kiwano/render/Color.h index 627aa123..396333a7 100644 --- a/src/kiwano/renderer/Color.h +++ b/src/kiwano/render/Color.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/renderer/Font.cpp b/src/kiwano/render/Font.cpp similarity index 96% rename from src/kiwano/renderer/Font.cpp rename to src/kiwano/render/Font.cpp index fca9256b..48e3d888 100644 --- a/src/kiwano/renderer/Font.cpp +++ b/src/kiwano/render/Font.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/renderer/Font.h b/src/kiwano/render/Font.h similarity index 100% rename from src/kiwano/renderer/Font.h rename to src/kiwano/render/Font.h diff --git a/src/kiwano/renderer/Geometry.cpp b/src/kiwano/render/Geometry.cpp similarity index 96% rename from src/kiwano/renderer/Geometry.cpp rename to src/kiwano/render/Geometry.cpp index 87c50bcf..2f9a030f 100644 --- a/src/kiwano/renderer/Geometry.cpp +++ b/src/kiwano/render/Geometry.cpp @@ -18,9 +18,9 @@ // 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/renderer/Geometry.h b/src/kiwano/render/Geometry.h similarity index 98% rename from src/kiwano/renderer/Geometry.h rename to src/kiwano/render/Geometry.h index 59f74283..658779e1 100644 --- a/src/kiwano/renderer/Geometry.h +++ b/src/kiwano/render/Geometry.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include namespace kiwano { diff --git a/src/kiwano/renderer/GeometrySink.cpp b/src/kiwano/render/GeometrySink.cpp similarity index 98% rename from src/kiwano/renderer/GeometrySink.cpp rename to src/kiwano/render/GeometrySink.cpp index 236eb730..734f90d9 100644 --- a/src/kiwano/renderer/GeometrySink.cpp +++ b/src/kiwano/render/GeometrySink.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/renderer/GeometrySink.h b/src/kiwano/render/GeometrySink.h similarity index 99% rename from src/kiwano/renderer/GeometrySink.h rename to src/kiwano/render/GeometrySink.h index 68fa13dd..b0b2e68a 100644 --- a/src/kiwano/renderer/GeometrySink.h +++ b/src/kiwano/render/GeometrySink.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include namespace kiwano { diff --git a/src/kiwano/renderer/GifImage.cpp b/src/kiwano/render/GifImage.cpp similarity index 98% rename from src/kiwano/renderer/GifImage.cpp rename to src/kiwano/render/GifImage.cpp index 365b2d4b..ea2e2a8d 100644 --- a/src/kiwano/renderer/GifImage.cpp +++ b/src/kiwano/render/GifImage.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 namespace kiwano diff --git a/src/kiwano/renderer/GifImage.h b/src/kiwano/render/GifImage.h similarity index 97% rename from src/kiwano/renderer/GifImage.h rename to src/kiwano/render/GifImage.h index 4b07829f..cc7f39b3 100644 --- a/src/kiwano/renderer/GifImage.h +++ b/src/kiwano/render/GifImage.h @@ -19,8 +19,8 @@ // THE SOFTWARE. #pragma once -#include -#include +#include +#include namespace kiwano { diff --git a/src/kiwano/renderer/LayerArea.cpp b/src/kiwano/render/LayerArea.cpp similarity index 96% rename from src/kiwano/renderer/LayerArea.cpp rename to src/kiwano/render/LayerArea.cpp index a101fe34..564de887 100644 --- a/src/kiwano/renderer/LayerArea.cpp +++ b/src/kiwano/render/LayerArea.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/renderer/LayerArea.h b/src/kiwano/render/LayerArea.h similarity index 98% rename from src/kiwano/renderer/LayerArea.h rename to src/kiwano/render/LayerArea.h index 26de6619..ddf88586 100644 --- a/src/kiwano/renderer/LayerArea.h +++ b/src/kiwano/render/LayerArea.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include namespace kiwano { diff --git a/src/kiwano/renderer/RenderContext.cpp b/src/kiwano/render/RenderContext.cpp similarity index 99% rename from src/kiwano/renderer/RenderContext.cpp rename to src/kiwano/render/RenderContext.cpp index c39b12f0..799c0bbf 100644 --- a/src/kiwano/renderer/RenderContext.cpp +++ b/src/kiwano/render/RenderContext.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/renderer/RenderContext.h b/src/kiwano/render/RenderContext.h similarity index 96% rename from src/kiwano/renderer/RenderContext.h rename to src/kiwano/render/RenderContext.h index 1da518ab..04b6fd3e 100644 --- a/src/kiwano/renderer/RenderContext.h +++ b/src/kiwano/render/RenderContext.h @@ -19,14 +19,14 @@ // THE SOFTWARE. #pragma once -#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace kiwano { diff --git a/src/kiwano/renderer/Renderer.cpp b/src/kiwano/render/Renderer.cpp similarity index 99% rename from src/kiwano/renderer/Renderer.cpp rename to src/kiwano/render/Renderer.cpp index 5caac97e..c05e8582 100644 --- a/src/kiwano/renderer/Renderer.cpp +++ b/src/kiwano/render/Renderer.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 #include diff --git a/src/kiwano/renderer/Renderer.h b/src/kiwano/render/Renderer.h similarity index 96% rename from src/kiwano/renderer/Renderer.h rename to src/kiwano/render/Renderer.h index 42c920b2..7c5a1cb9 100644 --- a/src/kiwano/renderer/Renderer.h +++ b/src/kiwano/render/Renderer.h @@ -20,17 +20,17 @@ #pragma once #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #if defined(KGE_USE_DIRECTX10) -# include "win32/D3D10DeviceResources.h" +# include #else -# include "win32/D3D11DeviceResources.h" +# include #endif namespace kiwano diff --git a/src/kiwano/renderer/StrokeStyle.cpp b/src/kiwano/render/StrokeStyle.cpp similarity index 96% rename from src/kiwano/renderer/StrokeStyle.cpp rename to src/kiwano/render/StrokeStyle.cpp index 282e9f55..0479205a 100644 --- a/src/kiwano/renderer/StrokeStyle.cpp +++ b/src/kiwano/render/StrokeStyle.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/renderer/StrokeStyle.h b/src/kiwano/render/StrokeStyle.h similarity index 98% rename from src/kiwano/renderer/StrokeStyle.h rename to src/kiwano/render/StrokeStyle.h index 07edb5e2..790eca1b 100644 --- a/src/kiwano/renderer/StrokeStyle.h +++ b/src/kiwano/render/StrokeStyle.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include namespace kiwano { diff --git a/src/kiwano/renderer/TextLayout.cpp b/src/kiwano/render/TextLayout.cpp similarity index 98% rename from src/kiwano/renderer/TextLayout.cpp rename to src/kiwano/render/TextLayout.cpp index fb143381..55c7cc53 100644 --- a/src/kiwano/renderer/TextLayout.cpp +++ b/src/kiwano/render/TextLayout.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/renderer/TextLayout.h b/src/kiwano/render/TextLayout.h similarity index 99% rename from src/kiwano/renderer/TextLayout.h rename to src/kiwano/render/TextLayout.h index 96e0bcc8..20a44556 100644 --- a/src/kiwano/renderer/TextLayout.h +++ b/src/kiwano/render/TextLayout.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include namespace kiwano { diff --git a/src/kiwano/renderer/TextStyle.hpp b/src/kiwano/render/TextStyle.hpp similarity index 95% rename from src/kiwano/renderer/TextStyle.hpp rename to src/kiwano/render/TextStyle.hpp index 2c589d8e..4edd4385 100644 --- a/src/kiwano/renderer/TextStyle.hpp +++ b/src/kiwano/render/TextStyle.hpp @@ -19,10 +19,10 @@ // THE SOFTWARE. #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace kiwano { diff --git a/src/kiwano/renderer/Texture.cpp b/src/kiwano/render/Texture.cpp similarity index 98% rename from src/kiwano/renderer/Texture.cpp rename to src/kiwano/render/Texture.cpp index e36bf405..6e81e7f2 100644 --- a/src/kiwano/renderer/Texture.cpp +++ b/src/kiwano/render/Texture.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/renderer/Texture.h b/src/kiwano/render/Texture.h similarity index 98% rename from src/kiwano/renderer/Texture.h rename to src/kiwano/render/Texture.h index 10af5ea1..ef653f17 100644 --- a/src/kiwano/renderer/Texture.h +++ b/src/kiwano/render/Texture.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include #include namespace kiwano diff --git a/src/kiwano/renderer/TextureCache.cpp b/src/kiwano/render/TextureCache.cpp similarity index 97% rename from src/kiwano/renderer/TextureCache.cpp rename to src/kiwano/render/TextureCache.cpp index 24267c34..def284e4 100644 --- a/src/kiwano/renderer/TextureCache.cpp +++ b/src/kiwano/render/TextureCache.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 namespace kiwano diff --git a/src/kiwano/renderer/TextureCache.h b/src/kiwano/render/TextureCache.h similarity index 96% rename from src/kiwano/renderer/TextureCache.h rename to src/kiwano/render/TextureCache.h index 8ee3d7bc..d35962c9 100644 --- a/src/kiwano/renderer/TextureCache.h +++ b/src/kiwano/render/TextureCache.h @@ -19,8 +19,8 @@ // THE SOFTWARE. #pragma once -#include -#include +#include +#include namespace kiwano { diff --git a/src/kiwano/renderer/win32/D2DDeviceResources.cpp b/src/kiwano/render/dx/D2DDeviceResources.cpp similarity index 99% rename from src/kiwano/renderer/win32/D2DDeviceResources.cpp rename to src/kiwano/render/dx/D2DDeviceResources.cpp index 8cc71139..6f43cff0 100644 --- a/src/kiwano/renderer/win32/D2DDeviceResources.cpp +++ b/src/kiwano/render/dx/D2DDeviceResources.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, "d2d1.lib") diff --git a/src/kiwano/renderer/win32/D2DDeviceResources.h b/src/kiwano/render/dx/D2DDeviceResources.h similarity index 98% rename from src/kiwano/renderer/win32/D2DDeviceResources.h rename to src/kiwano/render/dx/D2DDeviceResources.h index b9f9a943..f9255b10 100644 --- a/src/kiwano/renderer/win32/D2DDeviceResources.h +++ b/src/kiwano/render/dx/D2DDeviceResources.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/src/kiwano/renderer/win32/D3D10DeviceResources.cpp b/src/kiwano/render/dx/D3D10DeviceResources.cpp similarity index 99% rename from src/kiwano/renderer/win32/D3D10DeviceResources.cpp rename to src/kiwano/render/dx/D3D10DeviceResources.cpp index 41c68968..23133963 100644 --- a/src/kiwano/renderer/win32/D3D10DeviceResources.cpp +++ b/src/kiwano/render/dx/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/renderer/win32/D3D10DeviceResources.h b/src/kiwano/render/dx/D3D10DeviceResources.h similarity index 95% rename from src/kiwano/renderer/win32/D3D10DeviceResources.h rename to src/kiwano/render/dx/D3D10DeviceResources.h index 40e3f6dc..1b89c071 100644 --- a/src/kiwano/renderer/win32/D3D10DeviceResources.h +++ b/src/kiwano/render/dx/D3D10DeviceResources.h @@ -21,8 +21,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace kiwano diff --git a/src/kiwano/renderer/win32/D3D11DeviceResources.cpp b/src/kiwano/render/dx/D3D11DeviceResources.cpp similarity index 99% rename from src/kiwano/renderer/win32/D3D11DeviceResources.cpp rename to src/kiwano/render/dx/D3D11DeviceResources.cpp index 77b2a1cc..1b2676d8 100644 --- a/src/kiwano/renderer/win32/D3D11DeviceResources.cpp +++ b/src/kiwano/render/dx/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 #pragma warning (push) diff --git a/src/kiwano/renderer/win32/D3D11DeviceResources.h b/src/kiwano/render/dx/D3D11DeviceResources.h similarity index 96% rename from src/kiwano/renderer/win32/D3D11DeviceResources.h rename to src/kiwano/render/dx/D3D11DeviceResources.h index c10cb1e0..c7cfd827 100644 --- a/src/kiwano/renderer/win32/D3D11DeviceResources.h +++ b/src/kiwano/render/dx/D3D11DeviceResources.h @@ -21,8 +21,8 @@ #pragma once #include -#include -#include +#include +#include #include namespace kiwano diff --git a/src/kiwano/renderer/win32/D3DDeviceResourcesBase.h b/src/kiwano/render/dx/D3DDeviceResourcesBase.h similarity index 100% rename from src/kiwano/renderer/win32/D3DDeviceResourcesBase.h rename to src/kiwano/render/dx/D3DDeviceResourcesBase.h diff --git a/src/kiwano/renderer/win32/FontCollectionLoader.cpp b/src/kiwano/render/dx/FontCollectionLoader.cpp similarity index 99% rename from src/kiwano/renderer/win32/FontCollectionLoader.cpp rename to src/kiwano/render/dx/FontCollectionLoader.cpp index 32788fba..37983eb4 100644 --- a/src/kiwano/renderer/win32/FontCollectionLoader.cpp +++ b/src/kiwano/render/dx/FontCollectionLoader.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/renderer/win32/FontCollectionLoader.h b/src/kiwano/render/dx/FontCollectionLoader.h similarity index 98% rename from src/kiwano/renderer/win32/FontCollectionLoader.h rename to src/kiwano/render/dx/FontCollectionLoader.h index 77236a49..78292a1d 100644 --- a/src/kiwano/renderer/win32/FontCollectionLoader.h +++ b/src/kiwano/render/dx/FontCollectionLoader.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include namespace kiwano { diff --git a/src/kiwano/renderer/win32/TextRenderer.cpp b/src/kiwano/render/dx/TextRenderer.cpp similarity index 99% rename from src/kiwano/renderer/win32/TextRenderer.cpp rename to src/kiwano/render/dx/TextRenderer.cpp index 192736f4..27af9b9d 100644 --- a/src/kiwano/renderer/win32/TextRenderer.cpp +++ b/src/kiwano/render/dx/TextRenderer.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/renderer/win32/TextRenderer.h b/src/kiwano/render/dx/TextRenderer.h similarity index 96% rename from src/kiwano/renderer/win32/TextRenderer.h rename to src/kiwano/render/dx/TextRenderer.h index 873ddb06..fd7126e8 100644 --- a/src/kiwano/renderer/win32/TextRenderer.h +++ b/src/kiwano/render/dx/TextRenderer.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include namespace kiwano { diff --git a/src/kiwano/renderer/win32/helper.h b/src/kiwano/render/dx/helper.h similarity index 99% rename from src/kiwano/renderer/win32/helper.h rename to src/kiwano/render/dx/helper.h index b6c8b908..08999243 100644 --- a/src/kiwano/renderer/win32/helper.h +++ b/src/kiwano/render/dx/helper.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/utils/LocalStorage.h b/src/kiwano/utils/LocalStorage.h index d30b054c..b7341d9f 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/utils/ResourceCache.h b/src/kiwano/utils/ResourceCache.h index d2415091..37e7cec2 100644 --- a/src/kiwano/utils/ResourceCache.h +++ b/src/kiwano/utils/ResourceCache.h @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include <3rd-party/pugixml/pugixml.hpp> namespace kiwano diff --git a/src/kiwano/utils/UserData.h b/src/kiwano/utils/UserData.h index 904eb78f..1ef27bf9 100644 --- a/src/kiwano/utils/UserData.h +++ b/src/kiwano/utils/UserData.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include namespace kiwano {