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

add String::copy 

refactoring
This commit is contained in:
Nomango 2019-03-13 15:48:25 +08:00 committed by Nomango
parent b0978251b8
commit c270418774
142 changed files with 284 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
project/Box2DSample/Box2DSample.vcxproj
View File

@ -80,7 +80,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src;../../3rd-party/box2d</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d;../../3rd-party/box2d</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -92,7 +92,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src;../../3rd-party/box2d</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d;../../3rd-party/box2d</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -106,7 +106,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src;../../3rd-party/box2d</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d;../../3rd-party/box2d</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -122,7 +122,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src;../../3rd-party/box2d</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d;../../3rd-party/box2d</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>

250
project/Easy2D/Easy2D.vcxproj
View File

@ -1,133 +1,133 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="..\..\src\audio\audio.h" />
<ClInclude Include="..\..\src\audio\audio-modules.h" />
<ClInclude Include="..\..\src\audio\Music.h" />
<ClInclude Include="..\..\src\audio\Player.h" />
<ClInclude Include="..\..\src\audio\Transcoder.h" />
<ClInclude Include="..\..\src\audio\Voice.h" />
<ClInclude Include="..\..\src\common\Array.h" />
<ClInclude Include="..\..\src\common\closure.hpp" />
<ClInclude Include="..\..\src\common\ComPtr.hpp" />
<ClInclude Include="..\..\src\common\IntrusiveList.hpp" />
<ClInclude Include="..\..\src\common\IntrusivePtr.hpp" />
<ClInclude Include="..\..\src\common\noncopyable.hpp" />
<ClInclude Include="..\..\src\common\Singleton.hpp" />
<ClInclude Include="..\..\src\common\String.h" />
<ClInclude Include="..\..\src\config.h" />
<ClInclude Include="..\..\src\core\Action.h" />
<ClInclude Include="..\..\src\core\ActionGroup.h" />
<ClInclude Include="..\..\src\core\ActionHelper.h" />
<ClInclude Include="..\..\src\core\ActionTween.h" />
<ClInclude Include="..\..\src\core\ActionManager.h" />
<ClInclude Include="..\..\src\core\Animation.h" />
<ClInclude Include="..\..\src\core\Canvas.h" />
<ClInclude Include="..\..\src\core\Color.h" />
<ClInclude Include="..\..\src\core\Component.h" />
<ClInclude Include="..\..\src\core\DebugNode.h" />
<ClInclude Include="..\..\src\core\Event.hpp" />
<ClInclude Include="..\..\src\core\EventDispatcher.h" />
<ClInclude Include="..\..\src\core\EventListener.h" />
<ClInclude Include="..\..\src\core\Font.hpp" />
<ClInclude Include="..\..\src\core\Frames.h" />
<ClInclude Include="..\..\src\core\Application.h" />
<ClInclude Include="..\..\src\core\Geometry.h" />
<ClInclude Include="..\..\src\core\GeometryNode.h" />
<ClInclude Include="..\..\src\core\helper.h" />
<ClInclude Include="..\..\src\core\Image.h" />
<ClInclude Include="..\..\src\core\include-forwards.h" />
<ClInclude Include="..\..\src\core\Input.h" />
<ClInclude Include="..\..\src\core\keys.hpp" />
<ClInclude Include="..\..\src\core\Layer.h" />
<ClInclude Include="..\..\src\core\logs.h" />
<ClInclude Include="..\..\src\core\modules.h" />
<ClInclude Include="..\..\src\core\Node.h" />
<ClInclude Include="..\..\src\core\Object.h" />
<ClInclude Include="..\..\src\core\RefCounter.hpp" />
<ClInclude Include="..\..\src\core\render.h" />
<ClInclude Include="..\..\src\core\Resource.h" />
<ClInclude Include="..\..\src\core\Scene.h" />
<ClInclude Include="..\..\src\core\Sprite.h" />
<ClInclude Include="..\..\src\core\Task.h" />
<ClInclude Include="..\..\src\core\TaskManager.h" />
<ClInclude Include="..\..\src\core\Text.h" />
<ClInclude Include="..\..\src\core\TextStyle.hpp" />
<ClInclude Include="..\..\src\core\time.h" />
<ClInclude Include="..\..\src\core\Transform.hpp" />
<ClInclude Include="..\..\src\core\Transition.h" />
<ClInclude Include="..\..\src\core\window.h" />
<ClInclude Include="..\..\src\dx\D2DDeviceResources.h" />
<ClInclude Include="..\..\src\dx\D3D10DeviceResources.h" />
<ClInclude Include="..\..\src\dx\D3D11DeviceResources.h" />
<ClInclude Include="..\..\src\dx\DeviceResources.h" />
<ClInclude Include="..\..\src\dx\helper.hpp" />
<ClInclude Include="..\..\src\dx\TextRenderer.h" />
<ClInclude Include="..\..\src\easy2d.h" />
<ClInclude Include="..\..\src\macros.h" />
<ClInclude Include="..\..\src\math\constants.hpp" />
<ClInclude Include="..\..\src\math\ease.hpp" />
<ClInclude Include="..\..\src\math\Matrix.hpp" />
<ClInclude Include="..\..\src\math\rand.h" />
<ClInclude Include="..\..\src\math\Rect.hpp" />
<ClInclude Include="..\..\src\math\scalar.hpp" />
<ClInclude Include="..\..\src\math\vector.hpp" />
<ClInclude Include="..\..\src\ui\Button.h" />
<ClInclude Include="..\..\src\ui\Menu.h" />
<ClInclude Include="..\..\src\utils\Data.h" />
<ClInclude Include="..\..\src\utils\File.h" />
<ClInclude Include="..\..\src\utils\Path.h" />
<ClInclude Include="..\..\src\utils\ResLoader.h" />
<ClInclude Include="..\..\src\easy2d\audio\audio.h" />
<ClInclude Include="..\..\src\easy2d\audio\audio-modules.h" />
<ClInclude Include="..\..\src\easy2d\audio\Music.h" />
<ClInclude Include="..\..\src\easy2d\audio\Player.h" />
<ClInclude Include="..\..\src\easy2d\audio\Transcoder.h" />
<ClInclude Include="..\..\src\easy2d\audio\Voice.h" />
<ClInclude Include="..\..\src\easy2d\common\Array.h" />
<ClInclude Include="..\..\src\easy2d\common\closure.hpp" />
<ClInclude Include="..\..\src\easy2d\common\ComPtr.hpp" />
<ClInclude Include="..\..\src\easy2d\common\IntrusiveList.hpp" />
<ClInclude Include="..\..\src\easy2d\common\IntrusivePtr.hpp" />
<ClInclude Include="..\..\src\easy2d\common\noncopyable.hpp" />
<ClInclude Include="..\..\src\easy2d\common\Singleton.hpp" />
<ClInclude Include="..\..\src\easy2d\common\String.h" />
<ClInclude Include="..\..\src\easy2d\config.h" />
<ClInclude Include="..\..\src\easy2d\core\Action.h" />
<ClInclude Include="..\..\src\easy2d\core\ActionGroup.h" />
<ClInclude Include="..\..\src\easy2d\core\ActionHelper.h" />
<ClInclude Include="..\..\src\easy2d\core\ActionTween.h" />
<ClInclude Include="..\..\src\easy2d\core\ActionManager.h" />
<ClInclude Include="..\..\src\easy2d\core\Animation.h" />
<ClInclude Include="..\..\src\easy2d\core\Canvas.h" />
<ClInclude Include="..\..\src\easy2d\core\Color.h" />
<ClInclude Include="..\..\src\easy2d\core\Component.h" />
<ClInclude Include="..\..\src\easy2d\core\DebugNode.h" />
<ClInclude Include="..\..\src\easy2d\core\Event.hpp" />
<ClInclude Include="..\..\src\easy2d\core\EventDispatcher.h" />
<ClInclude Include="..\..\src\easy2d\core\EventListener.h" />
<ClInclude Include="..\..\src\easy2d\core\Font.hpp" />
<ClInclude Include="..\..\src\easy2d\core\Frames.h" />
<ClInclude Include="..\..\src\easy2d\core\Application.h" />
<ClInclude Include="..\..\src\easy2d\core\Geometry.h" />
<ClInclude Include="..\..\src\easy2d\core\GeometryNode.h" />
<ClInclude Include="..\..\src\easy2d\core\helper.h" />
<ClInclude Include="..\..\src\easy2d\core\Image.h" />
<ClInclude Include="..\..\src\easy2d\core\include-forwards.h" />
<ClInclude Include="..\..\src\easy2d\core\Input.h" />
<ClInclude Include="..\..\src\easy2d\core\keys.hpp" />
<ClInclude Include="..\..\src\easy2d\core\Layer.h" />
<ClInclude Include="..\..\src\easy2d\core\logs.h" />
<ClInclude Include="..\..\src\easy2d\core\modules.h" />
<ClInclude Include="..\..\src\easy2d\core\Node.h" />
<ClInclude Include="..\..\src\easy2d\core\Object.h" />
<ClInclude Include="..\..\src\easy2d\core\RefCounter.hpp" />
<ClInclude Include="..\..\src\easy2d\core\render.h" />
<ClInclude Include="..\..\src\easy2d\core\Resource.h" />
<ClInclude Include="..\..\src\easy2d\core\Scene.h" />
<ClInclude Include="..\..\src\easy2d\core\Sprite.h" />
<ClInclude Include="..\..\src\easy2d\core\Task.h" />
<ClInclude Include="..\..\src\easy2d\core\TaskManager.h" />
<ClInclude Include="..\..\src\easy2d\core\Text.h" />
<ClInclude Include="..\..\src\easy2d\core\TextStyle.hpp" />
<ClInclude Include="..\..\src\easy2d\core\time.h" />
<ClInclude Include="..\..\src\easy2d\core\Transform.hpp" />
<ClInclude Include="..\..\src\easy2d\core\Transition.h" />
<ClInclude Include="..\..\src\easy2d\core\window.h" />
<ClInclude Include="..\..\src\easy2d\dx\D2DDeviceResources.h" />
<ClInclude Include="..\..\src\easy2d\dx\D3D10DeviceResources.h" />
<ClInclude Include="..\..\src\easy2d\dx\D3D11DeviceResources.h" />
<ClInclude Include="..\..\src\easy2d\dx\DeviceResources.h" />
<ClInclude Include="..\..\src\easy2d\dx\helper.hpp" />
<ClInclude Include="..\..\src\easy2d\dx\TextRenderer.h" />
<ClInclude Include="..\..\src\easy2d\easy2d.h" />
<ClInclude Include="..\..\src\easy2d\macros.h" />
<ClInclude Include="..\..\src\easy2d\math\constants.hpp" />
<ClInclude Include="..\..\src\easy2d\math\ease.hpp" />
<ClInclude Include="..\..\src\easy2d\math\Matrix.hpp" />
<ClInclude Include="..\..\src\easy2d\math\rand.h" />
<ClInclude Include="..\..\src\easy2d\math\Rect.hpp" />
<ClInclude Include="..\..\src\easy2d\math\scalar.hpp" />
<ClInclude Include="..\..\src\easy2d\math\vector.hpp" />
<ClInclude Include="..\..\src\easy2d\ui\Button.h" />
<ClInclude Include="..\..\src\easy2d\ui\Menu.h" />
<ClInclude Include="..\..\src\easy2d\utils\Data.h" />
<ClInclude Include="..\..\src\easy2d\utils\File.h" />
<ClInclude Include="..\..\src\easy2d\utils\Path.h" />
<ClInclude Include="..\..\src\easy2d\utils\ResLoader.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\audio\audio.cpp" />
<ClCompile Include="..\..\src\audio\audio-modules.cpp" />
<ClCompile Include="..\..\src\audio\Music.cpp" />
<ClCompile Include="..\..\src\audio\Player.cpp" />
<ClCompile Include="..\..\src\audio\Transcoder.cpp" />
<ClCompile Include="..\..\src\audio\Voice.cpp" />
<ClCompile Include="..\..\src\common\String.cpp" />
<ClCompile Include="..\..\src\core\Action.cpp" />
<ClCompile Include="..\..\src\core\ActionGroup.cpp" />
<ClCompile Include="..\..\src\core\ActionTween.cpp" />
<ClCompile Include="..\..\src\core\ActionManager.cpp" />
<ClCompile Include="..\..\src\core\Animation.cpp" />
<ClCompile Include="..\..\src\core\Canvas.cpp" />
<ClCompile Include="..\..\src\core\Color.cpp" />
<ClCompile Include="..\..\src\core\DebugNode.cpp" />
<ClCompile Include="..\..\src\core\EventDispatcher.cpp" />
<ClCompile Include="..\..\src\core\EventListener.cpp" />
<ClCompile Include="..\..\src\core\Frames.cpp" />
<ClCompile Include="..\..\src\core\Application.cpp" />
<ClCompile Include="..\..\src\core\Geometry.cpp" />
<ClCompile Include="..\..\src\core\GeometryNode.cpp" />
<ClCompile Include="..\..\src\core\Image.cpp" />
<ClCompile Include="..\..\src\core\Input.cpp" />
<ClCompile Include="..\..\src\core\Layer.cpp" />
<ClCompile Include="..\..\src\core\logs.cpp" />
<ClCompile Include="..\..\src\core\modules.cpp" />
<ClCompile Include="..\..\src\core\Node.cpp" />
<ClCompile Include="..\..\src\core\Object.cpp" />
<ClCompile Include="..\..\src\core\render.cpp" />
<ClCompile Include="..\..\src\core\Resource.cpp" />
<ClCompile Include="..\..\src\core\Scene.cpp" />
<ClCompile Include="..\..\src\core\Sprite.cpp" />
<ClCompile Include="..\..\src\core\Task.cpp" />
<ClCompile Include="..\..\src\core\TaskManager.cpp" />
<ClCompile Include="..\..\src\core\Text.cpp" />
<ClCompile Include="..\..\src\core\time.cpp" />
<ClCompile Include="..\..\src\core\Transition.cpp" />
<ClCompile Include="..\..\src\core\window.cpp" />
<ClCompile Include="..\..\src\dx\D2DDeviceResources.cpp" />
<ClCompile Include="..\..\src\dx\D3D10DeviceResources.cpp" />
<ClCompile Include="..\..\src\dx\D3D11DeviceResources.cpp" />
<ClCompile Include="..\..\src\dx\TextRenderer.cpp" />
<ClCompile Include="..\..\src\ui\Button.cpp" />
<ClCompile Include="..\..\src\ui\Menu.cpp" />
<ClCompile Include="..\..\src\utils\Data.cpp" />
<ClCompile Include="..\..\src\utils\File.cpp" />
<ClCompile Include="..\..\src\utils\Path.cpp" />
<ClCompile Include="..\..\src\utils\ResLoader.cpp" />
<ClCompile Include="..\..\src\easy2d\audio\audio.cpp" />
<ClCompile Include="..\..\src\easy2d\audio\audio-modules.cpp" />
<ClCompile Include="..\..\src\easy2d\audio\Music.cpp" />
<ClCompile Include="..\..\src\easy2d\audio\Player.cpp" />
<ClCompile Include="..\..\src\easy2d\audio\Transcoder.cpp" />
<ClCompile Include="..\..\src\easy2d\audio\Voice.cpp" />
<ClCompile Include="..\..\src\easy2d\common\String.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Action.cpp" />
<ClCompile Include="..\..\src\easy2d\core\ActionGroup.cpp" />
<ClCompile Include="..\..\src\easy2d\core\ActionTween.cpp" />
<ClCompile Include="..\..\src\easy2d\core\ActionManager.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Animation.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Canvas.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Color.cpp" />
<ClCompile Include="..\..\src\easy2d\core\DebugNode.cpp" />
<ClCompile Include="..\..\src\easy2d\core\EventDispatcher.cpp" />
<ClCompile Include="..\..\src\easy2d\core\EventListener.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Frames.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Application.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Geometry.cpp" />
<ClCompile Include="..\..\src\easy2d\core\GeometryNode.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Image.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Input.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Layer.cpp" />
<ClCompile Include="..\..\src\easy2d\core\logs.cpp" />
<ClCompile Include="..\..\src\easy2d\core\modules.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Node.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Object.cpp" />
<ClCompile Include="..\..\src\easy2d\core\render.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Resource.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Scene.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Sprite.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Task.cpp" />
<ClCompile Include="..\..\src\easy2d\core\TaskManager.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Text.cpp" />
<ClCompile Include="..\..\src\easy2d\core\time.cpp" />
<ClCompile Include="..\..\src\easy2d\core\Transition.cpp" />
<ClCompile Include="..\..\src\easy2d\core\window.cpp" />
<ClCompile Include="..\..\src\easy2d\dx\D2DDeviceResources.cpp" />
<ClCompile Include="..\..\src\easy2d\dx\D3D10DeviceResources.cpp" />
<ClCompile Include="..\..\src\easy2d\dx\D3D11DeviceResources.cpp" />
<ClCompile Include="..\..\src\easy2d\dx\TextRenderer.cpp" />
<ClCompile Include="..\..\src\easy2d\ui\Button.cpp" />
<ClCompile Include="..\..\src\easy2d\ui\Menu.cpp" />
<ClCompile Include="..\..\src\easy2d\utils\Data.cpp" />
<ClCompile Include="..\..\src\easy2d\utils\File.cpp" />
<ClCompile Include="..\..\src\easy2d\utils\Path.cpp" />
<ClCompile Include="..\..\src\easy2d\utils\ResLoader.cpp" />
</ItemGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">

