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

update ImGuiView 

minor fixes

refactoring
This commit is contained in:
Nomango 2019-04-05 16:06:32 +08:00 committed by Nomango
parent a6f9f3d518
commit 68f3ad0d29
67 changed files with 293 additions and 724 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
Easy2D-Audio/Easy2D-Audio.vcxproj
View File

@ -1,186 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}</ProjectGuid>
<Keyword>Easy2D-Audio</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="audio-modules.cpp" />
<ClCompile Include="audio.cpp" />
<ClCompile Include="Music.cpp" />
<ClCompile Include="Player.cpp" />
<ClCompile Include="Transcoder.cpp" />
<ClCompile Include="Voice.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="easy2d-audio.h" />
<ClInclude Include="audio-modules.h" />
<ClInclude Include="audio.h" />
<ClInclude Include="Music.h" />
<ClInclude Include="Player.h" />
<ClInclude Include="Transcoder.h" />
<ClInclude Include="Voice.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

20
Easy2D-Audio/Easy2D-Audio.vcxproj.filters
View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="audio.cpp" />
<ClCompile Include="audio-modules.cpp" />
<ClCompile Include="Music.cpp" />
<ClCompile Include="Player.cpp" />
<ClCompile Include="Transcoder.cpp" />
<ClCompile Include="Voice.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="audio.h" />
<ClInclude Include="audio-modules.h" />
<ClInclude Include="Music.h" />
<ClInclude Include="Player.h" />
<ClInclude Include="Transcoder.h" />
<ClInclude Include="Voice.h" />
<ClInclude Include="easy2d-audio.h" />
</ItemGroup>
</Project>

190
Easy2D-ImGui/Easy2D-ImGui.vcxproj
View File

@ -1,190 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{23AFF03B-A670-4C33-B790-18EEC82C61AE}</ProjectGuid>
<Keyword>Easy2D-ImGui</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="easy2d-imgui.h" />
<ClInclude Include="libs\ImGui\imconfig.h" />
<ClInclude Include="libs\ImGui\imgui.h" />
<ClInclude Include="libs\ImGui\imgui_internal.h" />
<ClInclude Include="libs\ImGui\imstb_rectpack.h" />
<ClInclude Include="libs\ImGui\imstb_textedit.h" />
<ClInclude Include="libs\ImGui\imstb_truetype.h" />
<ClInclude Include="ImGuiLayer.h" />
<ClInclude Include="ImGuiView.h" />
<ClInclude Include="imgui_impl_dx11.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="libs\ImGui\imgui.cpp" />
<ClCompile Include="libs\ImGui\imgui_demo.cpp" />
<ClCompile Include="libs\ImGui\imgui_draw.cpp" />
<ClCompile Include="libs\ImGui\imgui_widgets.cpp" />
<ClCompile Include="ImGuiLayer.cpp" />
<ClCompile Include="ImGuiView.cpp" />
<ClCompile Include="imgui_impl_dx11.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

49
Easy2D-ImGui/Easy2D-ImGui.vcxproj.filters
View File

@ -1,49 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="imgui_impl_dx11.h" />
<ClInclude Include="ImGuiLayer.h" />
<ClInclude Include="ImGuiView.h" />
<ClInclude Include="libs\ImGui\imconfig.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="libs\ImGui\imgui.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="libs\ImGui\imgui_internal.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="libs\ImGui\imstb_rectpack.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="libs\ImGui\imstb_textedit.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="libs\ImGui\imstb_truetype.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="easy2d-imgui.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="imgui_impl_dx11.cpp" />
<ClCompile Include="ImGuiLayer.cpp" />
<ClCompile Include="ImGuiView.cpp" />
<ClCompile Include="libs\ImGui\imgui.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="libs\ImGui\imgui_demo.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="libs\ImGui\imgui_draw.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="libs\ImGui\imgui_widgets.cpp">
<Filter>imgui</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="imgui">
<UniqueIdentifier>{d0ea3700-326c-4dc2-a674-fcb657039e87}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>

171
Easy2D-Network/Easy2D-Network.vcxproj
View File

@ -1,171 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{05C5C84B-4EE3-4456-9AED-EECA583B793B}</ProjectGuid>
<RootNamespace>Easy2DNetwork</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="easy2d-network.h" />
<ClInclude Include="helper.h" />
<ClInclude Include="HttpClient.h" />
<ClInclude Include="HttpRequest.h" />
<ClInclude Include="HttpResponse.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="HttpClient.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

