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

tidy

This commit is contained in:
Nomango 2020-01-17 16:55:47 +08:00
parent 297e028779
commit 1e12296181
99 changed files with 326 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
projects/kiwano/kiwano.vcxproj
View File

@ -12,15 +12,17 @@
<ClInclude Include="..\..\src\kiwano\2d\Button.h" />
<ClInclude Include="..\..\src\kiwano\2d\Frame.h" />
<ClInclude Include="..\..\src\kiwano\2d\GifSprite.h" />
<ClInclude Include="..\..\src\kiwano\core\common.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\Keys.h" />
<ClInclude Include="..\..\src\kiwano\core\Library.h" />
<ClInclude Include="..\..\src\kiwano\core\Singleton.h" />
<ClInclude Include="..\..\src\kiwano\core\Time.h" />
<ClInclude Include="..\..\src\kiwano\kiwano.h" />
<ClInclude Include="..\..\src\kiwano\config.h" />
<ClInclude Include="..\..\src\kiwano\macros.h" />
@ -39,7 +41,6 @@
<ClInclude Include="..\..\src\kiwano\core\Component.h" />
<ClInclude Include="..\..\src\kiwano\core\EventDispatcher.h" />
<ClInclude Include="..\..\src\kiwano\core\EventListener.h" />
<ClInclude Include="..\..\src\kiwano\core\keys.h" />
<ClInclude Include="..\..\src\kiwano\core\Logger.h" />
<ClInclude Include="..\..\src\kiwano\core\ObjectBase.h" />
<ClInclude Include="..\..\src\kiwano\core\RefCounter.h" />
@ -47,7 +48,6 @@
<ClInclude Include="..\..\src\kiwano\core\SmartPtr.hpp" />
<ClInclude Include="..\..\src\kiwano\core\Timer.h" />
<ClInclude Include="..\..\src\kiwano\core\TimerManager.h" />
<ClInclude Include="..\..\src\kiwano\core\time.h" />
<ClInclude Include="..\..\src\kiwano\math\constants.h" />
<ClInclude Include="..\..\src\kiwano\math\ease.h" />
<ClInclude Include="..\..\src\kiwano\math\math.h" />
@ -63,27 +63,27 @@
<ClInclude Include="..\..\src\kiwano\platform\win32\helper.h" />
<ClInclude Include="..\..\src\kiwano\platform\win32\libraries.h" />
<ClInclude Include="..\..\src\kiwano\platform\Window.h" />
<ClInclude Include="..\..\src\kiwano\renderer\Brush.h" />
<ClInclude Include="..\..\src\kiwano\renderer\Color.h" />
<ClInclude Include="..\..\src\kiwano\renderer\Font.h" />
<ClInclude Include="..\..\src\kiwano\renderer\Geometry.h" />
<ClInclude Include="..\..\src\kiwano\renderer\GeometrySink.h" />
<ClInclude Include="..\..\src\kiwano\renderer\GifImage.h" />
<ClInclude Include="..\..\src\kiwano\renderer\StrokeStyle.h" />
<ClInclude Include="..\..\src\kiwano\renderer\TextStyle.hpp" />
<ClInclude Include="..\..\src\kiwano\renderer\Texture.h" />
<ClInclude Include="..\..\src\kiwano\renderer\TextureCache.h" />
<ClInclude Include="..\..\src\kiwano\renderer\LayerArea.h" />
<ClInclude Include="..\..\src\kiwano\renderer\Renderer.h" />
<ClInclude Include="..\..\src\kiwano\renderer\RenderContext.h" />
<ClInclude Include="..\..\src\kiwano\renderer\TextLayout.h" />
<ClInclude Include="..\..\src\kiwano\renderer\win32\D2DDeviceResources.h" />
<ClInclude Include="..\..\src\kiwano\renderer\win32\D3D10DeviceResources.h" />
<ClInclude Include="..\..\src\kiwano\renderer\win32\D3D11DeviceResources.h" />
<ClInclude Include="..\..\src\kiwano\renderer\win32\D3DDeviceResourcesBase.h" />
<ClInclude Include="..\..\src\kiwano\renderer\win32\FontCollectionLoader.h" />
<ClInclude Include="..\..\src\kiwano\renderer\win32\helper.h" />
<ClInclude Include="..\..\src\kiwano\renderer\win32\TextRenderer.h" />
<ClInclude Include="..\..\src\kiwano\render\Brush.h" />
<ClInclude Include="..\..\src\kiwano\render\Color.h" />
<ClInclude Include="..\..\src\kiwano\render\dx\D2DDeviceResources.h" />
<ClInclude Include="..\..\src\kiwano\render\dx\D3D10DeviceResources.h" />
<ClInclude Include="..\..\src\kiwano\render\dx\D3D11DeviceResources.h" />
<ClInclude Include="..\..\src\kiwano\render\dx\D3DDeviceResourcesBase.h" />
<ClInclude Include="..\..\src\kiwano\render\dx\FontCollectionLoader.h" />
<ClInclude Include="..\..\src\kiwano\render\dx\helper.h" />
<ClInclude Include="..\..\src\kiwano\render\dx\TextRenderer.h" />
<ClInclude Include="..\..\src\kiwano\render\Font.h" />
<ClInclude Include="..\..\src\kiwano\render\Geometry.h" />
<ClInclude Include="..\..\src\kiwano\render\GeometrySink.h" />
<ClInclude Include="..\..\src\kiwano\render\GifImage.h" />
<ClInclude Include="..\..\src\kiwano\render\LayerArea.h" />
<ClInclude Include="..\..\src\kiwano\render\RenderContext.h" />
<ClInclude Include="..\..\src\kiwano\render\Renderer.h" />
<ClInclude Include="..\..\src\kiwano\render\StrokeStyle.h" />
<ClInclude Include="..\..\src\kiwano\render\TextLayout.h" />
<ClInclude Include="..\..\src\kiwano\render\TextStyle.hpp" />
<ClInclude Include="..\..\src\kiwano\render\Texture.h" />
<ClInclude Include="..\..\src\kiwano\render\TextureCache.h" />
<ClInclude Include="..\..\src\kiwano\utils\LocalStorage.h" />
<ClInclude Include="..\..\src\kiwano\utils\ResourceCache.h" />
<ClInclude Include="..\..\src\kiwano\utils\UserData.h" />
@ -124,9 +124,9 @@
<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\Time.cpp" />
<ClCompile Include="..\..\src\kiwano\core\Timer.cpp" />
<ClCompile Include="..\..\src\kiwano\core\TimerManager.cpp" />
<ClCompile Include="..\..\src\kiwano\core\time.cpp" />
<ClCompile Include="..\..\src\kiwano\platform\Application.cpp" />
<ClCompile Include="..\..\src\kiwano\platform\FileSystem.cpp" />
<ClCompile Include="..\..\src\kiwano\platform\Input.cpp" />
@ -134,24 +134,24 @@
<ClCompile Include="..\..\src\kiwano\platform\win32\StackWalker.cpp" />
<ClCompile Include="..\..\src\kiwano\platform\win32\WindowImpl.cpp" />
<ClCompile Include="..\..\src\kiwano\platform\Window.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\Brush.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\Color.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\Font.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\Geometry.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\GeometrySink.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\GifImage.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\StrokeStyle.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\Texture.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\TextureCache.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\LayerArea.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\Renderer.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\RenderContext.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\TextLayout.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\win32\D2DDeviceResources.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\win32\D3D10DeviceResources.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\win32\D3D11DeviceResources.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\win32\FontCollectionLoader.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\win32\TextRenderer.cpp" />
<ClCompile Include="..\..\src\kiwano\render\Brush.cpp" />
<ClCompile Include="..\..\src\kiwano\render\Color.cpp" />
<ClCompile Include="..\..\src\kiwano\render\dx\D2DDeviceResources.cpp" />
<ClCompile Include="..\..\src\kiwano\render\dx\D3D10DeviceResources.cpp" />
<ClCompile Include="..\..\src\kiwano\render\dx\D3D11DeviceResources.cpp" />
<ClCompile Include="..\..\src\kiwano\render\dx\FontCollectionLoader.cpp" />
<ClCompile Include="..\..\src\kiwano\render\dx\TextRenderer.cpp" />
<ClCompile Include="..\..\src\kiwano\render\Font.cpp" />
<ClCompile Include="..\..\src\kiwano\render\Geometry.cpp" />
<ClCompile Include="..\..\src\kiwano\render\GeometrySink.cpp" />
<ClCompile Include="..\..\src\kiwano\render\GifImage.cpp" />
<ClCompile Include="..\..\src\kiwano\render\LayerArea.cpp" />
<ClCompile Include="..\..\src\kiwano\render\RenderContext.cpp" />
<ClCompile Include="..\..\src\kiwano\render\Renderer.cpp" />
<ClCompile Include="..\..\src\kiwano\render\StrokeStyle.cpp" />
<ClCompile Include="..\..\src\kiwano\render\TextLayout.cpp" />
<ClCompile Include="..\..\src\kiwano\render\Texture.cpp" />
<ClCompile Include="..\..\src\kiwano\render\TextureCache.cpp" />
<ClCompile Include="..\..\src\kiwano\utils\LocalStorage.cpp" />
<ClCompile Include="..\..\src\kiwano\utils\ResourceCache.cpp" />
<ClCompile Include="..\..\src\kiwano\utils\UserData.cpp" />

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