250
project/Easy2D/Easy2D.vcxproj.filters
View File

@ -24,375 +24,375 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\easy2d.h" />
<ClInclude Include="..\..\src\core\Animation.h">
<ClInclude Include="..\..\src\easy2d\easy2d.h" />
<ClInclude Include="..\..\src\easy2d\core\Animation.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Canvas.h">
<ClInclude Include="..\..\src\easy2d\core\Canvas.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Color.h">
<ClInclude Include="..\..\src\easy2d\core\Color.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Image.h">
<ClInclude Include="..\..\src\easy2d\core\Image.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Input.h">
<ClInclude Include="..\..\src\easy2d\core\Input.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\logs.h">
<ClInclude Include="..\..\src\easy2d\core\logs.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\modules.h">
<ClInclude Include="..\..\src\easy2d\core\modules.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Node.h">
<ClInclude Include="..\..\src\easy2d\core\Node.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\render.h">
<ClInclude Include="..\..\src\easy2d\core\render.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Resource.h">
<ClInclude Include="..\..\src\easy2d\core\Resource.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Scene.h">
<ClInclude Include="..\..\src\easy2d\core\Scene.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Sprite.h">
<ClInclude Include="..\..\src\easy2d\core\Sprite.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Task.h">
<ClInclude Include="..\..\src\easy2d\core\Task.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Text.h">
<ClInclude Include="..\..\src\easy2d\core\Text.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\time.h">
<ClInclude Include="..\..\src\easy2d\core\time.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Transition.h">
<ClInclude Include="..\..\src\easy2d\core\Transition.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\window.h">
<ClInclude Include="..\..\src\easy2d\core\window.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\rand.h">
<ClInclude Include="..\..\src\easy2d\math\rand.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\scalar.hpp">
<ClInclude Include="..\..\src\easy2d\math\scalar.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\vector.hpp">
<ClInclude Include="..\..\src\easy2d\math\vector.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\Data.h">
<ClInclude Include="..\..\src\easy2d\utils\Data.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\File.h">
<ClInclude Include="..\..\src\easy2d\utils\File.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\Path.h">
<ClInclude Include="..\..\src\easy2d\utils\Path.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ui\Button.h">
<ClInclude Include="..\..\src\easy2d\ui\Button.h">
<Filter>ui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ui\Menu.h">
<ClInclude Include="..\..\src\easy2d\ui\Menu.h">
<Filter>ui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\RefCounter.hpp">
<ClInclude Include="..\..\src\easy2d\core\RefCounter.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\ActionManager.h">
<ClInclude Include="..\..\src\easy2d\core\ActionManager.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\TaskManager.h">
<ClInclude Include="..\..\src\easy2d\core\TaskManager.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\TextStyle.hpp">
<ClInclude Include="..\..\src\easy2d\core\TextStyle.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Font.hpp">
<ClInclude Include="..\..\src\easy2d\core\Font.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Transform.hpp">
<ClInclude Include="..\..\src\easy2d\core\Transform.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Geometry.h">
<ClInclude Include="..\..\src\easy2d\core\Geometry.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\GeometryNode.h">
<ClInclude Include="..\..\src\easy2d\core\GeometryNode.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\ease.hpp">
<ClInclude Include="..\..\src\easy2d\math\ease.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\ActionTween.h">
<ClInclude Include="..\..\src\easy2d\core\ActionTween.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Frames.h">
<ClInclude Include="..\..\src\easy2d\core\Frames.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\constants.hpp">
<ClInclude Include="..\..\src\easy2d\math\constants.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\EventDispatcher.h">
<ClInclude Include="..\..\src\easy2d\core\EventDispatcher.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\EventListener.h">
<ClInclude Include="..\..\src\easy2d\core\EventListener.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Object.h">
<ClInclude Include="..\..\src\easy2d\core\Object.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\keys.hpp">
<ClInclude Include="..\..\src\easy2d\core\keys.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\include-forwards.h">
<ClInclude Include="..\..\src\easy2d\core\include-forwards.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\DebugNode.h">
<ClInclude Include="..\..\src\easy2d\core\DebugNode.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\Rect.hpp">
<ClInclude Include="..\..\src\easy2d\math\Rect.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\ResLoader.h">
<ClInclude Include="..\..\src\easy2d\utils\ResLoader.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Application.h">
<ClInclude Include="..\..\src\easy2d\core\Application.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Event.hpp">
<ClInclude Include="..\..\src\easy2d\core\Event.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\ActionGroup.h">
<ClInclude Include="..\..\src\easy2d\core\ActionGroup.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\ActionHelper.h">
<ClInclude Include="..\..\src\easy2d\core\ActionHelper.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Action.h">
<ClInclude Include="..\..\src\easy2d\core\Action.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\Matrix.hpp">
<ClInclude Include="..\..\src\easy2d\math\Matrix.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\dx\D2DDeviceResources.h">
<ClInclude Include="..\..\src\easy2d\dx\D2DDeviceResources.h">
<Filter>dx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\dx\D3D11DeviceResources.h">
<ClInclude Include="..\..\src\easy2d\dx\D3D11DeviceResources.h">
<Filter>dx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\dx\DeviceResources.h">
<ClInclude Include="..\..\src\easy2d\dx\DeviceResources.h">
<Filter>dx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\dx\helper.hpp">
<ClInclude Include="..\..\src\easy2d\dx\helper.hpp">
<Filter>dx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\dx\TextRenderer.h">
<ClInclude Include="..\..\src\easy2d\dx\TextRenderer.h">
<Filter>dx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\dx\D3D10DeviceResources.h">
<ClInclude Include="..\..\src\easy2d\dx\D3D10DeviceResources.h">
<Filter>dx</Filter>
</ClInclude>
<ClInclude Include="..\..\src\audio\audio.h">
<ClInclude Include="..\..\src\easy2d\audio\audio.h">
<Filter>audio</Filter>
</ClInclude>
<ClInclude Include="..\..\src\audio\Music.h">
<ClInclude Include="..\..\src\easy2d\audio\Music.h">
<Filter>audio</Filter>
</ClInclude>
<ClInclude Include="..\..\src\audio\Player.h">
<ClInclude Include="..\..\src\easy2d\audio\Player.h">
<Filter>audio</Filter>
</ClInclude>
<ClInclude Include="..\..\src\audio\Transcoder.h">
<ClInclude Include="..\..\src\easy2d\audio\Transcoder.h">
<Filter>audio</Filter>
</ClInclude>
<ClInclude Include="..\..\src\audio\Voice.h">
<ClInclude Include="..\..\src\easy2d\audio\Voice.h">
<Filter>audio</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Component.h">
<ClInclude Include="..\..\src\easy2d\core\Component.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\audio\audio-modules.h">
<ClInclude Include="..\..\src\easy2d\audio\audio-modules.h">
<Filter>audio</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Layer.h">
<ClInclude Include="..\..\src\easy2d\core\Layer.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\config.h" />
<ClInclude Include="..\..\src\macros.h" />
<ClInclude Include="..\..\src\common\Array.h">
<ClInclude Include="..\..\src\easy2d\config.h" />
<ClInclude Include="..\..\src\easy2d\macros.h" />
<ClInclude Include="..\..\src\easy2d\common\Array.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\closure.hpp">
<ClInclude Include="..\..\src\easy2d\common\closure.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\ComPtr.hpp">
<ClInclude Include="..\..\src\easy2d\common\ComPtr.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\IntrusiveList.hpp">
<ClInclude Include="..\..\src\easy2d\common\IntrusiveList.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\IntrusivePtr.hpp">
<ClInclude Include="..\..\src\easy2d\common\IntrusivePtr.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\noncopyable.hpp">
<ClInclude Include="..\..\src\easy2d\common\noncopyable.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\Singleton.hpp">
<ClInclude Include="..\..\src\easy2d\common\Singleton.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\helper.h">
<ClInclude Include="..\..\src\easy2d\core\helper.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\String.h">
<ClInclude Include="..\..\src\easy2d\common\String.h">
<Filter>common</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\core\Animation.cpp">
<ClCompile Include="..\..\src\easy2d\core\Animation.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Canvas.cpp">
<ClCompile Include="..\..\src\easy2d\core\Canvas.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Color.cpp">
<ClCompile Include="..\..\src\easy2d\core\Color.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Image.cpp">
<ClCompile Include="..\..\src\easy2d\core\Image.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Input.cpp">
<ClCompile Include="..\..\src\easy2d\core\Input.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\modules.cpp">
<ClCompile Include="..\..\src\easy2d\core\modules.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Node.cpp">
<ClCompile Include="..\..\src\easy2d\core\Node.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\render.cpp">
<ClCompile Include="..\..\src\easy2d\core\render.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Resource.cpp">
<ClCompile Include="..\..\src\easy2d\core\Resource.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Scene.cpp">
<ClCompile Include="..\..\src\easy2d\core\Scene.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Sprite.cpp">
<ClCompile Include="..\..\src\easy2d\core\Sprite.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Task.cpp">
<ClCompile Include="..\..\src\easy2d\core\Task.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Text.cpp">
<ClCompile Include="..\..\src\easy2d\core\Text.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\time.cpp">
<ClCompile Include="..\..\src\easy2d\core\time.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Transition.cpp">
<ClCompile Include="..\..\src\easy2d\core\Transition.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\window.cpp">
<ClCompile Include="..\..\src\easy2d\core\window.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\Data.cpp">
<ClCompile Include="..\..\src\easy2d\utils\Data.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\File.cpp">
<ClCompile Include="..\..\src\easy2d\utils\File.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\Path.cpp">
<ClCompile Include="..\..\src\easy2d\utils\Path.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ui\Button.cpp">
<ClCompile Include="..\..\src\easy2d\ui\Button.cpp">
<Filter>ui</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ui\Menu.cpp">
<ClCompile Include="..\..\src\easy2d\ui\Menu.cpp">
<Filter>ui</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\TaskManager.cpp">
<ClCompile Include="..\..\src\easy2d\core\TaskManager.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\ActionManager.cpp">
<ClCompile Include="..\..\src\easy2d\core\ActionManager.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\logs.cpp">
<ClCompile Include="..\..\src\easy2d\core\logs.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Geometry.cpp">
<ClCompile Include="..\..\src\easy2d\core\Geometry.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\GeometryNode.cpp">
<ClCompile Include="..\..\src\easy2d\core\GeometryNode.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\ActionTween.cpp">
<ClCompile Include="..\..\src\easy2d\core\ActionTween.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Frames.cpp">
<ClCompile Include="..\..\src\easy2d\core\Frames.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\EventDispatcher.cpp">
<ClCompile Include="..\..\src\easy2d\core\EventDispatcher.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\EventListener.cpp">
<ClCompile Include="..\..\src\easy2d\core\EventListener.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Object.cpp">
<ClCompile Include="..\..\src\easy2d\core\Object.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\DebugNode.cpp">
<ClCompile Include="..\..\src\easy2d\core\DebugNode.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\ResLoader.cpp">
<ClCompile Include="..\..\src\easy2d\utils\ResLoader.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Application.cpp">
<ClCompile Include="..\..\src\easy2d\core\Application.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\ActionGroup.cpp">
<ClCompile Include="..\..\src\easy2d\core\ActionGroup.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Action.cpp">
<ClCompile Include="..\..\src\easy2d\core\Action.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\dx\D2DDeviceResources.cpp">
<ClCompile Include="..\..\src\easy2d\dx\D2DDeviceResources.cpp">
<Filter>dx</Filter>
</ClCompile>
<ClCompile Include="..\..\src\dx\D3D11DeviceResources.cpp">
<ClCompile Include="..\..\src\easy2d\dx\D3D11DeviceResources.cpp">
<Filter>dx</Filter>
</ClCompile>
<ClCompile Include="..\..\src\dx\TextRenderer.cpp">
<ClCompile Include="..\..\src\easy2d\dx\TextRenderer.cpp">
<Filter>dx</Filter>
</ClCompile>
<ClCompile Include="..\..\src\dx\D3D10DeviceResources.cpp">
<ClCompile Include="..\..\src\easy2d\dx\D3D10DeviceResources.cpp">
<Filter>dx</Filter>
</ClCompile>
<ClCompile Include="..\..\src\audio\audio.cpp">
<ClCompile Include="..\..\src\easy2d\audio\audio.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="..\..\src\audio\Music.cpp">
<ClCompile Include="..\..\src\easy2d\audio\Music.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="..\..\src\audio\Player.cpp">
<ClCompile Include="..\..\src\easy2d\audio\Player.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="..\..\src\audio\Transcoder.cpp">
<ClCompile Include="..\..\src\easy2d\audio\Transcoder.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="..\..\src\audio\Voice.cpp">
<ClCompile Include="..\..\src\easy2d\audio\Voice.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="..\..\src\audio\audio-modules.cpp">
<ClCompile Include="..\..\src\easy2d\audio\audio-modules.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Layer.cpp">
<ClCompile Include="..\..\src\easy2d\core\Layer.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\String.cpp">
<ClCompile Include="..\..\src\easy2d\common\String.cpp">
<Filter>common</Filter>
</ClCompile>
</ItemGroup>