13
Easy2D-Network/Easy2D-Network.vcxproj.filters
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="easy2d-network.h" />
<ClInclude Include="HttpClient.h" />
<ClInclude Include="HttpRequest.h" />
<ClInclude Include="HttpResponse.h" />
<ClInclude Include="helper.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="HttpClient.cpp" />
</ItemGroup>
</Project>

34
Easy2D.sln
View File

@ -1,17 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.271
# Visual Studio Version 16
VisualStudioVersion = 16.0.28729.10
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "samples\HelloWorld\HelloWorld.vcxproj", "{3561A359-F9FD-48AB-A977-34E7E568BC8E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D", "Easy2D\Easy2D.vcxproj", "{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D-ImGui", "Easy2D-ImGui\Easy2D-ImGui.vcxproj", "{23AFF03B-A670-4C33-B790-18EEC82C61AE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D-Audio", "Easy2D-Audio\Easy2D-Audio.vcxproj", "{5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D-Network", "Easy2D-Network\Easy2D-Network.vcxproj", "{05C5C84B-4EE3-4456-9AED-EECA583B793B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Samples", "samples\Samples\Samples.vcxproj", "{45F5738D-CDF2-4024-974D-25B64F9043DE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGuiSample", "samples\ImGuiSample\ImGuiSample.vcxproj", "{6152D36C-EA40-4968-A696-244B6CA58395}"
@ -44,30 +38,6 @@ Global
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|Win32.Build.0 = Release|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|x64.ActiveCfg = Release|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|x64.Build.0 = Release|x64
{23AFF03B-A670-4C33-B790-18EEC82C61AE}.Debug|Win32.ActiveCfg = Debug|Win32
{23AFF03B-A670-4C33-B790-18EEC82C61AE}.Debug|Win32.Build.0 = Debug|Win32
{23AFF03B-A670-4C33-B790-18EEC82C61AE}.Debug|x64.ActiveCfg = Debug|x64
{23AFF03B-A670-4C33-B790-18EEC82C61AE}.Debug|x64.Build.0 = Debug|x64
{23AFF03B-A670-4C33-B790-18EEC82C61AE}.Release|Win32.ActiveCfg = Release|Win32
{23AFF03B-A670-4C33-B790-18EEC82C61AE}.Release|Win32.Build.0 = Release|Win32
{23AFF03B-A670-4C33-B790-18EEC82C61AE}.Release|x64.ActiveCfg = Release|x64
{23AFF03B-A670-4C33-B790-18EEC82C61AE}.Release|x64.Build.0 = Release|x64
{5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Debug|Win32.ActiveCfg = Debug|Win32
{5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Debug|Win32.Build.0 = Debug|Win32
{5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Debug|x64.ActiveCfg = Debug|x64
{5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Debug|x64.Build.0 = Debug|x64
{5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Release|Win32.ActiveCfg = Release|Win32
{5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Release|Win32.Build.0 = Release|Win32
{5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Release|x64.ActiveCfg = Release|x64
{5D45F66B-BECD-4909-BCFC-C0F3CED9D0A2}.Release|x64.Build.0 = Release|x64
{05C5C84B-4EE3-4456-9AED-EECA583B793B}.Debug|Win32.ActiveCfg = Debug|Win32
{05C5C84B-4EE3-4456-9AED-EECA583B793B}.Debug|Win32.Build.0 = Debug|Win32
{05C5C84B-4EE3-4456-9AED-EECA583B793B}.Debug|x64.ActiveCfg = Debug|x64
{05C5C84B-4EE3-4456-9AED-EECA583B793B}.Debug|x64.Build.0 = Debug|x64
{05C5C84B-4EE3-4456-9AED-EECA583B793B}.Release|Win32.ActiveCfg = Release|Win32
{05C5C84B-4EE3-4456-9AED-EECA583B793B}.Release|Win32.Build.0 = Release|Win32
{05C5C84B-4EE3-4456-9AED-EECA583B793B}.Release|x64.ActiveCfg = Release|x64
{05C5C84B-4EE3-4456-9AED-EECA583B793B}.Release|x64.Build.0 = Release|x64
{45F5738D-CDF2-4024-974D-25B64F9043DE}.Debug|Win32.ActiveCfg = Debug|Win32
{45F5738D-CDF2-4024-974D-25B64F9043DE}.Debug|Win32.Build.0 = Debug|Win32
{45F5738D-CDF2-4024-974D-25B64F9043DE}.Debug|x64.ActiveCfg = Debug|x64

2
Easy2D/2d/Action.h
View File

@ -27,7 +27,7 @@ namespace easy2d
class ActionManager;
class Action
class E2D_API Action
: public virtual Object
, protected IntrusiveListItem<ActionPtr>
{

2
Easy2D/2d/Scene.h
View File

@ -25,7 +25,7 @@ namespace easy2d
{
// ³¡¾°
class E2D_API Scene
: public VisualNode
: public Node
{
public:
Scene();

36
Easy2D/Easy2D.vcxproj
View File

@ -4,6 +4,18 @@
<ClInclude Include="easy2d.h" />
<ClInclude Include="config.h" />
<ClInclude Include="macros.h" />
<ClInclude Include="easy2d-audio.h" />
<ClInclude Include="easy2d-imgui.h" />
<ClInclude Include="easy2d-network.h" />
<ClInclude Include="audio\audio-modules.h" />
<ClInclude Include="audio\audio.h" />
<ClInclude Include="audio\Music.h" />
<ClInclude Include="audio\Player.h" />
<ClInclude Include="audio\Transcoder.h" />
<ClInclude Include="audio\Voice.h" />
<ClInclude Include="imgui\ImGuiLayer.h" />
<ClInclude Include="imgui\ImGuiView.h" />
<ClInclude Include="imgui\imgui_impl_dx11.h" />
<ClInclude Include="2d\include-forwards.h" />
<ClInclude Include="2d\Action.h" />
<ClInclude Include="2d\ActionGroup.h" />
@ -61,6 +73,10 @@
<ClInclude Include="math\Rect.hpp" />
<ClInclude Include="math\scalar.hpp" />
<ClInclude Include="math\Vec2.hpp" />
<ClInclude Include="network\helper.h" />
<ClInclude Include="network\HttpClient.h" />
<ClInclude Include="network\HttpRequest.h" />
<ClInclude Include="network\HttpResponse.h" />
<ClInclude Include="platform\Application.h" />
<ClInclude Include="platform\modules.h" />
<ClInclude Include="renderer\D2DDeviceResources.h" />
@ -70,6 +86,12 @@
<ClInclude Include="renderer\helper.hpp" />
<ClInclude Include="renderer\render.h" />
<ClInclude Include="renderer\TextRenderer.h" />
<ClInclude Include="third-party\ImGui\imconfig.h" />
<ClInclude Include="third-party\ImGui\imgui.h" />
<ClInclude Include="third-party\ImGui\imgui_internal.h" />
<ClInclude Include="third-party\ImGui\imstb_rectpack.h" />
<ClInclude Include="third-party\ImGui\imstb_textedit.h" />
<ClInclude Include="third-party\ImGui\imstb_truetype.h" />
<ClInclude Include="ui\Button.h" />
<ClInclude Include="ui\Menu.h" />
<ClInclude Include="utils\DataUtil.h" />
@ -96,6 +118,12 @@
<ClCompile Include="2d\Sprite.cpp" />
<ClCompile Include="2d\Text.cpp" />
<ClCompile Include="2d\Transition.cpp" />
<ClCompile Include="audio\audio-modules.cpp" />
<ClCompile Include="audio\audio.cpp" />
<ClCompile Include="audio\Music.cpp" />
<ClCompile Include="audio\Player.cpp" />
<ClCompile Include="audio\Transcoder.cpp" />
<ClCompile Include="audio\Voice.cpp" />
<ClCompile Include="base\AsyncTask.cpp" />
<ClCompile Include="base\EventDispatcher.cpp" />
<ClCompile Include="base\EventListener.cpp" />
@ -107,6 +135,10 @@
<ClCompile Include="base\TimerManager.cpp" />
<ClCompile Include="base\time.cpp" />
<ClCompile Include="base\window.cpp" />
<ClCompile Include="imgui\ImGuiLayer.cpp" />
<ClCompile Include="imgui\ImGuiView.cpp" />
<ClCompile Include="imgui\imgui_impl_dx11.cpp" />
<ClCompile Include="network\HttpClient.cpp" />
<ClCompile Include="platform\Application.cpp" />
<ClCompile Include="platform\modules.cpp" />
<ClCompile Include="renderer\D2DDeviceResources.cpp" />
@ -114,6 +146,10 @@
<ClCompile Include="renderer\D3D11DeviceResources.cpp" />
<ClCompile Include="renderer\render.cpp" />
<ClCompile Include="renderer\TextRenderer.cpp" />
<ClCompile Include="third-party\ImGui\imgui.cpp" />
<ClCompile Include="third-party\ImGui\imgui_demo.cpp" />
<ClCompile Include="third-party\ImGui\imgui_draw.cpp" />
<ClCompile Include="third-party\ImGui\imgui_widgets.cpp" />
<ClCompile Include="ui\Button.cpp" />
<ClCompile Include="ui\Menu.cpp" />
<ClCompile Include="utils\DataUtil.cpp" />

117
Easy2D/Easy2D.vcxproj.filters
View File

@ -25,6 +25,21 @@
<Filter Include="renderer">
<UniqueIdentifier>{7897afce-24cb-42b4-9443-56508e4ec89c}</UniqueIdentifier>
</Filter>
<Filter Include="audio">
<UniqueIdentifier>{75bae23a-ca4e-4571-86b2-9ce77c385989}</UniqueIdentifier>
</Filter>
<Filter Include="network">
<UniqueIdentifier>{3ff6bc37-0aa4-4f22-8ba3-923d730c2591}</UniqueIdentifier>
</Filter>
<Filter Include="imgui">
<UniqueIdentifier>{622338f7-bf1e-4108-92d7-78625c447f74}</UniqueIdentifier>
</Filter>
<Filter Include="third-party">
<UniqueIdentifier>{91029e1e-40c2-40d9-bfc4-a51d9df02b80}</UniqueIdentifier>
</Filter>
<Filter Include="third-party\ImGui">
<UniqueIdentifier>{2f24af2d-eba6-4be1-9ac4-fc58aeac6670}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="ui\Button.h">
@ -246,6 +261,66 @@
<ClInclude Include="base\AsyncTask.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="audio\audio.h">
<Filter>audio</Filter>
</ClInclude>
<ClInclude Include="audio\audio-modules.h">
<Filter>audio</Filter>
</ClInclude>
<ClInclude Include="audio\Music.h">
<Filter>audio</Filter>
</ClInclude>
<ClInclude Include="audio\Player.h">
<Filter>audio</Filter>
</ClInclude>
<ClInclude Include="audio\Transcoder.h">
<Filter>audio</Filter>
</ClInclude>
<ClInclude Include="audio\Voice.h">
<Filter>audio</Filter>
</ClInclude>
<ClInclude Include="network\helper.h">
<Filter>network</Filter>
</ClInclude>
<ClInclude Include="network\HttpClient.h">
<Filter>network</Filter>
</ClInclude>
<ClInclude Include="network\HttpRequest.h">
<Filter>network</Filter>
</ClInclude>
<ClInclude Include="network\HttpResponse.h">
<Filter>network</Filter>
</ClInclude>
<ClInclude Include="imgui\imgui_impl_dx11.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="imgui\ImGuiLayer.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="imgui\ImGuiView.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="easy2d-audio.h" />
<ClInclude Include="easy2d-imgui.h" />
<ClInclude Include="easy2d-network.h" />
<ClInclude Include="third-party\ImGui\imconfig.h">
<Filter>third-party\ImGui</Filter>
</ClInclude>
<ClInclude Include="third-party\ImGui\imgui.h">
<Filter>third-party\ImGui</Filter>
</ClInclude>
<ClInclude Include="third-party\ImGui\imgui_internal.h">
<Filter>third-party\ImGui</Filter>
</ClInclude>
<ClInclude Include="third-party\ImGui\imstb_rectpack.h">
<Filter>third-party\ImGui</Filter>
</ClInclude>
<ClInclude Include="third-party\ImGui\imstb_textedit.h">
<Filter>third-party\ImGui</Filter>
</ClInclude>
<ClInclude Include="third-party\ImGui\imstb_truetype.h">
<Filter>third-party\ImGui</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ui\Button.cpp">
@ -374,5 +449,47 @@
<ClCompile Include="base\AsyncTask.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="audio\audio.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="audio\audio-modules.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="audio\Music.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="audio\Player.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="audio\Transcoder.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="audio\Voice.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="network\HttpClient.cpp">
<Filter>network</Filter>
</ClCompile>
<ClCompile Include="imgui\imgui_impl_dx11.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="imgui\ImGuiLayer.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="imgui\ImGuiView.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="third-party\ImGui\imgui.cpp">
<Filter>third-party\ImGui</Filter>
</ClCompile>
<ClCompile Include="third-party\ImGui\imgui_demo.cpp">
<Filter>third-party\ImGui</Filter>
</ClCompile>
<ClCompile Include="third-party\ImGui\imgui_draw.cpp">
<Filter>third-party\ImGui</Filter>
</ClCompile>
<ClCompile Include="third-party\ImGui\imgui_widgets.cpp">
<Filter>third-party\ImGui</Filter>
</ClCompile>
</ItemGroup>
</Project>

2
Easy2D-Audio/Music.cpp → Easy2D/audio/Music.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 "easy2d-audio.h"
#include "../easy2d-audio.h"
#include "Music.h"
#include "Transcoder.h"

0
Easy2D-Audio/Music.h → Easy2D/audio/Music.h
View File

2
Easy2D-Audio/Player.cpp → Easy2D/audio/Player.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 "easy2d-audio.h"
#include "../easy2d-audio.h"
#include "Player.h"
namespace easy2d

0
Easy2D-Audio/Player.h → Easy2D/audio/Player.h
View File

2
Easy2D-Audio/Transcoder.cpp → Easy2D/audio/Transcoder.cpp
View File

@ -22,7 +22,7 @@
# define INITGUID // MFAudioFormat_PCM, MF_MT_MAJOR_TYPE, MF_MT_SUBTYPE, MFMediaType_Audio
#endif
#include "easy2d-audio.h"
#include "../easy2d-audio.h"
#include "Transcoder.h"
#include "audio-modules.h"

0
Easy2D-Audio/Transcoder.h → Easy2D/audio/Transcoder.h
View File

2
Easy2D-Audio/Voice.cpp → Easy2D/audio/Voice.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 "easy2d-audio.h"
#include "../easy2d-audio.h"
#include "Voice.h"
namespace easy2d

0
Easy2D-Audio/Voice.h → Easy2D/audio/Voice.h
View File

2
Easy2D-Audio/audio-modules.cpp → Easy2D/audio/audio-modules.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 "easy2d-audio.h"
#include "../easy2d-audio.h"
#include "audio-modules.h"
namespace easy2d

0
Easy2D-Audio/audio-modules.h → Easy2D/audio/audio-modules.h
View File

2
Easy2D-Audio/audio.cpp → Easy2D/audio/audio.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 "easy2d-audio.h"
#include "../easy2d-audio.h"
#include "audio.h"
#include "audio-modules.h"

0
Easy2D-Audio/audio.h → Easy2D/audio/audio.h
View File

27
Easy2D/common/String.h
View File

@ -164,7 +164,7 @@ namespace easy2d
inline String& assign(const wchar_t* cstr, bool const_str = true) { String(cstr, const_str).swap(*this); return *this; }
inline String& assign(std::wstring const& str) { String{ str }.swap(*this); return *this; }
inline String& assign(String const& rhs) { String{ rhs }.swap(*this); return *this; }
inline String& assign(String const& rhs, size_type pos, size_type count = npos) { String(rhs, pos, count).swap(*this); return *this; }
String& assign(String const& rhs, size_type pos, size_type count = npos);
template <typename _Iter>
inline String& assign(_Iter first, _Iter last) { assign_iter(first, last); return(*this); }
@ -598,6 +598,31 @@ namespace easy2d
return (*this);
}
inline String& String::assign(String const& rhs, size_type pos, size_type count)
{
if (count == 0 || pos > rhs.size())
{
clear();
return (*this);
}
discard_const_data();
count = rhs.clamp_suffix_size(pos, count);
if (count > capacity_)
{
destroy();
str_ = allocate(count + 1);
capacity_ = count;
}
size_ = count;
char_traits::move(str_, rhs.begin().base() + pos, size_);
char_traits::assign(str_[size_], value_type());
return (*this);
}
inline String & String::erase(size_type offset, size_type count)
{
if (count == 0)

6
Easy2D-Audio/easy2d-audio.h → Easy2D/easy2d-audio.h
View File

@ -21,6 +21,6 @@
#pragma once
#include "easy2d.h"
#include "audio.h"
#include "Music.h"
#include "Player.h"
#include "audio/audio.h"
#include "audio/Music.h"
#include "audio/Player.h"

7
Easy2D-ImGui/easy2d-imgui.h → Easy2D/easy2d-imgui.h
View File

@ -20,8 +20,9 @@
#pragma once
#include "easy2d.h"
#include "ImGuiView.h"
#include "ImGuiLayer.h"
#include "imgui/ImGuiLayer.h"
#include "imgui/ImGuiView.h"
// ImGui
#include "libs/ImGui/imgui.h"
#include "third-party/ImGui/imgui.h"

11
Easy2D-Network/easy2d-network.h → Easy2D/easy2d-network.h
View File

@ -21,7 +21,10 @@
#pragma once
#include "easy2d.h"
#include "helper.h"
#include "HttpRequest.h"
#include "HttpResponse.h"
#include "HttpClient.h"
#include "network/helper.h"
#include "network/HttpRequest.h"
#include "network/HttpResponse.h"
#include "network/HttpClient.h"
// CURL
#include "third-party/curl/curl.h"

3
Easy2D-ImGui/ImGuiLayer.cpp → Easy2D/imgui/ImGuiLayer.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 "easy2d-imgui.h"
#include "../easy2d-imgui.h"
namespace easy2d
{
@ -39,6 +39,7 @@ namespace easy2d
ImGuiLayer::~ImGuiLayer()
{
ImGuiView::Instance().RemoveLayer(this);
}
void ImGuiLayer::OnMouseButtonDown(int btn, Point const & p)

9
Easy2D-ImGui/ImGuiLayer.h → Easy2D/imgui/ImGuiLayer.h
View File

@ -22,6 +22,8 @@
namespace easy2d
{
class ImGuiView;
E2D_DECLARE_SMART_PTR(ImGuiLayer);
using ImGuiPipeline = std::function<void()>;
@ -29,9 +31,9 @@ namespace easy2d
class ImGuiLayer
: public Layer
{
public:
ImGuiLayer();
friend class ImGuiView;
public:
virtual ~ImGuiLayer();
// Ìí¼Ó ImGui ÔªËØ
@ -64,6 +66,9 @@ namespace easy2d
void UpdateMousePos();
void UpdateMouseCursor();
protected:
ImGuiLayer();
protected:
HWND target_window_;
Map<String, ImGuiPipeline> pipelines_;

34
Easy2D-ImGui/ImGuiView.cpp → Easy2D/imgui/ImGuiView.cpp
View File

@ -1,6 +1,6 @@
// Copyright (C) 2019 Nomango
#include "easy2d-imgui.h"
#include "../easy2d-imgui.h"
#include "imgui_impl_dx11.h"
namespace easy2d
@ -80,4 +80,36 @@ namespace easy2d
ImGui_ImplDX11_RenderDrawData(ImGui::GetDrawData());
}
ImGuiLayerPtr ImGuiView::CreateLayer(Scene* scene)
{
auto iter = layers_.find(scene);
if (iter == layers_.end())
{
ImGuiLayerPtr layer = new (std::nothrow) ImGuiLayer;
if (layer)
{
layers_.insert(std::make_pair(scene, layer.Get()));
}
return layer;
}
else
{
return iter->second;
}
}
void ImGuiView::RemoveLayer(ImGuiLayer* layer)
{
using value_type = Map<Scene*, Layer*>::value_type;
auto iter = std::find_if(layers_.begin(), layers_.end(), [=](value_type const& value)
{
return value.second == layer;
});
if (iter != layers_.end())
{
layers_.erase(iter);
}
}
}

23
Easy2D-ImGui/ImGuiView.h → Easy2D/imgui/ImGuiView.h
View File

@ -22,23 +22,38 @@
namespace easy2d
{
class ImGuiLayer;
class ImGuiView
: public Singleton<ImGuiView>
, public Component
{
E2D_DECLARE_SINGLETON(ImGuiView);
public:
void SetupComponent(Application* app) override;
void DestroyComponent() override;
friend class ImGuiLayer;
public:
// ´´½¨ ImGui ͼ²ã
ImGuiLayerPtr CreateLayer(
Scene* scene /* Ö¸¶¨³¡¾° */
);
private:
void Init(HWND hwnd);
void NewFrame();
void Render();
void RemoveLayer(ImGuiLayer* layer);
public:
void SetupComponent(Application* app) override;
void DestroyComponent() override;
private:
Map<Scene*, ImGuiLayer*> layers_;
};
}

2
Easy2D-ImGui/imgui_impl_dx11.cpp → Easy2D/imgui/imgui_impl_dx11.cpp
View File

@ -1,6 +1,6 @@
// dear imgui: Renderer for Easy2D (DirectX11)
#include "libs/ImGui/imgui.h"
#include "../easy2d-imgui.h"
#include "imgui_impl_dx11.h"
// DirectX

0
Easy2D-ImGui/imgui_impl_dx11.h → Easy2D/imgui/imgui_impl_dx11.h
View File

6
Easy2D-Network/HttpClient.cpp → Easy2D/network/HttpClient.cpp
View File

@ -18,11 +18,13 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include "easy2d-network.h"
#include "curl/curl.h"
#include "../easy2d-network.h"
#include <thread>
#include <codecvt>
// CURL
#include "../third-party/curl/curl.h"
#pragma comment(lib, "libcurl.lib")
namespace

2
Easy2D-Network/HttpClient.h → Easy2D/network/HttpClient.h
View File

@ -26,7 +26,7 @@ namespace easy2d
{
namespace network
{
class HttpClient
class E2D_API HttpClient
: public Singleton<HttpClient>
, public Component
{

2
Easy2D-Network/HttpRequest.h → Easy2D/network/HttpRequest.h
View File

@ -26,7 +26,7 @@ namespace easy2d
{
typedef std::function<void(HttpRequestPtr, HttpResponsePtr)> ResponseCallback;
class HttpRequest
class E2D_API HttpRequest
: public Object
{
public:

2
Easy2D-Network/HttpResponse.h → Easy2D/network/HttpResponse.h
View File

@ -24,7 +24,7 @@ namespace easy2d
{
namespace network
{
class HttpResponse
class E2D_API HttpResponse
: public Object
{
public:

0
Easy2D-Network/helper.h → Easy2D/network/helper.h
View File

8
Easy2D/platform/Application.cpp
View File

@ -144,6 +144,10 @@ namespace easy2d
::CoInitialize(nullptr);
main_window_ = new Window;
Use(&Renderer::Instance());
Use(&Input::Instance());
Use(&AsyncTaskThread::Instance());
}
Application::~Application()
@ -171,10 +175,6 @@ namespace easy2d
Renderer::Instance().SetClearColor(options.clear_color);
Renderer::Instance().SetVSyncEnabled(options.vsync);
Use(&Renderer::Instance());
Use(&Input::Instance());
Use(&AsyncTaskThread::Instance());
// Setup all components
for (Component* c : components_)
{

0
Easy2D-ImGui/libs/ImGui/LICENSE.txt → Easy2D/third-party/ImGui/LICENSE.txt vendored
View File

0
Easy2D-ImGui/libs/ImGui/imconfig.h → Easy2D/third-party/ImGui/imconfig.h vendored
View File

0
Easy2D-ImGui/libs/ImGui/imgui.cpp → Easy2D/third-party/ImGui/imgui.cpp vendored
View File

0
Easy2D-ImGui/libs/ImGui/imgui.h → Easy2D/third-party/ImGui/imgui.h vendored
View File

0
Easy2D-ImGui/libs/ImGui/imgui_demo.cpp → Easy2D/third-party/ImGui/imgui_demo.cpp vendored
View File

0
Easy2D-ImGui/libs/ImGui/imgui_draw.cpp → Easy2D/third-party/ImGui/imgui_draw.cpp vendored
View File

0
Easy2D-ImGui/libs/ImGui/imgui_internal.h → Easy2D/third-party/ImGui/imgui_internal.h vendored
View File

0
Easy2D-ImGui/libs/ImGui/imgui_widgets.cpp → Easy2D/third-party/ImGui/imgui_widgets.cpp vendored
View File

0
Easy2D-ImGui/libs/ImGui/imstb_rectpack.h → Easy2D/third-party/ImGui/imstb_rectpack.h vendored
View File

0
Easy2D-ImGui/libs/ImGui/imstb_textedit.h → Easy2D/third-party/ImGui/imstb_textedit.h vendored
View File

0
Easy2D-ImGui/libs/ImGui/imstb_truetype.h → Easy2D/third-party/ImGui/imstb_truetype.h vendored
View File

0
Easy2D-Network/curl/curl.h → Easy2D/third-party/curl/curl.h vendored
View File

0
Easy2D-Network/curl/curlbuild.h → Easy2D/third-party/curl/curlbuild.h vendored
View File

0
Easy2D-Network/curl/curlrules.h → Easy2D/third-party/curl/curlrules.h vendored
View File

0
Easy2D-Network/curl/curlver.h → Easy2D/third-party/curl/curlver.h vendored
View File

0
Easy2D-Network/curl/easy.h → Easy2D/third-party/curl/easy.h vendored
View File

0
Easy2D-Network/curl/mprintf.h → Easy2D/third-party/curl/mprintf.h vendored
View File

0
Easy2D-Network/curl/multi.h → Easy2D/third-party/curl/multi.h vendored
View File

0
Easy2D-Network/curl/stdcheaders.h → Easy2D/third-party/curl/stdcheaders.h vendored
View File

0
Easy2D-Network/curl/typecheck-gcc.h → Easy2D/third-party/curl/typecheck-gcc.h vendored
View File

0
Easy2D-Network/dlls/libcrypto-1_1.dll → Easy2D/third-party/dlls/libcrypto-1_1.dll vendored
View File

0
Easy2D-Network/dlls/libcurl.dll → Easy2D/third-party/dlls/libcurl.dll vendored
View File

0
Easy2D-Network/dlls/libssl-1_1.dll → Easy2D/third-party/dlls/libssl-1_1.dll vendored
View File

0
Easy2D-Network/libs/libcurl.lib → Easy2D/third-party/libs/libcurl.lib vendored
View File

8
samples/HelloWorld/HelloWorld.vcxproj
View File

@ -105,7 +105,7 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -118,7 +118,7 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -133,7 +133,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -150,7 +150,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../Easy2D</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>

11
samples/ImGuiSample/ImGuiSample.vcxproj
View File

@ -104,7 +104,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../Easy2D;../../Easy2D-ImGui</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -116,7 +116,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../Easy2D;../../Easy2D-ImGui</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -130,7 +130,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../Easy2D;../../Easy2D-ImGui</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../Easy2D;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -146,7 +146,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../Easy2D;../../Easy2D-ImGui</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../Easy2D</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -159,9 +159,6 @@
<ClCompile Include="main.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Easy2D-ImGui\Easy2D-ImGui.vcxproj">
<Project>{23aff03b-a670-4c33-b790-18eec82c61ae}</Project>
</ProjectReference>
<ProjectReference Include="..\..\Easy2D\Easy2D.vcxproj">
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
</ProjectReference>

2
samples/ImGuiSample/MainScene.h
View File

@ -19,7 +19,7 @@ public:
MainScene()
{
// 创建 ImGui 图层
ImGuiLayerPtr layer = new ImGuiLayer;
ImGuiLayerPtr layer = ImGuiView::Instance().CreateLayer(this);
AddChild(layer);
// 添加 ImGui 提供的 Demo 窗口

22
samples/Samples/Samples.vcxproj
View File

@ -104,12 +104,12 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../Easy2D;../../Easy2D-Audio;../../Easy2D-Network</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../Easy2D;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>../../Easy2D-Network/libs;</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../../Easy2D/third-party/libs;</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -117,12 +117,12 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../Easy2D;../../Easy2D-Audio;../../Easy2D-Network</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../Easy2D;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>../../Easy2D-Network/libs;</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../../Easy2D/third-party/libs;</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -132,14 +132,14 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../Easy2D;../../Easy2D-Audio;../../Easy2D-Network</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../Easy2D;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>../../Easy2D-Network/libs;</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../../Easy2D/third-party/libs;</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -149,14 +149,14 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../Easy2D;../../Easy2D-Audio;../../Easy2D-Network</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../Easy2D;</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>../../Easy2D-Network/libs;</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../../Easy2D/third-party/libs;</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@ -171,12 +171,6 @@
<ClInclude Include="Demo5.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Easy2D-Audio\Easy2D-Audio.vcxproj">
<Project>{5d45f66b-becd-4909-bcfc-c0f3ced9d0a2}</Project>
</ProjectReference>
<ProjectReference Include="..\..\Easy2D-Network\Easy2D-Network.vcxproj">
<Project>{05c5c84b-4ee3-4456-9aed-eeca583b793b}</Project>
</ProjectReference>
<ProjectReference Include="..\..\Easy2D\Easy2D.vcxproj">
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
</ProjectReference>