@ -16,21 +16,21 @@
<Filter Include="core">
<UniqueIdentifier>{2e18d99a-e906-499a-9e29-4e0783202644}</UniqueIdentifier>
</Filter>
<Filter Include="renderer">
<UniqueIdentifier>{7897afce-24cb-42b4-9443-56508e4ec89c}</UniqueIdentifier>
</Filter>
<Filter Include="2d\action">
<UniqueIdentifier>{9314f30d-5742-48b6-94e5-e3b4284106f6}</UniqueIdentifier>
</Filter>
<Filter Include="renderer\win32">
<UniqueIdentifier>{30333461-e9bc-4709-84bd-ce6e0e1a3079}</UniqueIdentifier>
</Filter>
<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\dx">
<UniqueIdentifier>{fd281702-0006-46d2-8fd1-28c502464164}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\kiwano\2d\Canvas.h">
@ -57,9 +57,6 @@
<ClInclude Include="..\..\src\kiwano\core\Resource.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\time.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\math\Matrix.hpp">
<Filter>math</Filter>
</ClInclude>
@ -147,60 +144,9 @@
<ClInclude Include="..\..\src\kiwano\core\ObjectBase.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\Color.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\Font.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\Geometry.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\GifImage.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\LayerArea.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\Renderer.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\TextLayout.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\win32\D2DDeviceResources.h">
<Filter>renderer\win32</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\win32\D3D10DeviceResources.h">
<Filter>renderer\win32</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\win32\D3D11DeviceResources.h">
<Filter>renderer\win32</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\win32\D3DDeviceResourcesBase.h">
<Filter>renderer\win32</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\win32\FontCollectionLoader.h">
<Filter>renderer\win32</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\win32\TextRenderer.h">
<Filter>renderer\win32</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\2d\Transform.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\Texture.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\TextureCache.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\StrokeStyle.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\Brush.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\math\constants.h">
<Filter>math</Filter>
</ClInclude>
@ -222,9 +168,6 @@
<ClInclude Include="..\..\src\kiwano\platform\FileSystem.h">
<Filter>platform</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\keys.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\platform\Input.h">
<Filter>platform</Filter>
</ClInclude>
@ -234,21 +177,9 @@
<ClInclude Include="..\..\src\kiwano\2d\TextActor.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\common.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\RefCounter.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\TextStyle.hpp">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\win32\helper.h">
<Filter>renderer\win32</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\GeometrySink.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\platform\win32\ComPtr.hpp">
<Filter>platform\win32</Filter>
</ClInclude>
@ -276,15 +207,84 @@
<ClInclude Include="..\..\src\kiwano\2d\Button.h">
<Filter>2d</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\renderer\RenderContext.h">
<Filter>renderer</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\Director.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\Singleton.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\Common.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\Keys.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\core\Time.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\dx\D2DDeviceResources.h">
<Filter>render\dx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\dx\D3D10DeviceResources.h">
<Filter>render\dx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\dx\D3D11DeviceResources.h">
<Filter>render\dx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\dx\D3DDeviceResourcesBase.h">
<Filter>render\dx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\dx\FontCollectionLoader.h">
<Filter>render\dx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\dx\helper.h">
<Filter>render\dx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\dx\TextRenderer.h">
<Filter>render\dx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\Brush.h">
<Filter>render</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\Color.h">
<Filter>render</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\Font.h">
<Filter>render</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\Geometry.h">
<Filter>render</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\GeometrySink.h">
<Filter>render</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\GifImage.h">
<Filter>render</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\LayerArea.h">
<Filter>render</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\RenderContext.h">
<Filter>render</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\Renderer.h">
<Filter>render</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\StrokeStyle.h">
<Filter>render</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\TextLayout.h">
<Filter>render</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\TextStyle.hpp">
<Filter>render</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\Texture.h">
<Filter>render</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\render\TextureCache.h">
<Filter>render</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\kiwano\2d\Canvas.cpp">
@ -308,9 +308,6 @@
<ClCompile Include="..\..\src\kiwano\core\Resource.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\core\time.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\platform\Application.cpp">
<Filter>platform</Filter>
</ClCompile>
@ -374,54 +371,9 @@
<ClCompile Include="..\..\src\kiwano\core\ObjectBase.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\Color.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\Font.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\Geometry.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\GifImage.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\LayerArea.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\Renderer.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\TextLayout.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\win32\D2DDeviceResources.cpp">
<Filter>renderer\win32</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\win32\D3D10DeviceResources.cpp">
<Filter>renderer\win32</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\win32\D3D11DeviceResources.cpp">
<Filter>renderer\win32</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\win32\FontCollectionLoader.cpp">
<Filter>renderer\win32</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\win32\TextRenderer.cpp">
<Filter>renderer\win32</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\2d\Transform.cpp">
<Filter>2d</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\Texture.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\TextureCache.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\Brush.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\core\Component.cpp">
<Filter>core</Filter>
</ClCompile>
@ -449,9 +401,6 @@
<ClCompile Include="..\..\src\kiwano\core\RefCounter.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\GeometrySink.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\platform\win32\libraries.cpp">
<Filter>platform\win32</Filter>
</ClCompile>
@ -473,17 +422,68 @@
<ClCompile Include="..\..\src\kiwano\2d\Button.cpp">
<Filter>2d</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\StrokeStyle.cpp">
<Filter>renderer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\renderer\RenderContext.cpp">
<Filter>renderer</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>
<ClCompile Include="..\..\src\kiwano\core\Time.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\dx\D2DDeviceResources.cpp">
<Filter>render\dx</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\dx\D3D10DeviceResources.cpp">
<Filter>render\dx</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\dx\D3D11DeviceResources.cpp">
<Filter>render\dx</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\dx\FontCollectionLoader.cpp">
<Filter>render\dx</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\dx\TextRenderer.cpp">
<Filter>render\dx</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\Brush.cpp">
<Filter>render</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\Color.cpp">
<Filter>render</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\Font.cpp">
<Filter>render</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\Geometry.cpp">
<Filter>render</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\GeometrySink.cpp">
<Filter>render</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\GifImage.cpp">
<Filter>render</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\LayerArea.cpp">
<Filter>render</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\RenderContext.cpp">
<Filter>render</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\Renderer.cpp">
<Filter>render</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\StrokeStyle.cpp">
<Filter>render</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\TextLayout.cpp">
<Filter>render</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\Texture.cpp">
<Filter>render</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\render\TextureCache.cpp">
<Filter>render</Filter>
</ClCompile>
</ItemGroup>
</Project>

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

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/common.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/Component.h>
#include <kiwano-audio/Transcoder.h>
#include <kiwano-audio/Sound.h>

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