8
project/HelloWorld/HelloWorld.vcxproj
View File

@ -82,7 +82,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -96,7 +96,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -112,7 +112,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -130,7 +130,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>

22
project/ImGuiSample/ImGuiSample.vcxproj
View File

@ -80,7 +80,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src;../../3rd-party/ImGui</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d;../../src/easy2d-imgui;../../3rd-party/ImGui</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -92,7 +92,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src;../../3rd-party/ImGui</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d;../../src/easy2d-imgui;../../3rd-party/ImGui</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -106,7 +106,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src;../../3rd-party/ImGui</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d;../../src/easy2d-imgui;../../3rd-party/ImGui</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -122,7 +122,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src;../../3rd-party/ImGui</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d;../../src/easy2d-imgui;../../3rd-party/ImGui</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -136,9 +136,9 @@
<ClCompile Include="..\..\3rd-party\ImGui\imgui_demo.cpp" />
<ClCompile Include="..\..\3rd-party\ImGui\imgui_draw.cpp" />
<ClCompile Include="..\..\3rd-party\ImGui\imgui_widgets.cpp" />
<ClCompile Include="easy2d-imgui\ImGuiLayer.cpp" />
<ClCompile Include="easy2d-imgui\ImGuiView.cpp" />
<ClCompile Include="easy2d-imgui\imgui_impl_dx11.cpp" />
<ClCompile Include="..\..\src\easy2d-imgui\ImGuiLayer.cpp" />
<ClCompile Include="..\..\src\easy2d-imgui\ImGuiView.cpp" />
<ClCompile Include="..\..\src\easy2d-imgui\imgui_impl_dx11.cpp" />
<ClCompile Include="main.cpp" />
</ItemGroup>
<ItemGroup>
@ -148,10 +148,10 @@
<ClInclude Include="..\..\3rd-party\ImGui\imstb_rectpack.h" />
<ClInclude Include="..\..\3rd-party\ImGui\imstb_textedit.h" />
<ClInclude Include="..\..\3rd-party\ImGui\imstb_truetype.h" />
<ClInclude Include="easy2d-imgui\easy2d-imgui.h" />
<ClInclude Include="easy2d-imgui\ImGuiLayer.h" />
<ClInclude Include="easy2d-imgui\ImGuiView.h" />
<ClInclude Include="easy2d-imgui\imgui_impl_dx11.h" />
<ClInclude Include="..\..\src\easy2d-imgui\easy2d-imgui.h" />
<ClInclude Include="..\..\src\easy2d-imgui\ImGuiLayer.h" />
<ClInclude Include="..\..\src\easy2d-imgui\ImGuiView.h" />
<ClInclude Include="..\..\src\easy2d-imgui\imgui_impl_dx11.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Easy2D\Easy2D.vcxproj">

14
project/ImGuiSample/ImGuiSample.vcxproj.filters
View File

@ -14,13 +14,13 @@
<ClCompile Include="..\..\3rd-party\ImGui\imgui_widgets.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="easy2d-imgui\imgui_impl_dx11.cpp">
<ClCompile Include="..\..\src\easy2d-imgui\imgui_impl_dx11.cpp">
<Filter>easy2d-imgui</Filter>
</ClCompile>
<ClCompile Include="easy2d-imgui\ImGuiLayer.cpp">
<ClCompile Include="..\..\src\easy2d-imgui\ImGuiLayer.cpp">
<Filter>easy2d-imgui</Filter>
</ClCompile>
<ClCompile Include="easy2d-imgui\ImGuiView.cpp">
<ClCompile Include="..\..\src\easy2d-imgui\ImGuiView.cpp">
<Filter>easy2d-imgui</Filter>
</ClCompile>
</ItemGroup>
@ -43,16 +43,16 @@
<ClInclude Include="..\..\3rd-party\ImGui\imstb_truetype.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="easy2d-imgui\imgui_impl_dx11.h">
<ClInclude Include="..\..\src\easy2d-imgui\imgui_impl_dx11.h">
<Filter>easy2d-imgui</Filter>
</ClInclude>
<ClInclude Include="easy2d-imgui\ImGuiLayer.h">
<ClInclude Include="..\..\src\easy2d-imgui\ImGuiLayer.h">
<Filter>easy2d-imgui</Filter>
</ClInclude>
<ClInclude Include="easy2d-imgui\ImGuiView.h">
<ClInclude Include="..\..\src\easy2d-imgui\ImGuiView.h">
<Filter>easy2d-imgui</Filter>
</ClInclude>
<ClInclude Include="easy2d-imgui\easy2d-imgui.h">
<ClInclude Include="..\..\src\easy2d-imgui\easy2d-imgui.h">
<Filter>easy2d-imgui</Filter>
</ClInclude>
</ItemGroup>