@ -23,7 +23,7 @@
#endif
#include <kiwano/macros.h>
#include <kiwano/core/common.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/Resource.h>
#include <kiwano/core/Logger.h>
#include <kiwano/platform/win32/ComPtr.hpp>

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

@ -1,11 +1,11 @@
// Copyright (C) 2019 Nomango
#include <kiwano/core/common.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/event/KeyEvent.h>
#include <kiwano/core/event/MouseEvent.h>
#include <kiwano/platform/Window.h>
#include <kiwano/platform/Input.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/Renderer.h>
#include <kiwano-imgui/ImGuiModule.h>
#include <kiwano-imgui/imgui_impl.h>

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

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/common.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/Component.h>
namespace kiwano

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

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/common.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/Component.h>
#include <mutex>
#include <condition_variable>

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

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/common.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/core/SmartPtr.hpp>

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

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

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

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/math/math.h>
#include <kiwano/core/time.h>
#include <kiwano/core/Time.h>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/core/TimerManager.h>
#include <kiwano/core/EventDispatcher.h>

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

@ -20,7 +20,7 @@
#include <kiwano/2d/Canvas.h>
#include <kiwano/core/Logger.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/Renderer.h>
namespace kiwano
{

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

@ -20,8 +20,8 @@
#pragma once
#include <kiwano/2d/Actor.h>
#include <kiwano/renderer/RenderContext.h>
#include <kiwano/renderer/GeometrySink.h>
#include <kiwano/render/RenderContext.h>
#include <kiwano/render/GeometrySink.h>
namespace kiwano
{

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

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

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

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/2d/Actor.h>
#include <kiwano/renderer/TextLayout.h>
#include <kiwano/render/TextLayout.h>
namespace kiwano
{

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

@ -19,7 +19,7 @@
// THE SOFTWARE.
#include <kiwano/2d/Frame.h>
#include <kiwano/renderer/TextureCache.h>
#include <kiwano/render/TextureCache.h>
namespace kiwano
{

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

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

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

@ -19,8 +19,8 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/common.h>
#include <kiwano/core/time.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/Time.h>
#include <kiwano/2d/Frame.h>
namespace kiwano

4
src/kiwano/2d/GifSprite.cpp
View File

@ -19,8 +19,8 @@
// THE SOFTWARE.
#include <kiwano/2d/GifSprite.h>
#include <kiwano/renderer/TextureCache.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/TextureCache.h>
#include <kiwano/render/Renderer.h>
namespace kiwano
{

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

@ -21,8 +21,8 @@
#pragma once
#include <kiwano/2d/Actor.h>
#include <kiwano/core/Resource.h>
#include <kiwano/renderer/RenderContext.h>
#include <kiwano/renderer/GifImage.h>
#include <kiwano/render/RenderContext.h>
#include <kiwano/render/GifImage.h>
namespace kiwano
{

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

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/2d/Layer.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/Renderer.h>
namespace kiwano
{

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

@ -20,8 +20,8 @@
#pragma once
#include <kiwano/2d/Actor.h>
#include <kiwano/renderer/LayerArea.h>
#include <kiwano/renderer/RenderContext.h>
#include <kiwano/render/LayerArea.h>
#include <kiwano/render/RenderContext.h>
namespace kiwano
{

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

@ -20,7 +20,7 @@
#include <kiwano/2d/ShapeActor.h>
#include <kiwano/core/Logger.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/Renderer.h>
namespace kiwano
{

8
src/kiwano/2d/ShapeActor.h
View File

@ -20,10 +20,10 @@
#pragma once
#include <kiwano/2d/Actor.h>
#include <kiwano/renderer/Brush.h>
#include <kiwano/renderer/Geometry.h>
#include <kiwano/renderer/GeometrySink.h>
#include <kiwano/renderer/StrokeStyle.h>
#include <kiwano/render/Brush.h>
#include <kiwano/render/Geometry.h>
#include <kiwano/render/GeometrySink.h>
#include <kiwano/render/StrokeStyle.h>
namespace kiwano
{

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

@ -19,7 +19,7 @@
// THE SOFTWARE.
#include <kiwano/2d/Sprite.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/Renderer.h>
namespace kiwano
{

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

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

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

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/2d/Actor.h>
#include <kiwano/renderer/Brush.h>
#include <kiwano/render/Brush.h>
namespace kiwano
{

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

@ -20,7 +20,7 @@
#include <kiwano/2d/TextActor.h>
#include <kiwano/core/Logger.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/Renderer.h>
namespace kiwano
{

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

@ -20,8 +20,8 @@
#pragma once
#include <kiwano/2d/Actor.h>
#include <kiwano/renderer/Color.h>
#include <kiwano/renderer/TextLayout.h>
#include <kiwano/render/Color.h>
#include <kiwano/render/TextLayout.h>
namespace kiwano
{

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

@ -23,7 +23,7 @@
#include <kiwano/2d/Stage.h>
#include <kiwano/platform/Window.h>
#include <kiwano/core/Logger.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/Renderer.h>
namespace kiwano
{

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

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/2d/Stage.h>
#include <kiwano/renderer/LayerArea.h>
#include <kiwano/render/LayerArea.h>
namespace kiwano
{

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

@ -19,8 +19,8 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/common.h>
#include <kiwano/core/time.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/Time.h>
#include <kiwano/core/SmartPtr.hpp>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/math/math.h>

4
src/kiwano/2d/action/ActionWalk.h
View File

@ -20,8 +20,8 @@
#pragma once
#include <kiwano/2d/action/ActionTween.h>
#include <kiwano/renderer/Geometry.h>
#include <kiwano/renderer/GeometrySink.h>
#include <kiwano/render/Geometry.h>
#include <kiwano/render/GeometrySink.h>
namespace kiwano
{

0
src/kiwano/core/common.h → src/kiwano/core/Common.h
View File

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

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

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

@ -23,7 +23,7 @@
#include <kiwano/2d/Stage.h>
#include <kiwano/2d/Transition.h>
#include <kiwano/2d/DebugActor.h>
#include <kiwano/renderer/RenderContext.h>
#include <kiwano/render/RenderContext.h>
namespace kiwano
{

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

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/common.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/SmartPtr.hpp>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/core/event/Event.h>

0
src/kiwano/core/keys.h → src/kiwano/core/Keys.h
View File

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

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

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

@ -22,7 +22,7 @@
#include <iomanip>
#include <sstream>
#include <kiwano/macros.h>
#include <kiwano/core/common.h>
#include <kiwano/core/Common.h>
#ifndef KGE_SYS_LOG
# ifdef KGE_DEBUG

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

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/macros.h>
#include <kiwano/core/common.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/RefCounter.h>
#include <kiwano/core/SmartPtr.hpp>

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

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

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

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

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

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/common.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/RefCounter.h>
namespace kiwano

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

@ -21,7 +21,7 @@
#include <regex>
#include <unordered_map>
#include <kiwano/core/time.h>
#include <kiwano/core/Time.h>
#include <kiwano/core/Logger.h>
namespace kiwano

2
src/kiwano/core/time.h → src/kiwano/core/Time.h
View File

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

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

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

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

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

2
src/kiwano/core/event/EventType.h
View File

@ -21,7 +21,7 @@
#pragma once
#include <typeinfo>
#include <typeindex>
#include <kiwano/core/common.h>
#include <kiwano/core/Common.h>
namespace kiwano
{

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

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

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

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

22
src/kiwano/kiwano.h
View File

@ -44,8 +44,8 @@
// core
//
#include <kiwano/core/common.h>
#include <kiwano/core/time.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/Time.h>
#include <kiwano/core/Logger.h>
#include <kiwano/core/SmartPtr.hpp>
#include <kiwano/core/ObjectBase.h>
@ -66,15 +66,15 @@
// renderer
//
#include <kiwano/renderer/Color.h>
#include <kiwano/renderer/Font.h>
#include <kiwano/renderer/Texture.h>
#include <kiwano/renderer/GifImage.h>
#include <kiwano/renderer/TextLayout.h>
#include <kiwano/renderer/Geometry.h>
#include <kiwano/renderer/LayerArea.h>
#include <kiwano/renderer/TextureCache.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/Color.h>
#include <kiwano/render/Font.h>
#include <kiwano/render/Texture.h>
#include <kiwano/render/GifImage.h>
#include <kiwano/render/TextLayout.h>
#include <kiwano/render/Geometry.h>
#include <kiwano/render/LayerArea.h>
#include <kiwano/render/TextureCache.h>
#include <kiwano/render/Renderer.h>
//

2
src/kiwano/math/math.h
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/common.h>
#include <kiwano/core/Common.h>
#include <kiwano/math/constants.h>
#include <kiwano/math/ease.h>
#include <kiwano/math/scalar.h>

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

@ -23,7 +23,7 @@
#include <kiwano/platform/Input.h>
#include <kiwano/core/Director.h>
#include <kiwano/core/Logger.h>
#include <kiwano/renderer/TextureCache.h>
#include <kiwano/render/TextureCache.h>
#include <kiwano/utils/ResourceCache.h>
namespace kiwano

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

@ -19,15 +19,15 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/common.h>
#include <kiwano/core/time.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/Time.h>
#include <kiwano/core/Component.h>
#include <kiwano/core/event/Event.h>
#include <kiwano/core/event/MouseEvent.h>
#include <kiwano/core/event/KeyEvent.h>
#include <kiwano/core/event/WindowEvent.h>
#include <kiwano/platform/Window.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/Renderer.h>
namespace kiwano
{

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

@ -21,7 +21,7 @@
#pragma once
#include <kiwano/macros.h>
#include <kiwano/math/math.h>
#include <kiwano/core/common.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/event/Event.h>
#include <kiwano/core/Component.h>

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

@ -21,7 +21,7 @@
#pragma once
#include <kiwano/macros.h>
#include <kiwano/math/math.h>
#include <kiwano/core/common.h>
#include <kiwano/core/Common.h>
#include <kiwano/core/event/Event.h>
namespace kiwano

2
src/kiwano/platform/win32/ComPtr.hpp
View File

@ -20,7 +20,7 @@
#pragma once
#include <type_traits>
#include <kiwano/core/common.h>
#include <kiwano/core/Common.h>
#include <Unknwnbase.h>
namespace kiwano

4
src/kiwano/renderer/Brush.cpp → src/kiwano/render/Brush.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/renderer/Brush.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/Brush.h>
#include <kiwano/render/Renderer.h>
#include <kiwano/core/Logger.h>
namespace kiwano

2
src/kiwano/renderer/Brush.h → src/kiwano/render/Brush.h
View File

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/core/ObjectBase.h>
#include <kiwano/renderer/win32/D2DDeviceResources.h>
#include <kiwano/render/dx/D2DDeviceResources.h>
namespace kiwano
{

2
src/kiwano/renderer/Color.cpp → src/kiwano/render/Color.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/renderer/Color.h>
#include <kiwano/render/Color.h>
namespace kiwano
{

2
src/kiwano/renderer/Color.h → src/kiwano/render/Color.h
View File

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

4
src/kiwano/renderer/Font.cpp → src/kiwano/render/Font.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/renderer/Font.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/Font.h>
#include <kiwano/render/Renderer.h>
namespace kiwano
{

0
src/kiwano/renderer/Font.h → src/kiwano/render/Font.h
View File

6
src/kiwano/renderer/Geometry.cpp → src/kiwano/render/Geometry.cpp
View File

@ -18,9 +18,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <kiwano/renderer/Geometry.h>
#include <kiwano/renderer/GeometrySink.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/Geometry.h>
#include <kiwano/render/GeometrySink.h>
#include <kiwano/render/Renderer.h>
namespace kiwano
{

2
src/kiwano/renderer/Geometry.h → src/kiwano/render/Geometry.h
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/renderer/win32/D2DDeviceResources.h>
#include <kiwano/render/dx/D2DDeviceResources.h>
namespace kiwano
{

4
src/kiwano/renderer/GeometrySink.cpp → src/kiwano/render/GeometrySink.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/renderer/GeometrySink.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/GeometrySink.h>
#include <kiwano/render/Renderer.h>
namespace kiwano
{

2
src/kiwano/renderer/GeometrySink.h → src/kiwano/render/GeometrySink.h
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/renderer/Geometry.h>
#include <kiwano/render/Geometry.h>
namespace kiwano
{

4
src/kiwano/renderer/GifImage.cpp → src/kiwano/render/GifImage.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/renderer/GifImage.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/GifImage.h>
#include <kiwano/render/Renderer.h>
#include <kiwano/core/Logger.h>
namespace kiwano

4
src/kiwano/renderer/GifImage.h → src/kiwano/render/GifImage.h
View File

@ -19,8 +19,8 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/renderer/Texture.h>
#include <kiwano/core/time.h>
#include <kiwano/render/Texture.h>
#include <kiwano/core/Time.h>
namespace kiwano
{

2
src/kiwano/renderer/LayerArea.cpp → src/kiwano/render/LayerArea.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/renderer/LayerArea.h>
#include <kiwano/render/LayerArea.h>
namespace kiwano
{

2
src/kiwano/renderer/LayerArea.h → src/kiwano/render/LayerArea.h
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/renderer/Geometry.h>
#include <kiwano/render/Geometry.h>
namespace kiwano
{

2
src/kiwano/renderer/RenderContext.cpp → src/kiwano/render/RenderContext.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/renderer/RenderContext.h>
#include <kiwano/render/RenderContext.h>
#include <kiwano/core/Logger.h>
namespace kiwano

14
src/kiwano/renderer/RenderContext.h → src/kiwano/render/RenderContext.h
View File

@ -19,14 +19,14 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/core/time.h>
#include <kiwano/core/Time.h>
#include <kiwano/core/ObjectBase.h>
#include <kiwano/renderer/Brush.h>
#include <kiwano/renderer/Texture.h>
#include <kiwano/renderer/Geometry.h>
#include <kiwano/renderer/TextLayout.h>
#include <kiwano/renderer/LayerArea.h>
#include <kiwano/renderer/win32/TextRenderer.h>
#include <kiwano/render/Brush.h>
#include <kiwano/render/Texture.h>
#include <kiwano/render/Geometry.h>
#include <kiwano/render/TextLayout.h>
#include <kiwano/render/LayerArea.h>
#include <kiwano/render/dx/TextRenderer.h>
namespace kiwano
{

4
src/kiwano/renderer/Renderer.cpp → src/kiwano/render/Renderer.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/renderer/Renderer.h>
#include <kiwano/renderer/GeometrySink.h>
#include <kiwano/render/Renderer.h>
#include <kiwano/render/GeometrySink.h>
#include <kiwano/core/event/WindowEvent.h>
#include <kiwano/core/Logger.h>
#include <kiwano/platform/FileSystem.h>

14
src/kiwano/renderer/Renderer.h → src/kiwano/render/Renderer.h
View File

@ -20,17 +20,17 @@
#pragma once
#include <kiwano/core/Component.h>
#include <kiwano/renderer/win32/FontCollectionLoader.h>
#include <kiwano/renderer/RenderContext.h>
#include <kiwano/renderer/GifImage.h>
#include <kiwano/renderer/Font.h>
#include <kiwano/renderer/TextStyle.hpp>
#include <kiwano/render/dx/FontCollectionLoader.h>
#include <kiwano/render/RenderContext.h>
#include <kiwano/render/GifImage.h>
#include <kiwano/render/Font.h>
#include <kiwano/render/TextStyle.hpp>
#include <kiwano/platform/Window.h>
#if defined(KGE_USE_DIRECTX10)
# include "win32/D3D10DeviceResources.h"
# include <kiwano/render/dx/D3D10DeviceResources.h>
#else
# include "win32/D3D11DeviceResources.h"
# include <kiwano/render/dx/D3D11DeviceResources.h>
#endif
namespace kiwano

4
src/kiwano/renderer/StrokeStyle.cpp → src/kiwano/render/StrokeStyle.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/renderer/StrokeStyle.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/StrokeStyle.h>
#include <kiwano/render/Renderer.h>
namespace kiwano
{

2
src/kiwano/renderer/StrokeStyle.h → src/kiwano/render/StrokeStyle.h
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/renderer/win32/D2DDeviceResources.h>
#include <kiwano/render/dx/D2DDeviceResources.h>
namespace kiwano
{

4
src/kiwano/renderer/TextLayout.cpp → src/kiwano/render/TextLayout.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/renderer/TextLayout.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/TextLayout.h>
#include <kiwano/render/Renderer.h>
namespace kiwano
{

2
src/kiwano/renderer/TextLayout.h → src/kiwano/render/TextLayout.h
View File

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/math/math.h>
#include <kiwano/renderer/TextStyle.hpp>
#include <kiwano/render/TextStyle.hpp>
namespace kiwano
{

8
src/kiwano/renderer/TextStyle.hpp → src/kiwano/render/TextStyle.hpp
View File

@ -19,10 +19,10 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/renderer/Color.h>
#include <kiwano/renderer/Font.h>
#include <kiwano/renderer/Brush.h>
#include <kiwano/renderer/StrokeStyle.h>
#include <kiwano/render/Color.h>
#include <kiwano/render/Font.h>
#include <kiwano/render/Brush.h>
#include <kiwano/render/StrokeStyle.h>
namespace kiwano
{

4
src/kiwano/renderer/Texture.cpp → src/kiwano/render/Texture.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/renderer/Texture.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/Texture.h>
#include <kiwano/render/Renderer.h>
namespace kiwano
{

2
src/kiwano/renderer/Texture.h → src/kiwano/render/Texture.h
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/renderer/win32/D2DDeviceResources.h>
#include <kiwano/render/dx/D2DDeviceResources.h>
#include <kiwano/core/ObjectBase.h>
namespace kiwano

4
src/kiwano/renderer/TextureCache.cpp → src/kiwano/render/TextureCache.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/renderer/TextureCache.h>
#include <kiwano/renderer/Renderer.h>
#include <kiwano/render/TextureCache.h>
#include <kiwano/render/Renderer.h>
#include <kiwano/core/Logger.h>
namespace kiwano

4
src/kiwano/renderer/TextureCache.h → src/kiwano/render/TextureCache.h
View File

@ -19,8 +19,8 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/renderer/Texture.h>
#include <kiwano/renderer/GifImage.h>
#include <kiwano/render/Texture.h>
#include <kiwano/render/GifImage.h>
namespace kiwano
{

2
src/kiwano/renderer/win32/D2DDeviceResources.cpp → src/kiwano/render/dx/D2DDeviceResources.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/renderer/win32/D2DDeviceResources.h>
#include <kiwano/render/dx/D2DDeviceResources.h>
#include <kiwano/core/Logger.h>
#pragma comment(lib, "d2d1.lib")

2
src/kiwano/renderer/win32/D2DDeviceResources.h → src/kiwano/render/dx/D2DDeviceResources.h
View File

@ -20,7 +20,7 @@
#pragma once
#include <kiwano/core/Resource.h>
#include <kiwano/renderer/win32/helper.h>
#include <kiwano/render/dx/helper.h>
#include <dwrite.h>
#include <d2d1.h>
#include <d2d1_1.h>

2
src/kiwano/renderer/win32/D3D10DeviceResources.cpp → src/kiwano/render/dx/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/renderer/win32/D3D10DeviceResources.h>
#include <kiwano/render/dx/D3D10DeviceResources.h>
#include <kiwano/core/Logger.h>
#pragma comment(lib, "d3d10_1.lib")

4
src/kiwano/renderer/win32/D3D10DeviceResources.h → src/kiwano/render/dx/D3D10DeviceResources.h
View File

@ -21,8 +21,8 @@
#pragma once
#include <kiwano/macros.h>
#include <kiwano/renderer/win32/helper.h>
#include <kiwano/renderer/win32/D3DDeviceResourcesBase.h>
#include <kiwano/render/dx/helper.h>
#include <kiwano/render/dx/D3DDeviceResourcesBase.h>
#include <d3d10_1.h>
namespace kiwano

2
src/kiwano/renderer/win32/D3D11DeviceResources.cpp → src/kiwano/render/dx/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/renderer/win32/D3D11DeviceResources.h>
#include <kiwano/render/dx/D3D11DeviceResources.h>
#include <kiwano/core/Logger.h>
#pragma warning (push)

4
src/kiwano/renderer/win32/D3D11DeviceResources.h → src/kiwano/render/dx/D3D11DeviceResources.h
View File

@ -21,8 +21,8 @@
#pragma once
#include <kiwano/macros.h>
#include <kiwano/renderer/win32/helper.h>
#include <kiwano/renderer/win32/D3DDeviceResourcesBase.h>
#include <kiwano/render/dx/helper.h>
#include <kiwano/render/dx/D3DDeviceResourcesBase.h>
#include <d3d11.h>
namespace kiwano

0
src/kiwano/renderer/win32/D3DDeviceResourcesBase.h → src/kiwano/render/dx/D3DDeviceResourcesBase.h
View File

2
src/kiwano/renderer/win32/FontCollectionLoader.cpp → src/kiwano/render/dx/FontCollectionLoader.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/renderer/win32/FontCollectionLoader.h>
#include <kiwano/render/dx/FontCollectionLoader.h>
namespace kiwano
{

2
src/kiwano/renderer/win32/FontCollectionLoader.h → src/kiwano/render/dx/FontCollectionLoader.h
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/renderer/win32/D2DDeviceResources.h>
#include <kiwano/render/dx/D2DDeviceResources.h>
namespace kiwano
{

2
src/kiwano/renderer/win32/TextRenderer.cpp → src/kiwano/render/dx/TextRenderer.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/renderer/win32/TextRenderer.h>
#include <kiwano/render/dx/TextRenderer.h>
namespace kiwano
{

2
src/kiwano/renderer/win32/TextRenderer.h → src/kiwano/render/dx/TextRenderer.h
View File

@ -19,7 +19,7 @@
// THE SOFTWARE.
#pragma once
#include <kiwano/renderer/win32/D2DDeviceResources.h>
#include <kiwano/render/dx/D2DDeviceResources.h>
namespace kiwano
{

2
src/kiwano/renderer/win32/helper.h → src/kiwano/render/dx/helper.h
View File

@ -22,7 +22,7 @@
#include <kiwano/math/math.h>
#include <kiwano/platform/win32/ComPtr.hpp>
#include <kiwano/platform/win32/helper.h>
#include <kiwano/renderer/Color.h>
#include <kiwano/render/Color.h>
#include <d2d1.h>
namespace kiwano

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

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

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

@ -22,8 +22,8 @@
#include <kiwano/core/Resource.h>
#include <kiwano/2d/Frame.h>
#include <kiwano/2d/FrameSequence.h>
#include <kiwano/renderer/GifImage.h>
#include <kiwano/renderer/Font.h>
#include <kiwano/render/GifImage.h>
#include <kiwano/render/Font.h>
#include <3rd-party/pugixml/pugixml.hpp>
namespace kiwano

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

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