2
project/ImGuiSample/main.cpp
View File

@ -1,7 +1,7 @@
// Copyright (C) 2019 Nomango
#include "easy2d.h"
#include "easy2d-imgui/easy2d-imgui.h"
#include "easy2d-imgui.h"
using namespace easy2d;

9
project/Samples/Samples.vcxproj
View File

@ -39,6 +39,7 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
@ -81,7 +82,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -93,7 +94,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -107,7 +108,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -123,7 +124,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/easy2d</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>

0
project/ImGuiSample/easy2d-imgui/ImGuiLayer.cpp → src/easy2d-imgui/ImGuiLayer.cpp
View File

0
project/ImGuiSample/easy2d-imgui/ImGuiLayer.h → src/easy2d-imgui/ImGuiLayer.h
View File

0
project/ImGuiSample/easy2d-imgui/ImGuiView.cpp → src/easy2d-imgui/ImGuiView.cpp
View File

0
project/ImGuiSample/easy2d-imgui/ImGuiView.h → src/easy2d-imgui/ImGuiView.h
View File

0
project/ImGuiSample/easy2d-imgui/easy2d-imgui.h → src/easy2d-imgui/easy2d-imgui.h
View File

0
project/ImGuiSample/easy2d-imgui/imgui_impl_dx11.cpp → src/easy2d-imgui/imgui_impl_dx11.cpp
View File

0
project/ImGuiSample/easy2d-imgui/imgui_impl_dx11.h → src/easy2d-imgui/imgui_impl_dx11.h
View File

0
src/audio/Music.cpp → src/easy2d/audio/Music.cpp
View File

0
src/audio/Music.h → src/easy2d/audio/Music.h
View File

0
src/audio/Player.cpp → src/easy2d/audio/Player.cpp
View File

0
src/audio/Player.h → src/easy2d/audio/Player.h
View File

0
src/audio/Transcoder.cpp → src/easy2d/audio/Transcoder.cpp
View File

0
src/audio/Transcoder.h → src/easy2d/audio/Transcoder.h
View File

0
src/audio/Voice.cpp → src/easy2d/audio/Voice.cpp
View File

0
src/audio/Voice.h → src/easy2d/audio/Voice.h
View File

0
src/audio/audio-modules.cpp → src/easy2d/audio/audio-modules.cpp
View File

0
src/audio/audio-modules.h → src/easy2d/audio/audio-modules.h
View File

0
src/audio/audio.cpp → src/easy2d/audio/audio.cpp
View File

0
src/audio/audio.h → src/easy2d/audio/audio.h
View File

0
src/common/Array.h → src/easy2d/common/Array.h
View File

0
src/common/ComPtr.hpp → src/easy2d/common/ComPtr.hpp
View File

0
src/common/IntrusiveList.hpp → src/easy2d/common/IntrusiveList.hpp
View File

0
src/common/IntrusivePtr.hpp → src/easy2d/common/IntrusivePtr.hpp
View File

0
src/common/Singleton.hpp → src/easy2d/common/Singleton.hpp
View File

0
src/common/String.cpp → src/easy2d/common/String.cpp
View File

2
src/common/String.h → src/easy2d/common/String.h
View File

@ -130,6 +130,8 @@ namespace easy2d
inline void push_back(const wchar_t ch) { append(1, ch); }
inline wchar_t pop_back() { if (empty()) throw std::out_of_range("pop_back() called on empty string"); check_operability(); wchar_t ch = str_[--size_]; str_[size_] = value_type(); return ch; }
inline size_type copy(wchar_t* cstr, size_type count, size_type pos = 0) const { check_offset(pos); if (count == 0 || cstr == const_str_) return 0; count = clamp_suffix_size(pos, count); traits::move(cstr, cbegin() + pos, count); return count; }
std::string to_string() const;
std::wstring to_wstring() const;

0
src/common/closure.hpp → src/easy2d/common/closure.hpp
View File

0
src/common/noncopyable.hpp → src/easy2d/common/noncopyable.hpp
View File

0
src/config.h → src/easy2d/config.h
View File

0
src/core/Action.cpp → src/easy2d/core/Action.cpp
View File

0
src/core/Action.h → src/easy2d/core/Action.h
View File

0
src/core/ActionGroup.cpp → src/easy2d/core/ActionGroup.cpp
View File

0
src/core/ActionGroup.h → src/easy2d/core/ActionGroup.h
View File

0
src/core/ActionHelper.h → src/easy2d/core/ActionHelper.h
View File

0
src/core/ActionManager.cpp → src/easy2d/core/ActionManager.cpp
View File

0
src/core/ActionManager.h → src/easy2d/core/ActionManager.h
View File

0
src/core/ActionTween.cpp → src/easy2d/core/ActionTween.cpp
View File

0
src/core/ActionTween.h → src/easy2d/core/ActionTween.h
View File

0
src/core/Animation.cpp → src/easy2d/core/Animation.cpp
View File

0
src/core/Animation.h → src/easy2d/core/Animation.h
View File

0
src/core/Application.cpp → src/easy2d/core/Application.cpp
View File

0
src/core/Application.h → src/easy2d/core/Application.h
View File

0
src/core/Canvas.cpp → src/easy2d/core/Canvas.cpp
View File

0
src/core/Canvas.h → src/easy2d/core/Canvas.h
View File

0
src/core/Color.cpp → src/easy2d/core/Color.cpp
View File

0
src/core/Color.h → src/easy2d/core/Color.h
View File

0
src/core/Component.h → src/easy2d/core/Component.h
View File

0
src/core/DebugNode.cpp → src/easy2d/core/DebugNode.cpp
View File

0
src/core/DebugNode.h → src/easy2d/core/DebugNode.h
View File

0
src/core/Event.hpp → src/easy2d/core/Event.hpp
View File

0
src/core/EventDispatcher.cpp → src/easy2d/core/EventDispatcher.cpp
View File

0
src/core/EventDispatcher.h → src/easy2d/core/EventDispatcher.h
View File

0
src/core/EventListener.cpp → src/easy2d/core/EventListener.cpp
View File

0
src/core/EventListener.h → src/easy2d/core/EventListener.h
View File

0
src/core/Font.hpp → src/easy2d/core/Font.hpp
View File

0
src/core/Frames.cpp → src/easy2d/core/Frames.cpp
View File

0
src/core/Frames.h → src/easy2d/core/Frames.h
View File

0
src/core/Geometry.cpp → src/easy2d/core/Geometry.cpp
View File

0
src/core/Geometry.h → src/easy2d/core/Geometry.h
View File

0
src/core/GeometryNode.cpp → src/easy2d/core/GeometryNode.cpp
View File

0
src/core/GeometryNode.h → src/easy2d/core/GeometryNode.h
View File

0
src/core/Image.cpp → src/easy2d/core/Image.cpp
View File

0
src/core/Image.h → src/easy2d/core/Image.h
View File

0
src/core/Input.cpp → src/easy2d/core/Input.cpp
View File

0
src/core/Input.h → src/easy2d/core/Input.h
View File

0
src/core/Layer.cpp → src/easy2d/core/Layer.cpp
View File

0
src/core/Layer.h → src/easy2d/core/Layer.h
View File

0
src/core/Node.cpp → src/easy2d/core/Node.cpp
View File

0
src/core/Node.h → src/easy2d/core/Node.h
View File

0
src/core/Object.cpp → src/easy2d/core/Object.cpp
View File

0
src/core/Object.h → src/easy2d/core/Object.h
View File

0
src/core/RefCounter.hpp → src/easy2d/core/RefCounter.hpp
View File

0
src/core/Resource.cpp → src/easy2d/core/Resource.cpp
View File

0
src/core/Resource.h → src/easy2d/core/Resource.h
View File

0
src/core/Scene.cpp → src/easy2d/core/Scene.cpp
View File

0
src/core/Scene.h → src/easy2d/core/Scene.h
View File

0
src/core/Sprite.cpp → src/easy2d/core/Sprite.cpp
View File

0
src/core/Sprite.h → src/easy2d/core/Sprite.h
View File

0
src/core/Task.cpp → src/easy2d/core/Task.cpp
View File

0
src/core/Task.h → src/easy2d/core/Task.h
View File

0
src/core/TaskManager.cpp → src/easy2d/core/TaskManager.cpp
View File

0
src/core/TaskManager.h → src/easy2d/core/TaskManager.h
View File

0
src/core/Text.cpp → src/easy2d/core/Text.cpp
View File

0
src/core/Text.h → src/easy2d/core/Text.h
View File

0
src/core/TextStyle.hpp → src/easy2d/core/TextStyle.hpp
View File

0
src/core/Transform.hpp → src/easy2d/core/Transform.hpp
View File

0
src/core/Transition.cpp → src/easy2d/core/Transition.cpp
View File

0
src/core/Transition.h → src/easy2d/core/Transition.h
View File

0
src/core/helper.h → src/easy2d/core/helper.h
View File

0
src/core/include-forwards.h → src/easy2d/core/include-forwards.h
View File

0
src/core/keys.hpp → src/easy2d/core/keys.hpp
View File

0
src/core/logs.cpp → src/easy2d/core/logs.cpp
View File

Some files were not shown because too many files have changed in this diff Show More