[deploy] Merge pull request #40 from KiwanoEngine/dev
Add core::any & FileSystem & LocalStorage & UserData & more...
This commit is contained in:
Haibo
GitHub
commit
32786a8533
|
|
@ -0,0 +1,97 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\StackWalker\StackWalker.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\..\src\3rd-party\StackWalker\StackWalker.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<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>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{3A3948DC-9865-46B3-B7B9-7E5572704ED2}</ProjectGuid>
|
||||||
|
<RootNamespace>libStackWalker</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>$(DefaultPlatformToolset)</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>$(DefaultPlatformToolset)</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>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<DebugInformationFormat>None</DebugInformationFormat>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
|
||||||
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>MaxSpeed</Optimization>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<DebugInformationFormat>None</DebugInformationFormat>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
|
||||||
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\..\src\3rd-party\StackWalker\StackWalker.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\StackWalker\StackWalker.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,105 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\curl.h" />
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\curlbuild.h" />
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\curlrules.h" />
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\curlver.h" />
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\easy.h" />
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\mprintf.h" />
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\multi.h" />
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\stdcheaders.h" />
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\typecheck-gcc.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Library Include="..\..\..\src\3rd-party\curl\libs\libcurl.lib" />
|
||||||
|
</ItemGroup>
|
||||||
|
<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>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{A9ABACC7-75A1-46BA-8E48-4105346D9719}</ProjectGuid>
|
||||||
|
<RootNamespace>libcurl</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>$(DefaultPlatformToolset)</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>$(DefaultPlatformToolset)</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>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<DebugInformationFormat>None</DebugInformationFormat>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
|
||||||
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>MaxSpeed</Optimization>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<DebugInformationFormat>None</DebugInformationFormat>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
|
||||||
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,43 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="include">
|
||||||
|
<UniqueIdentifier>{C9C8ABBE-E2ED-4990-854D-3F343C451180}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="libs">
|
||||||
|
<UniqueIdentifier>{579bb80d-1063-46e7-97d1-9a5adb38c9eb}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\curlbuild.h">
|
||||||
|
<Filter>include</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\curlrules.h">
|
||||||
|
<Filter>include</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\curlver.h">
|
||||||
|
<Filter>include</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\easy.h">
|
||||||
|
<Filter>include</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\mprintf.h">
|
||||||
|
<Filter>include</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\multi.h">
|
||||||
|
<Filter>include</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\stdcheaders.h">
|
||||||
|
<Filter>include</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\typecheck-gcc.h">
|
||||||
|
<Filter>include</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\curl\tinyxml2.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Library Include="..\..\..\src\3rd-party\curl\libs\libcurl.lib">
|
||||||
|
<Filter>libs</Filter>
|
||||||
|
</Library>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,105 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\imgui\imconfig.h" />
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\imgui\imgui.h" />
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\imgui\imgui_internal.h" />
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\imgui\imstb_rectpack.h" />
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\imgui\imstb_textedit.h" />
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\imgui\imstb_truetype.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\..\src\3rd-party\imgui\imgui.cpp" />
|
||||||
|
<ClCompile Include="..\..\..\src\3rd-party\imgui\imgui_demo.cpp" />
|
||||||
|
<ClCompile Include="..\..\..\src\3rd-party\imgui\imgui_draw.cpp" />
|
||||||
|
<ClCompile Include="..\..\..\src\3rd-party\imgui\imgui_widgets.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<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>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{7FA1E56D-62AC-47D1-97D1-40B302724198}</ProjectGuid>
|
||||||
|
<RootNamespace>libimgui</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>$(DefaultPlatformToolset)</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>$(DefaultPlatformToolset)</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>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<DebugInformationFormat>None</DebugInformationFormat>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
|
||||||
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>MaxSpeed</Optimization>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<DebugInformationFormat>None</DebugInformationFormat>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
|
||||||
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="include">
|
||||||
|
<UniqueIdentifier>{6160FE38-37E6-41B0-9EAC-17047E5FB604}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="src">
|
||||||
|
<UniqueIdentifier>{679F9030-0259-4621-87DD-08D71081C409}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\imgui\imconfig.h">
|
||||||
|
<Filter>include</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\imgui\imgui.h">
|
||||||
|
<Filter>include</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\imgui\imgui_internal.h">
|
||||||
|
<Filter>include</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\imgui\imstb_rectpack.h">
|
||||||
|
<Filter>include</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\imgui\imstb_textedit.h">
|
||||||
|
<Filter>include</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\imgui\imstb_truetype.h">
|
||||||
|
<Filter>include</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\..\src\3rd-party\imgui\imgui.cpp">
|
||||||
|
<Filter>src</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\..\src\3rd-party\imgui\imgui_demo.cpp">
|
||||||
|
<Filter>src</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\..\src\3rd-party\imgui\imgui_draw.cpp">
|
||||||
|
<Filter>src</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\..\src\3rd-party\imgui\imgui_widgets.cpp">
|
||||||
|
<Filter>src</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,97 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\tinyxml2\tinyxml2.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\..\src\3rd-party\tinyxml2\tinyxml2.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<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>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{AB47E875-85E5-4105-A71E-88930EAAB910}</ProjectGuid>
|
||||||
|
<RootNamespace>libtinyxml2</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>$(DefaultPlatformToolset)</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>$(DefaultPlatformToolset)</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>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<DebugInformationFormat>None</DebugInformationFormat>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
|
||||||
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>MaxSpeed</Optimization>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<DebugInformationFormat>None</DebugInformationFormat>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
|
||||||
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\..\src\3rd-party\tinyxml2\tinyxml2.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\..\..\src\3rd-party\tinyxml2\tinyxml2.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -2,13 +2,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 16
|
# Visual Studio Version 16
|
||||||
VisualStudioVersion = 16.0.28729.10
|
VisualStudioVersion = 16.0.28729.10
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano", "kiwano.vcxproj", "{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano", "kiwano\kiwano.vcxproj", "{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano-audio", "kiwano-audio.vcxproj", "{1B97937D-8184-426C-BE71-29A163DC76C9}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano-audio", "kiwano-audio\kiwano-audio.vcxproj", "{1B97937D-8184-426C-BE71-29A163DC76C9}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano-network", "kiwano-network.vcxproj", "{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano-network", "kiwano-network\kiwano-network.vcxproj", "{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano-imgui", "kiwano-imgui.vcxproj", "{A7062ED8-8910-48A5-A3BC-C1612672571F}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano-imgui", "kiwano-imgui\kiwano-imgui.vcxproj", "{A7062ED8-8910-48A5-A3BC-C1612672571F}"
|
||||||
|
EndProject
|
||||||
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd-party", "3rd-party", "{2D8919F2-8922-4B3F-8F68-D4127C6BCBB7}"
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libStackWalker", "3rd-party\StackWalker\libStackWalker.vcxproj", "{3A3948DC-9865-46B3-B7B9-7E5572704ED2}"
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtinyxml2", "3rd-party\tinyxml2\libtinyxml2.vcxproj", "{AB47E875-85E5-4105-A71E-88930EAAB910}"
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libimgui", "3rd-party\imgui\libimgui.vcxproj", "{7FA1E56D-62AC-47D1-97D1-40B302724198}"
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "3rd-party\curl\libcurl.vcxproj", "{A9ABACC7-75A1-46BA-8E48-4105346D9719}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
|
@ -33,10 +43,32 @@ Global
|
||||||
{A7062ED8-8910-48A5-A3BC-C1612672571F}.Debug|Win32.Build.0 = Debug|Win32
|
{A7062ED8-8910-48A5-A3BC-C1612672571F}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{A7062ED8-8910-48A5-A3BC-C1612672571F}.Release|Win32.ActiveCfg = Release|Win32
|
{A7062ED8-8910-48A5-A3BC-C1612672571F}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
{A7062ED8-8910-48A5-A3BC-C1612672571F}.Release|Win32.Build.0 = Release|Win32
|
{A7062ED8-8910-48A5-A3BC-C1612672571F}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{3A3948DC-9865-46B3-B7B9-7E5572704ED2}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{3A3948DC-9865-46B3-B7B9-7E5572704ED2}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{3A3948DC-9865-46B3-B7B9-7E5572704ED2}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
|
{3A3948DC-9865-46B3-B7B9-7E5572704ED2}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{AB47E875-85E5-4105-A71E-88930EAAB910}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{AB47E875-85E5-4105-A71E-88930EAAB910}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{AB47E875-85E5-4105-A71E-88930EAAB910}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
|
{AB47E875-85E5-4105-A71E-88930EAAB910}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{7FA1E56D-62AC-47D1-97D1-40B302724198}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{7FA1E56D-62AC-47D1-97D1-40B302724198}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{7FA1E56D-62AC-47D1-97D1-40B302724198}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
|
{7FA1E56D-62AC-47D1-97D1-40B302724198}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{A9ABACC7-75A1-46BA-8E48-4105346D9719}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{A9ABACC7-75A1-46BA-8E48-4105346D9719}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{A9ABACC7-75A1-46BA-8E48-4105346D9719}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
|
{A9ABACC7-75A1-46BA-8E48-4105346D9719}.Release|Win32.Build.0 = Release|Win32
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
|
GlobalSection(NestedProjects) = preSolution
|
||||||
|
{3A3948DC-9865-46B3-B7B9-7E5572704ED2} = {2D8919F2-8922-4B3F-8F68-D4127C6BCBB7}
|
||||||
|
{AB47E875-85E5-4105-A71E-88930EAAB910} = {2D8919F2-8922-4B3F-8F68-D4127C6BCBB7}
|
||||||
|
{7FA1E56D-62AC-47D1-97D1-40B302724198} = {2D8919F2-8922-4B3F-8F68-D4127C6BCBB7}
|
||||||
|
{A9ABACC7-75A1-46BA-8E48-4105346D9719} = {2D8919F2-8922-4B3F-8F68-D4127C6BCBB7}
|
||||||
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {FAC2BE2F-19AF-477A-8DC6-4645E66868A4}
|
SolutionGuid = {FAC2BE2F-19AF-477A-8DC6-4645E66868A4}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
|
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="..\src\kiwano-audio\kiwano-audio.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano-audio\src\audio.h">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-audio\src\audio-modules.h">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-audio\src\Sound.h">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-audio\src\Transcoder.h">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-audio\src\SoundPlayer.h">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="..\src\kiwano-audio\src\audio.cpp">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano-audio\src\audio-modules.cpp">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano-audio\src\Sound.cpp">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano-audio\src\Transcoder.cpp">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano-audio\src\SoundPlayer.cpp">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Filter Include="src">
|
|
||||||
<UniqueIdentifier>{331b453a-33de-4e2a-9c06-19a3fc9d43f3}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
|
|
@ -1,19 +1,12 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\src\kiwano-audio\kiwano-audio.h" />
|
<ClInclude Include="..\..\src\kiwano-audio\audio-modules.h" />
|
||||||
<ClInclude Include="..\src\kiwano-audio\src\audio-modules.h" />
|
<ClInclude Include="..\..\src\kiwano-audio\AudioEngine.h" />
|
||||||
<ClInclude Include="..\src\kiwano-audio\src\audio.h" />
|
<ClInclude Include="..\..\src\kiwano-audio\kiwano-audio.h" />
|
||||||
<ClInclude Include="..\src\kiwano-audio\src\SoundPlayer.h" />
|
<ClInclude Include="..\..\src\kiwano-audio\Sound.h" />
|
||||||
<ClInclude Include="..\src\kiwano-audio\src\Sound.h" />
|
<ClInclude Include="..\..\src\kiwano-audio\SoundPlayer.h" />
|
||||||
<ClInclude Include="..\src\kiwano-audio\src\Transcoder.h" />
|
<ClInclude Include="..\..\src\kiwano-audio\Transcoder.h" />
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="..\src\kiwano-audio\src\audio-modules.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano-audio\src\audio.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano-audio\src\SoundPlayer.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano-audio\src\Sound.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano-audio\src\Transcoder.cpp" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
<ProjectConfiguration Include="Debug|Win32">
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
|
@ -26,10 +19,17 @@
|
||||||
</ProjectConfiguration>
|
</ProjectConfiguration>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="kiwano.vcxproj">
|
<ProjectReference Include="..\kiwano\kiwano.vcxproj">
|
||||||
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
|
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\src\kiwano-audio\audio-modules.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-audio\AudioEngine.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-audio\Sound.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-audio\SoundPlayer.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-audio\Transcoder.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{1B97937D-8184-426C-BE71-29A163DC76C9}</ProjectGuid>
|
<ProjectGuid>{1B97937D-8184-426C-BE71-29A163DC76C9}</ProjectGuid>
|
||||||
<RootNamespace>kiwano-audio</RootNamespace>
|
<RootNamespace>kiwano-audio</RootNamespace>
|
||||||
|
|
@ -68,7 +68,7 @@
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
<LinkIncremental>false</LinkIncremental>
|
<LinkIncremental>true</LinkIncremental>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
|
|
@ -77,7 +77,7 @@
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<AdditionalIncludeDirectories>../src/</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
|
|
@ -93,9 +93,9 @@
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<AdditionalIncludeDirectories>../src/</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\..\src\kiwano-audio\kiwano-audio.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano-audio\AudioEngine.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano-audio\audio-modules.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano-audio\Sound.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano-audio\SoundPlayer.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano-audio\Transcoder.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\src\kiwano-audio\AudioEngine.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-audio\audio-modules.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-audio\Sound.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-audio\SoundPlayer.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-audio\Transcoder.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -1,76 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<Filter Include="src">
|
|
||||||
<UniqueIdentifier>{ed21cd51-048d-4bbc-804a-d09a8afa1423}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="third-party">
|
|
||||||
<UniqueIdentifier>{f737b6d4-4462-49c1-8e9d-5c834bed598f}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="third-party\ImGui">
|
|
||||||
<UniqueIdentifier>{5b9d2eaa-0247-4ef5-8410-3221821b1221}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\src\imgui_impl_dx10.h">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\src\imgui_impl_dx11.h">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\src\ImGuiLayer.h">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imconfig.h">
|
|
||||||
<Filter>third-party\ImGui</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imgui.h">
|
|
||||||
<Filter>third-party\ImGui</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imgui_internal.h">
|
|
||||||
<Filter>third-party\ImGui</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imstb_rectpack.h">
|
|
||||||
<Filter>third-party\ImGui</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imstb_textedit.h">
|
|
||||||
<Filter>third-party\ImGui</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imstb_truetype.h">
|
|
||||||
<Filter>third-party\ImGui</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\kiwano-imgui.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\src\imgui_impl.h">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\src\ImGuiModule.h">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\src\imgui_impl_dx10.cpp">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\src\imgui_impl_dx11.cpp">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\src\ImGuiLayer.cpp">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui.cpp">
|
|
||||||
<Filter>third-party\ImGui</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui_demo.cpp">
|
|
||||||
<Filter>third-party\ImGui</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui_draw.cpp">
|
|
||||||
<Filter>third-party\ImGui</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui_widgets.cpp">
|
|
||||||
<Filter>third-party\ImGui</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\src\ImGuiModule.cpp">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
|
|
@ -1,28 +1,12 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\src\kiwano-imgui\kiwano-imgui.h" />
|
<ClInclude Include="..\..\src\kiwano-imgui\ImGuiLayer.h" />
|
||||||
<ClInclude Include="..\src\kiwano-imgui\src\ImGuiLayer.h" />
|
<ClInclude Include="..\..\src\kiwano-imgui\ImGuiModule.h" />
|
||||||
<ClInclude Include="..\src\kiwano-imgui\src\ImGuiModule.h" />
|
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl.h" />
|
||||||
<ClInclude Include="..\src\kiwano-imgui\src\imgui_impl.h" />
|
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl_dx10.h" />
|
||||||
<ClInclude Include="..\src\kiwano-imgui\src\imgui_impl_dx10.h" />
|
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl_dx11.h" />
|
||||||
<ClInclude Include="..\src\kiwano-imgui\src\imgui_impl_dx11.h" />
|
<ClInclude Include="..\..\src\kiwano-imgui\kiwano-imgui.h" />
|
||||||
<ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imconfig.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imgui.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imgui_internal.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imstb_rectpack.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imstb_textedit.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imstb_truetype.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\src\ImGuiLayer.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\src\ImGuiModule.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\src\imgui_impl_dx10.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\src\imgui_impl_dx11.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui_demo.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui_draw.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui_widgets.cpp" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
<ProjectConfiguration Include="Debug|Win32">
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
|
@ -35,10 +19,19 @@
|
||||||
</ProjectConfiguration>
|
</ProjectConfiguration>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="kiwano.vcxproj">
|
<ProjectReference Include="..\3rd-party\imgui\libimgui.vcxproj">
|
||||||
|
<Project>{7fa1e56d-62ac-47d1-97d1-40b302724198}</Project>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\kiwano\kiwano.vcxproj">
|
||||||
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
|
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\src\kiwano-imgui\ImGuiLayer.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-imgui\ImGuiModule.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-imgui\imgui_impl_dx10.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-imgui\imgui_impl_dx11.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{A7062ED8-8910-48A5-A3BC-C1612672571F}</ProjectGuid>
|
<ProjectGuid>{A7062ED8-8910-48A5-A3BC-C1612672571F}</ProjectGuid>
|
||||||
<RootNamespace>kiwano-imgui</RootNamespace>
|
<RootNamespace>kiwano-imgui</RootNamespace>
|
||||||
|
|
@ -69,12 +62,12 @@
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
<LinkIncremental>false</LinkIncremental>
|
<LinkIncremental>true</LinkIncremental>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
<LinkIncremental>true</LinkIncremental>
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
|
@ -86,7 +79,7 @@
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<AdditionalIncludeDirectories>../src/</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
|
|
@ -102,9 +95,9 @@
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<AdditionalIncludeDirectories>../src/</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\..\src\kiwano-imgui\kiwano-imgui.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl_dx10.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl_dx11.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano-imgui\ImGuiLayer.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano-imgui\ImGuiModule.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\src\kiwano-imgui\imgui_impl_dx10.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-imgui\imgui_impl_dx11.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-imgui\ImGuiLayer.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-imgui\ImGuiModule.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="..\src\kiwano-network\kiwano-network.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano-network\src\helper.h">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-network\src\HttpClient.h">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-network\src\HttpRequest.hpp">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano-network\src\HttpResponse.hpp">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Filter Include="src">
|
|
||||||
<UniqueIdentifier>{702f4435-7612-4ce6-86c8-744d1868c19a}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="libs">
|
|
||||||
<UniqueIdentifier>{4b536a1f-2907-4b85-baad-074d7274a5eb}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="..\src\kiwano-network\src\HttpClient.cpp">
|
|
||||||
<Filter>src</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Library Include="..\src\kiwano-network\third-party\libs\libcurl.lib">
|
|
||||||
<Filter>libs</Filter>
|
|
||||||
</Library>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
|
|
@ -1,14 +1,10 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\src\kiwano-network\kiwano-network.h" />
|
<ClInclude Include="..\..\src\kiwano-network\HttpClient.h" />
|
||||||
<ClInclude Include="..\src\kiwano-network\src\helper.h" />
|
<ClInclude Include="..\..\src\kiwano-network\HttpRequest.h" />
|
||||||
<ClInclude Include="..\src\kiwano-network\src\HttpClient.h" />
|
<ClInclude Include="..\..\src\kiwano-network\HttpResponse.hpp" />
|
||||||
<ClInclude Include="..\src\kiwano-network\src\HttpRequest.hpp" />
|
<ClInclude Include="..\..\src\kiwano-network\kiwano-network.h" />
|
||||||
<ClInclude Include="..\src\kiwano-network\src\HttpResponse.hpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="..\src\kiwano-network\src\HttpClient.cpp" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
<ProjectConfiguration Include="Debug|Win32">
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
|
@ -21,13 +17,17 @@
|
||||||
</ProjectConfiguration>
|
</ProjectConfiguration>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Library Include="..\src\kiwano-network\third-party\libs\libcurl.lib" />
|
<ProjectReference Include="..\3rd-party\curl\libcurl.vcxproj">
|
||||||
</ItemGroup>
|
<Project>{a9abacc7-75a1-46ba-8e48-4105346d9719}</Project>
|
||||||
<ItemGroup>
|
</ProjectReference>
|
||||||
<ProjectReference Include="kiwano.vcxproj">
|
<ProjectReference Include="..\kiwano\kiwano.vcxproj">
|
||||||
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
|
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\src\kiwano-network\HttpClient.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-network\HttpRequest.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}</ProjectGuid>
|
<ProjectGuid>{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}</ProjectGuid>
|
||||||
<RootNamespace>kiwano-network</RootNamespace>
|
<RootNamespace>kiwano-network</RootNamespace>
|
||||||
|
|
@ -66,7 +66,7 @@
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
<LinkIncremental>false</LinkIncremental>
|
<LinkIncremental>true</LinkIncremental>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
|
|
@ -75,7 +75,7 @@
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<AdditionalIncludeDirectories>../src/</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
|
|
@ -91,9 +91,9 @@
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
<AdditionalIncludeDirectories>../src/</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\..\src\kiwano-network\kiwano-network.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano-network\HttpClient.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano-network\HttpRequest.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano-network\HttpResponse.hpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\src\kiwano-network\HttpClient.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano-network\HttpRequest.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -1,241 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\Action.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\ActionDelay.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\ActionGroup.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\ActionHelper.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\ActionManager.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\ActionWalk.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\ActionTween.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\Animation.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Frame.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\GifSprite.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Director.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\core\basic_json.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\core\function.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\core\core.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\core\intrusive_list.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\core\intrusive_ptr.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\core\noncopyable.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\core\singleton.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\core\string.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\core\types.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\core\vector.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\kiwano.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\config.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\macros.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\include-forwards.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Canvas.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\DebugActor.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\FrameSequence.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\ShapeActor.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Layer.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Actor.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Stage.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Sprite.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Text.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\TextStyle.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Transform.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Transition.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\AsyncTask.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Component.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Event.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\EventDispatcher.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\EventListener.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Input.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\keys.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Logger.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\ObjectBase.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\RefCounter.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Resource.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\SmartPtr.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Timer.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\TimerManager.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\time.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Window.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\math\constants.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\math\ease.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\math\math.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\math\Matrix.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\math\rand.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\math\Rect.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\math\scalar.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\math\Vec2.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\platform\Application.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\platform\modules.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\Brush.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\Color.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\Font.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\FontCollection.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\Geometry.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\GifImage.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\StrokeStyle.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\Texture.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\TextureCache.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\LayerArea.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\Renderer.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\RenderTarget.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\TextLayout.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\win32\ComPtr.hpp" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\win32\D2DDeviceResources.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\win32\D3D10DeviceResources.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\win32\D3D11DeviceResources.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\win32\D3DDeviceResourcesBase.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\win32\FontCollectionLoader.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\win32\TextRenderer.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\third-party\StackWalker\StackWalker.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\third-party\tinyxml2\tinyxml2.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\ui\Button.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\ui\Menu.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\utils\DataUtil.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\utils\FileUtil.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\utils\Path.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\utils\ResourceCache.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\action\Action.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\action\ActionDelay.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\action\ActionGroup.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\action\ActionManager.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\action\ActionWalk.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\action\ActionTween.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\action\Animation.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Canvas.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\DebugActor.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Frame.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\FrameSequence.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\ShapeActor.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\GifSprite.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Layer.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Actor.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Stage.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Sprite.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Text.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Transform.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Transition.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\base\AsyncTask.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\base\EventDispatcher.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\base\EventListener.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\base\Input.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\base\Logger.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\base\ObjectBase.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\base\Resource.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\base\Director.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\base\Timer.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\base\TimerManager.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\base\time.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\base\Window.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\platform\Application.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\platform\modules.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\Brush.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\Color.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\Font.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\FontCollection.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\Geometry.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\GifImage.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\Texture.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\TextureCache.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\LayerArea.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\Renderer.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\RenderTarget.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\TextLayout.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\win32\D2DDeviceResources.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\win32\D3D10DeviceResources.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\win32\D3D11DeviceResources.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\win32\FontCollectionLoader.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\win32\TextRenderer.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\third-party\StackWalker\StackWalker.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\third-party\tinyxml2\tinyxml2.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\ui\Button.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\ui\Menu.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\utils\DataUtil.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\utils\FileUtil.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\utils\Path.cpp" />
|
|
||||||
<ClCompile Include="..\src\kiwano\utils\ResourceCache.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<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>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}</ProjectGuid>
|
|
||||||
<RootNamespace>kiwano</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>$(DefaultPlatformToolset)</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</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>
|
|
||||||
<PropertyGroup Label="UserMacros" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
|
|
@ -1,492 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<Filter Include="math">
|
|
||||||
<UniqueIdentifier>{80bc6386-2b70-4bae-993c-649a55163a1b}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="utils">
|
|
||||||
<UniqueIdentifier>{68eac919-ee87-4030-a033-c251731928f5}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="ui">
|
|
||||||
<UniqueIdentifier>{07b6d541-4a1b-472a-aae0-daf9d082fe84}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="platform">
|
|
||||||
<UniqueIdentifier>{c2654ccc-59f6-4c17-bb6b-99b07fc78702}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="2d">
|
|
||||||
<UniqueIdentifier>{896bdedf-6e82-449b-9b6e-0bc69f3699b1}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="base">
|
|
||||||
<UniqueIdentifier>{2e18d99a-e906-499a-9e29-4e0783202644}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="renderer">
|
|
||||||
<UniqueIdentifier>{7897afce-24cb-42b4-9443-56508e4ec89c}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="third-party">
|
|
||||||
<UniqueIdentifier>{91029e1e-40c2-40d9-bfc4-a51d9df02b80}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="third-party\StackWalker">
|
|
||||||
<UniqueIdentifier>{1fec4835-63a1-4612-80b5-828dadf0ac63}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="third-party\tinyxml2">
|
|
||||||
<UniqueIdentifier>{0cae76f7-7016-4a45-bb26-a130fbce8024}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="2d\action">
|
|
||||||
<UniqueIdentifier>{9314f30d-5742-48b6-94e5-e3b4284106f6}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="core">
|
|
||||||
<UniqueIdentifier>{86e2d0f2-a9d0-4456-b6a5-d480228bbf82}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="renderer\win32">
|
|
||||||
<UniqueIdentifier>{30333461-e9bc-4709-84bd-ce6e0e1a3079}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="..\src\kiwano\ui\Button.h">
|
|
||||||
<Filter>ui</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\ui\Menu.h">
|
|
||||||
<Filter>ui</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Canvas.h">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\include-forwards.h">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Layer.h">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Sprite.h">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Text.h">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\TextStyle.hpp">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Transition.h">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Component.h">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Event.hpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\EventDispatcher.h">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\EventListener.h">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\keys.hpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\RefCounter.hpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Resource.h">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\time.h">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\math\constants.hpp">
|
|
||||||
<Filter>math</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\math\ease.hpp">
|
|
||||||
<Filter>math</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\math\Matrix.hpp">
|
|
||||||
<Filter>math</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\math\rand.h">
|
|
||||||
<Filter>math</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\math\Rect.hpp">
|
|
||||||
<Filter>math</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\math\scalar.hpp">
|
|
||||||
<Filter>math</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\platform\Application.h">
|
|
||||||
<Filter>platform</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\platform\modules.h">
|
|
||||||
<Filter>platform</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\utils\Path.h">
|
|
||||||
<Filter>utils</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\config.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\macros.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\math\Vec2.hpp">
|
|
||||||
<Filter>math</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Input.h">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\SmartPtr.hpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\kiwano.h" />
|
|
||||||
<ClInclude Include="..\src\kiwano\utils\DataUtil.h">
|
|
||||||
<Filter>utils</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Timer.h">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\TimerManager.h">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\AsyncTask.h">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\third-party\StackWalker\StackWalker.h">
|
|
||||||
<Filter>third-party\StackWalker</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\utils\FileUtil.h">
|
|
||||||
<Filter>utils</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\GifSprite.h">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\third-party\tinyxml2\tinyxml2.h">
|
|
||||||
<Filter>third-party\tinyxml2</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Director.h">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Actor.h">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Stage.h">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Frame.h">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\Action.h">
|
|
||||||
<Filter>2d\action</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\ActionGroup.h">
|
|
||||||
<Filter>2d\action</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\ActionHelper.h">
|
|
||||||
<Filter>2d\action</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\ActionTween.h">
|
|
||||||
<Filter>2d\action</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\ActionManager.h">
|
|
||||||
<Filter>2d\action</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\Animation.h">
|
|
||||||
<Filter>2d\action</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\utils\ResourceCache.h">
|
|
||||||
<Filter>utils</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\FrameSequence.h">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\core\basic_json.hpp">
|
|
||||||
<Filter>core</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\core\function.hpp">
|
|
||||||
<Filter>core</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\core\intrusive_list.hpp">
|
|
||||||
<Filter>core</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\core\intrusive_ptr.hpp">
|
|
||||||
<Filter>core</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\core\noncopyable.hpp">
|
|
||||||
<Filter>core</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\core\singleton.hpp">
|
|
||||||
<Filter>core</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\core\string.hpp">
|
|
||||||
<Filter>core</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\core\vector.hpp">
|
|
||||||
<Filter>core</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\core\core.h">
|
|
||||||
<Filter>core</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\DebugActor.h">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\ShapeActor.h">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\ActionDelay.h">
|
|
||||||
<Filter>2d\action</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\action\ActionWalk.h">
|
|
||||||
<Filter>2d\action</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Logger.h">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\Window.h">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\math\math.h">
|
|
||||||
<Filter>math</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\base\ObjectBase.h">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\Color.h">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\Font.h">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\Geometry.h">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\GifImage.h">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\LayerArea.h">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\Renderer.h">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\TextLayout.h">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\win32\ComPtr.hpp">
|
|
||||||
<Filter>renderer\win32</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\win32\D2DDeviceResources.h">
|
|
||||||
<Filter>renderer\win32</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\win32\D3D10DeviceResources.h">
|
|
||||||
<Filter>renderer\win32</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\win32\D3D11DeviceResources.h">
|
|
||||||
<Filter>renderer\win32</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\win32\D3DDeviceResourcesBase.h">
|
|
||||||
<Filter>renderer\win32</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\win32\FontCollectionLoader.h">
|
|
||||||
<Filter>renderer\win32</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\win32\TextRenderer.h">
|
|
||||||
<Filter>renderer\win32</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\RenderTarget.h">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\FontCollection.h">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\core\types.h">
|
|
||||||
<Filter>core</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\2d\Transform.h">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\Texture.h">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\TextureCache.h">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\StrokeStyle.h">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\src\kiwano\renderer\Brush.h">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="..\src\kiwano\ui\Button.cpp">
|
|
||||||
<Filter>ui</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\ui\Menu.cpp">
|
|
||||||
<Filter>ui</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Canvas.cpp">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Layer.cpp">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Sprite.cpp">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Text.cpp">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Transition.cpp">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\base\EventDispatcher.cpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\base\EventListener.cpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\base\Resource.cpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\base\time.cpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\platform\Application.cpp">
|
|
||||||
<Filter>platform</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\platform\modules.cpp">
|
|
||||||
<Filter>platform</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\utils\Path.cpp">
|
|
||||||
<Filter>utils</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\base\Input.cpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\utils\DataUtil.cpp">
|
|
||||||
<Filter>utils</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\base\Timer.cpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\base\TimerManager.cpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\base\AsyncTask.cpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\third-party\StackWalker\StackWalker.cpp">
|
|
||||||
<Filter>third-party\StackWalker</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\utils\FileUtil.cpp">
|
|
||||||
<Filter>utils</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\GifSprite.cpp">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\third-party\tinyxml2\tinyxml2.cpp">
|
|
||||||
<Filter>third-party\tinyxml2</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\base\Director.cpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Actor.cpp">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Stage.cpp">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Frame.cpp">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\action\Action.cpp">
|
|
||||||
<Filter>2d\action</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\action\ActionGroup.cpp">
|
|
||||||
<Filter>2d\action</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\action\ActionTween.cpp">
|
|
||||||
<Filter>2d\action</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\action\ActionManager.cpp">
|
|
||||||
<Filter>2d\action</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\action\Animation.cpp">
|
|
||||||
<Filter>2d\action</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\utils\ResourceCache.cpp">
|
|
||||||
<Filter>utils</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\FrameSequence.cpp">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\DebugActor.cpp">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\ShapeActor.cpp">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\action\ActionDelay.cpp">
|
|
||||||
<Filter>2d\action</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\action\ActionWalk.cpp">
|
|
||||||
<Filter>2d\action</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\base\Logger.cpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\base\Window.cpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\base\ObjectBase.cpp">
|
|
||||||
<Filter>base</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\Color.cpp">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\Font.cpp">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\Geometry.cpp">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\GifImage.cpp">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\LayerArea.cpp">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\Renderer.cpp">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\TextLayout.cpp">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\win32\D2DDeviceResources.cpp">
|
|
||||||
<Filter>renderer\win32</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\win32\D3D10DeviceResources.cpp">
|
|
||||||
<Filter>renderer\win32</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\win32\D3D11DeviceResources.cpp">
|
|
||||||
<Filter>renderer\win32</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\win32\FontCollectionLoader.cpp">
|
|
||||||
<Filter>renderer\win32</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\win32\TextRenderer.cpp">
|
|
||||||
<Filter>renderer\win32</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\RenderTarget.cpp">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\FontCollection.cpp">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\2d\Transform.cpp">
|
|
||||||
<Filter>2d</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\Texture.cpp">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\TextureCache.cpp">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\src\kiwano\renderer\Brush.cpp">
|
|
||||||
<Filter>renderer</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
|
|
@ -0,0 +1,249 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\Action.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\ActionDelay.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\ActionGroup.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\ActionHelper.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\ActionManager.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\ActionWalk.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\ActionTween.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\Animation.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Frame.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\GifSprite.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Director.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\win32\ComPtr.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\win32\helper.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\any.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\basic_json.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\function.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\core.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\intrusive_list.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\intrusive_ptr.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\noncopyable.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\singleton.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\string.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\vector.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\kiwano.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\config.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\macros.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\include-forwards.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Canvas.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\DebugActor.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\FrameSequence.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\ShapeActor.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Layer.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Actor.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Stage.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Sprite.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Text.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\TextStyle.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Transform.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Transition.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\AsyncTask.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Component.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Event.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\EventDispatcher.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\EventListener.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Input.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\keys.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Logger.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\ObjectBase.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\RefCounter.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Resource.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\SmartPtr.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Timer.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\TimerManager.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\time.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Window.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\constants.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\ease.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\math.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\Matrix.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\rand.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\Rect.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\scalar.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\Vec2.hpp" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\platform\Application.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\platform\modules.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\Brush.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\Color.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\Font.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\FontCollection.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\Geometry.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\GifImage.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\StrokeStyle.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\Texture.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\TextureCache.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\LayerArea.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\Renderer.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\RenderTarget.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\TextLayout.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\win32\D2DDeviceResources.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\win32\D3D10DeviceResources.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\win32\D3D11DeviceResources.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\win32\D3DDeviceResourcesBase.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\win32\FontCollectionLoader.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\win32\TextRenderer.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\ui\Button.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\ui\Menu.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\utils\LocalStorage.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\utils\FileSystem.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\utils\ResourceCache.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\utils\UserData.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\action\Action.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\action\ActionDelay.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\action\ActionGroup.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\action\ActionManager.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\action\ActionWalk.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\action\ActionTween.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\action\Animation.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Canvas.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\DebugActor.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Frame.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\FrameSequence.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\ShapeActor.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\GifSprite.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Layer.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Actor.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Stage.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Sprite.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Text.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Transform.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Transition.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\AsyncTask.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\Component.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\EventDispatcher.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\EventListener.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\Input.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\Logger.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\ObjectBase.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\Resource.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\Director.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\Timer.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\TimerManager.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\time.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\Window.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\platform\Application.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\platform\modules.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\Brush.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\Color.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\Font.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\FontCollection.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\Geometry.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\GifImage.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\Texture.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\TextureCache.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\LayerArea.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\Renderer.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\RenderTarget.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\TextLayout.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\win32\D2DDeviceResources.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\win32\D3D10DeviceResources.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\win32\D3D11DeviceResources.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\win32\FontCollectionLoader.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\win32\TextRenderer.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\ui\Button.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\ui\Menu.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\utils\LocalStorage.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\utils\FileSystem.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\utils\ResourceCache.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\kiwano\utils\UserData.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<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>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\3rd-party\StackWalker\libStackWalker.vcxproj">
|
||||||
|
<Project>{3a3948dc-9865-46b3-b7b9-7e5572704ed2}</Project>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\3rd-party\tinyxml2\libtinyxml2.vcxproj">
|
||||||
|
<Project>{ab47e875-85e5-4105-a71e-88930eaab910}</Project>
|
||||||
|
</ProjectReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}</ProjectGuid>
|
||||||
|
<RootNamespace>kiwano</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>$(DefaultPlatformToolset)</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</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>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
|
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>MaxSpeed</Optimization>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
|
<TreatWarningAsError>true</TreatWarningAsError>
|
||||||
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
|
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,480 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="math">
|
||||||
|
<UniqueIdentifier>{80bc6386-2b70-4bae-993c-649a55163a1b}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="utils">
|
||||||
|
<UniqueIdentifier>{68eac919-ee87-4030-a033-c251731928f5}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="ui">
|
||||||
|
<UniqueIdentifier>{07b6d541-4a1b-472a-aae0-daf9d082fe84}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="platform">
|
||||||
|
<UniqueIdentifier>{c2654ccc-59f6-4c17-bb6b-99b07fc78702}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="2d">
|
||||||
|
<UniqueIdentifier>{896bdedf-6e82-449b-9b6e-0bc69f3699b1}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="base">
|
||||||
|
<UniqueIdentifier>{2e18d99a-e906-499a-9e29-4e0783202644}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="renderer">
|
||||||
|
<UniqueIdentifier>{7897afce-24cb-42b4-9443-56508e4ec89c}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="2d\action">
|
||||||
|
<UniqueIdentifier>{9314f30d-5742-48b6-94e5-e3b4284106f6}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="core">
|
||||||
|
<UniqueIdentifier>{86e2d0f2-a9d0-4456-b6a5-d480228bbf82}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="renderer\win32">
|
||||||
|
<UniqueIdentifier>{30333461-e9bc-4709-84bd-ce6e0e1a3079}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="base\win32">
|
||||||
|
<UniqueIdentifier>{192a47a9-9df6-4f40-a7d3-888eb00c53ac}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\ui\Button.h">
|
||||||
|
<Filter>ui</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\ui\Menu.h">
|
||||||
|
<Filter>ui</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Canvas.h">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\include-forwards.h">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Layer.h">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Sprite.h">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Text.h">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\TextStyle.hpp">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Transition.h">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Component.h">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Event.hpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\EventDispatcher.h">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\EventListener.h">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\keys.hpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\RefCounter.hpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Resource.h">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\time.h">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\Matrix.hpp">
|
||||||
|
<Filter>math</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\rand.h">
|
||||||
|
<Filter>math</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\Rect.hpp">
|
||||||
|
<Filter>math</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\platform\Application.h">
|
||||||
|
<Filter>platform</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\platform\modules.h">
|
||||||
|
<Filter>platform</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\config.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\macros.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\Vec2.hpp">
|
||||||
|
<Filter>math</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Input.h">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\SmartPtr.hpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\kiwano.h" />
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Timer.h">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\TimerManager.h">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\AsyncTask.h">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\GifSprite.h">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Director.h">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Actor.h">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Stage.h">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Frame.h">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\Action.h">
|
||||||
|
<Filter>2d\action</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\ActionGroup.h">
|
||||||
|
<Filter>2d\action</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\ActionHelper.h">
|
||||||
|
<Filter>2d\action</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\ActionTween.h">
|
||||||
|
<Filter>2d\action</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\ActionManager.h">
|
||||||
|
<Filter>2d\action</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\Animation.h">
|
||||||
|
<Filter>2d\action</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\utils\ResourceCache.h">
|
||||||
|
<Filter>utils</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\FrameSequence.h">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\basic_json.hpp">
|
||||||
|
<Filter>core</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\function.hpp">
|
||||||
|
<Filter>core</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\intrusive_list.hpp">
|
||||||
|
<Filter>core</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\intrusive_ptr.hpp">
|
||||||
|
<Filter>core</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\noncopyable.hpp">
|
||||||
|
<Filter>core</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\singleton.hpp">
|
||||||
|
<Filter>core</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\string.hpp">
|
||||||
|
<Filter>core</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\vector.hpp">
|
||||||
|
<Filter>core</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\core.h">
|
||||||
|
<Filter>core</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\DebugActor.h">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\ShapeActor.h">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\ActionDelay.h">
|
||||||
|
<Filter>2d\action</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\action\ActionWalk.h">
|
||||||
|
<Filter>2d\action</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Logger.h">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\Window.h">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\math.h">
|
||||||
|
<Filter>math</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\ObjectBase.h">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\Color.h">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\Font.h">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\Geometry.h">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\GifImage.h">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\LayerArea.h">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\Renderer.h">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\TextLayout.h">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\win32\D2DDeviceResources.h">
|
||||||
|
<Filter>renderer\win32</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\win32\D3D10DeviceResources.h">
|
||||||
|
<Filter>renderer\win32</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\win32\D3D11DeviceResources.h">
|
||||||
|
<Filter>renderer\win32</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\win32\D3DDeviceResourcesBase.h">
|
||||||
|
<Filter>renderer\win32</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\win32\FontCollectionLoader.h">
|
||||||
|
<Filter>renderer\win32</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\win32\TextRenderer.h">
|
||||||
|
<Filter>renderer\win32</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\RenderTarget.h">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\FontCollection.h">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\2d\Transform.h">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\Texture.h">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\TextureCache.h">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\StrokeStyle.h">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\renderer\Brush.h">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\constants.h">
|
||||||
|
<Filter>math</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\ease.h">
|
||||||
|
<Filter>math</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\math\scalar.h">
|
||||||
|
<Filter>math</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\win32\ComPtr.hpp">
|
||||||
|
<Filter>base\win32</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\base\win32\helper.h">
|
||||||
|
<Filter>base\win32</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\utils\LocalStorage.h">
|
||||||
|
<Filter>utils</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\utils\FileSystem.h">
|
||||||
|
<Filter>utils</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\core\any.hpp">
|
||||||
|
<Filter>core</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\src\kiwano\utils\UserData.h">
|
||||||
|
<Filter>utils</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\ui\Button.cpp">
|
||||||
|
<Filter>ui</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\ui\Menu.cpp">
|
||||||
|
<Filter>ui</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Canvas.cpp">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Layer.cpp">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Sprite.cpp">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Text.cpp">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Transition.cpp">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\EventDispatcher.cpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\EventListener.cpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\Resource.cpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\time.cpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\platform\Application.cpp">
|
||||||
|
<Filter>platform</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\platform\modules.cpp">
|
||||||
|
<Filter>platform</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\Input.cpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\Timer.cpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\TimerManager.cpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\AsyncTask.cpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\GifSprite.cpp">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\Director.cpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Actor.cpp">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Stage.cpp">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Frame.cpp">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\action\Action.cpp">
|
||||||
|
<Filter>2d\action</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\action\ActionGroup.cpp">
|
||||||
|
<Filter>2d\action</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\action\ActionTween.cpp">
|
||||||
|
<Filter>2d\action</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\action\ActionManager.cpp">
|
||||||
|
<Filter>2d\action</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\action\Animation.cpp">
|
||||||
|
<Filter>2d\action</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\utils\ResourceCache.cpp">
|
||||||
|
<Filter>utils</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\FrameSequence.cpp">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\DebugActor.cpp">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\ShapeActor.cpp">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\action\ActionDelay.cpp">
|
||||||
|
<Filter>2d\action</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\action\ActionWalk.cpp">
|
||||||
|
<Filter>2d\action</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\Logger.cpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\Window.cpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\ObjectBase.cpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\Color.cpp">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\Font.cpp">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\Geometry.cpp">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\GifImage.cpp">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\LayerArea.cpp">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\Renderer.cpp">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\TextLayout.cpp">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\win32\D2DDeviceResources.cpp">
|
||||||
|
<Filter>renderer\win32</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\win32\D3D10DeviceResources.cpp">
|
||||||
|
<Filter>renderer\win32</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\win32\D3D11DeviceResources.cpp">
|
||||||
|
<Filter>renderer\win32</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\win32\FontCollectionLoader.cpp">
|
||||||
|
<Filter>renderer\win32</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\win32\TextRenderer.cpp">
|
||||||
|
<Filter>renderer\win32</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\RenderTarget.cpp">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\FontCollection.cpp">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\2d\Transform.cpp">
|
||||||
|
<Filter>2d</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\Texture.cpp">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\TextureCache.cpp">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\renderer\Brush.cpp">
|
||||||
|
<Filter>renderer</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\base\Component.cpp">
|
||||||
|
<Filter>base</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\utils\LocalStorage.cpp">
|
||||||
|
<Filter>utils</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\utils\FileSystem.cpp">
|
||||||
|
<Filter>utils</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\src\kiwano\utils\UserData.cpp">
|
||||||
|
<Filter>utils</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -1,8 +1,10 @@
|
||||||
$replace = "<DebugInformationFormat>EditAndContinue</DebugInformationFormat>"
|
function Set-FileConfiguration {
|
||||||
$replaceTo = "<DebugInformationFormat>None</DebugInformationFormat>"
|
param(
|
||||||
|
[string]$filePath
|
||||||
|
)
|
||||||
|
|
||||||
Get-ChildItem -Path 'projects\' *.vcxproj | ForEach-Object {
|
$replace = "<DebugInformationFormat>(EditAndContinue|ProgramDatabase)</DebugInformationFormat>"
|
||||||
$filePath = 'projects\' + $_
|
$replaceTo = "<DebugInformationFormat>None</DebugInformationFormat>"
|
||||||
|
|
||||||
# Create a copy of .vcxproj file
|
# Create a copy of .vcxproj file
|
||||||
Copy-Item -Path $filePath -Destination ($filePath + '.template')
|
Copy-Item -Path $filePath -Destination ($filePath + '.template')
|
||||||
|
|
@ -13,3 +15,12 @@ Get-ChildItem -Path 'projects\' *.vcxproj | ForEach-Object {
|
||||||
# Delete the copy file
|
# Delete the copy file
|
||||||
Remove-Item -Path ($filePath + '.template')
|
Remove-Item -Path ($filePath + '.template')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Get-ChildItem -Path 'projects\' -Directory | ForEach-Object {
|
||||||
|
$dirPath = "projects\$($_)"
|
||||||
|
|
||||||
|
# Search all vcxproj files
|
||||||
|
Get-ChildItem -Path $dirPath *.vcxproj -File | ForEach-Object {
|
||||||
|
Set-FileConfiguration ($dirPath + '\' + $_)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -95,8 +95,8 @@ nuget {
|
||||||
${SRC_ROOT}\**\*.hpp
|
${SRC_ROOT}\**\*.hpp
|
||||||
};
|
};
|
||||||
|
|
||||||
// kiwano-network 3-rd patry
|
// third patry
|
||||||
bin: { ${SRC_ROOT}\kiwano-network\dlls\*.dll };
|
bin: { ${SRC_ROOT}\3rd-party\**\*.dll };
|
||||||
|
|
||||||
("v140,v141,v142", "Win32", "Debug") => {
|
("v140,v141,v142", "Win32", "Debug") => {
|
||||||
[${0},${1},${2}] {
|
[${0},${1},${2}] {
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,6 @@
|
||||||
// so we need not to check the version (because we only support _MSC_VER >= 1100)!
|
// so we need not to check the version (because we only support _MSC_VER >= 1100)!
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../macros.h"
|
|
||||||
|
|
||||||
// special defines for VC5/6 (if no actual PSDK is installed):
|
// special defines for VC5/6 (if no actual PSDK is installed):
|
||||||
#if _MSC_VER < 1300
|
#if _MSC_VER < 1300
|
||||||
typedef unsigned __int64 DWORD64, *PDWORD64;
|
typedef unsigned __int64 DWORD64, *PDWORD64;
|
||||||
|
|
@ -25,7 +23,7 @@ typedef unsigned long SIZE_T, *PSIZE_T;
|
||||||
#endif // _MSC_VER < 1300
|
#endif // _MSC_VER < 1300
|
||||||
|
|
||||||
class StackWalkerInternal; // forward
|
class StackWalkerInternal; // forward
|
||||||
class KGE_API StackWalker
|
class StackWalker
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
typedef enum StackWalkOptions
|
typedef enum StackWalkOptions
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -18,27 +18,27 @@
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#include <kiwano/base/Logger.h>
|
#include <kiwano/base/win32/helper.h>
|
||||||
#include "audio-modules.h"
|
#include <kiwano-audio/audio-modules.h>
|
||||||
#include "audio.h"
|
#include <kiwano-audio/AudioEngine.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
namespace audio
|
namespace audio
|
||||||
{
|
{
|
||||||
Audio::Audio()
|
AudioEngine::AudioEngine()
|
||||||
: x_audio2_(nullptr)
|
: x_audio2_(nullptr)
|
||||||
, mastering_voice_(nullptr)
|
, mastering_voice_(nullptr)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
Audio::~Audio()
|
AudioEngine::~AudioEngine()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void Audio::SetupComponent()
|
void AudioEngine::SetupComponent()
|
||||||
{
|
{
|
||||||
KGE_LOG(L"Creating audio resources");
|
// KGE_LOG(L"Creating audio resources");
|
||||||
|
|
||||||
HRESULT hr = modules::MediaFoundation::Get().MFStartup(MF_VERSION, MFSTARTUP_FULL);
|
HRESULT hr = modules::MediaFoundation::Get().MFStartup(MF_VERSION, MFSTARTUP_FULL);
|
||||||
|
|
||||||
|
|
@ -55,9 +55,9 @@ namespace kiwano
|
||||||
ThrowIfFailed(hr);
|
ThrowIfFailed(hr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Audio::DestroyComponent()
|
void AudioEngine::DestroyComponent()
|
||||||
{
|
{
|
||||||
KGE_LOG(L"Destroying audio resources");
|
// KGE_LOG(L"Destroying audio resources");
|
||||||
|
|
||||||
if (mastering_voice_)
|
if (mastering_voice_)
|
||||||
{
|
{
|
||||||
|
|
@ -74,9 +74,9 @@ namespace kiwano
|
||||||
modules::MediaFoundation::Get().MFShutdown();
|
modules::MediaFoundation::Get().MFShutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT Audio::CreateVoice(IXAudio2SourceVoice** voice, const WAVEFORMATEX* wfx)
|
HRESULT AudioEngine::CreateVoice(IXAudio2SourceVoice** voice, const Transcoder::Buffer& buffer)
|
||||||
{
|
{
|
||||||
KGE_ASSERT(x_audio2_ && "Audio engine hasn't been initialized!");
|
KGE_ASSERT(x_audio2_ && "AudioEngine hasn't been initialized!");
|
||||||
|
|
||||||
if (voice == nullptr)
|
if (voice == nullptr)
|
||||||
{
|
{
|
||||||
|
|
@ -89,20 +89,19 @@ namespace kiwano
|
||||||
(*voice) = nullptr;
|
(*voice) = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT hr = x_audio2_->CreateSourceVoice(voice, wfx, 0, XAUDIO2_DEFAULT_FREQ_RATIO);
|
return x_audio2_->CreateSourceVoice(voice, buffer.format, 0, XAUDIO2_DEFAULT_FREQ_RATIO);
|
||||||
return hr;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Audio::Open()
|
void AudioEngine::Open()
|
||||||
{
|
{
|
||||||
KGE_ASSERT(x_audio2_ && "Audio engine hasn't been initialized!");
|
KGE_ASSERT(x_audio2_ && "AudioEngine hasn't been initialized!");
|
||||||
|
|
||||||
x_audio2_->StartEngine();
|
x_audio2_->StartEngine();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Audio::Close()
|
void AudioEngine::Close()
|
||||||
{
|
{
|
||||||
KGE_ASSERT(x_audio2_ && "Audio engine hasn't been initialized!");
|
KGE_ASSERT(x_audio2_ && "AudioEngine hasn't been initialized!");
|
||||||
|
|
||||||
x_audio2_->StopEngine();
|
x_audio2_->StopEngine();
|
||||||
}
|
}
|
||||||
|
|
@ -21,22 +21,20 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include <kiwano/core/singleton.hpp>
|
#include <kiwano/core/singleton.hpp>
|
||||||
#include <kiwano/base/Component.h>
|
#include <kiwano/base/Component.h>
|
||||||
|
#include <kiwano/base/win32/ComPtr.hpp>
|
||||||
|
#include <kiwano-audio/Transcoder.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
namespace audio
|
namespace audio
|
||||||
{
|
{
|
||||||
class KGE_API Audio
|
class KGE_API AudioEngine
|
||||||
: public Singleton<Audio>
|
: public Singleton<AudioEngine>
|
||||||
, public Component
|
, public ComponentBase
|
||||||
{
|
{
|
||||||
KGE_DECLARE_SINGLETON(Audio);
|
KGE_DECLARE_SINGLETON(AudioEngine);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void SetupComponent() override;
|
|
||||||
|
|
||||||
void DestroyComponent() override;
|
|
||||||
|
|
||||||
// 开启设备
|
// 开启设备
|
||||||
void Open();
|
void Open();
|
||||||
|
|
||||||
|
|
@ -45,13 +43,18 @@ namespace kiwano
|
||||||
|
|
||||||
HRESULT CreateVoice(
|
HRESULT CreateVoice(
|
||||||
IXAudio2SourceVoice** voice,
|
IXAudio2SourceVoice** voice,
|
||||||
const WAVEFORMATEX* wfx
|
const Transcoder::Buffer& buffer
|
||||||
);
|
);
|
||||||
|
|
||||||
protected:
|
public:
|
||||||
Audio();
|
void SetupComponent() override;
|
||||||
|
|
||||||
~Audio();
|
void DestroyComponent() override;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
AudioEngine();
|
||||||
|
|
||||||
|
~AudioEngine();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
IXAudio2* x_audio2_;
|
IXAudio2* x_audio2_;
|
||||||
|
|
@ -19,9 +19,9 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#include <kiwano/base/Logger.h>
|
#include <kiwano/base/Logger.h>
|
||||||
#include <kiwano/utils/FileUtil.h>
|
#include <kiwano/utils/FileSystem.h>
|
||||||
#include "Sound.h"
|
#include <kiwano-audio/Sound.h>
|
||||||
#include "audio.h"
|
#include <kiwano-audio/AudioEngine.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -54,7 +54,7 @@ namespace kiwano
|
||||||
|
|
||||||
bool Sound::Load(String const& file_path)
|
bool Sound::Load(String const& file_path)
|
||||||
{
|
{
|
||||||
if (!FileUtil::ExistsFile(file_path))
|
if (!FileSystem::GetInstance()->IsFileExists(file_path))
|
||||||
{
|
{
|
||||||
KGE_WARNING_LOG(L"Media file '%s' not found", file_path.c_str());
|
KGE_WARNING_LOG(L"Media file '%s' not found", file_path.c_str());
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -65,7 +65,9 @@ namespace kiwano
|
||||||
Close();
|
Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT hr = transcoder_.LoadMediaFile(file_path);
|
String full_path = FileSystem::GetInstance()->GetFullPathForFile(file_path);
|
||||||
|
|
||||||
|
HRESULT hr = transcoder_.LoadMediaFile(full_path);
|
||||||
|
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
|
|
@ -73,7 +75,7 @@ namespace kiwano
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
hr = Audio::GetInstance()->CreateVoice(&voice_, transcoder_.GetBuffer().format);
|
hr = AudioEngine::GetInstance()->CreateVoice(&voice_, transcoder_.GetBuffer());
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
Close();
|
Close();
|
||||||
|
|
@ -101,7 +103,7 @@ namespace kiwano
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
hr = Audio::GetInstance()->CreateVoice(&voice_, transcoder_.GetBuffer().format);
|
hr = AudioEngine::GetInstance()->CreateVoice(&voice_, transcoder_.GetBuffer());
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
Close();
|
Close();
|
||||||
|
|
@ -114,7 +116,7 @@ namespace kiwano
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sound::Play(Int32 loop_count)
|
void Sound::Play(int loop_count)
|
||||||
{
|
{
|
||||||
if (!opened_)
|
if (!opened_)
|
||||||
{
|
{
|
||||||
|
|
@ -139,7 +141,7 @@ namespace kiwano
|
||||||
buffer.pAudioData = wave_buffer.data;
|
buffer.pAudioData = wave_buffer.data;
|
||||||
buffer.Flags = XAUDIO2_END_OF_STREAM;
|
buffer.Flags = XAUDIO2_END_OF_STREAM;
|
||||||
buffer.AudioBytes = wave_buffer.size;
|
buffer.AudioBytes = wave_buffer.size;
|
||||||
buffer.LoopCount = static_cast<UInt32>(loop_count);
|
buffer.LoopCount = static_cast<uint32_t>(loop_count);
|
||||||
|
|
||||||
HRESULT hr = voice_->SubmitSourceBuffer(&buffer);
|
HRESULT hr = voice_->SubmitSourceBuffer(&buffer);
|
||||||
if (SUCCEEDED(hr))
|
if (SUCCEEDED(hr))
|
||||||
|
|
@ -212,7 +214,7 @@ namespace kiwano
|
||||||
|
|
||||||
XAUDIO2_VOICE_STATE state;
|
XAUDIO2_VOICE_STATE state;
|
||||||
voice_->GetState(&state);
|
voice_->GetState(&state);
|
||||||
UInt32 buffers_queued = state.BuffersQueued;
|
uint32_t buffers_queued = state.BuffersQueued;
|
||||||
|
|
||||||
if (buffers_queued && playing_)
|
if (buffers_queued && playing_)
|
||||||
return true;
|
return true;
|
||||||
|
|
@ -220,16 +222,16 @@ namespace kiwano
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Float32 Sound::GetVolume() const
|
float Sound::GetVolume() const
|
||||||
{
|
{
|
||||||
KGE_ASSERT(voice_ != nullptr && "IXAudio2SourceVoice* is NULL");
|
KGE_ASSERT(voice_ != nullptr && "IXAudio2SourceVoice* is NULL");
|
||||||
|
|
||||||
Float32 volume = 0.0f;
|
float volume = 0.0f;
|
||||||
voice_->GetVolume(&volume);
|
voice_->GetVolume(&volume);
|
||||||
return volume;
|
return volume;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sound::SetVolume(Float32 volume)
|
void Sound::SetVolume(float volume)
|
||||||
{
|
{
|
||||||
KGE_ASSERT(voice_ != nullptr && "IXAudio2SourceVoice* is NULL");
|
KGE_ASSERT(voice_ != nullptr && "IXAudio2SourceVoice* is NULL");
|
||||||
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
#include <kiwano/base/ObjectBase.h>
|
#include <kiwano/base/ObjectBase.h>
|
||||||
#include <kiwano/base/Resource.h>
|
#include <kiwano/base/Resource.h>
|
||||||
#include <xaudio2.h>
|
#include <xaudio2.h>
|
||||||
#include "Transcoder.h"
|
#include <kiwano-audio/Transcoder.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -31,7 +31,6 @@ namespace kiwano
|
||||||
{
|
{
|
||||||
KGE_DECLARE_SMART_PTR(Sound);
|
KGE_DECLARE_SMART_PTR(Sound);
|
||||||
|
|
||||||
// 音乐对象
|
|
||||||
class KGE_API Sound
|
class KGE_API Sound
|
||||||
: public ObjectBase
|
: public ObjectBase
|
||||||
{
|
{
|
||||||
|
|
@ -60,7 +59,7 @@ namespace kiwano
|
||||||
|
|
||||||
// ²¥·Å
|
// ²¥·Å
|
||||||
void Play(
|
void Play(
|
||||||
Int32 loop_count = 0 /* 播放循环次数 (-1 为循环播放) */
|
int loop_count = 0 /* 播放循环次数 (-1 为循环播放) */
|
||||||
);
|
);
|
||||||
|
|
||||||
// ÔÝÍ£
|
// ÔÝÍ£
|
||||||
|
|
@ -79,17 +78,18 @@ namespace kiwano
|
||||||
bool IsPlaying() const;
|
bool IsPlaying() const;
|
||||||
|
|
||||||
// »ñÈ¡ÒôÁ¿
|
// »ñÈ¡ÒôÁ¿
|
||||||
Float32 GetVolume() const;
|
float GetVolume() const;
|
||||||
|
|
||||||
// ÉèÖÃÒôÁ¿
|
// ÉèÖÃÒôÁ¿
|
||||||
void SetVolume(
|
void SetVolume(
|
||||||
Float32 volume /* 1 为原始音量, 大于 1 为放大音量, 0 为最小音量 */
|
float volume /* 1 为原始音量, 大于 1 为放大音量, 0 为最小音量 */
|
||||||
);
|
);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool opened_;
|
bool opened_;
|
||||||
bool playing_;
|
bool playing_;
|
||||||
Transcoder transcoder_;
|
Transcoder transcoder_;
|
||||||
|
|
||||||
IXAudio2SourceVoice* voice_;
|
IXAudio2SourceVoice* voice_;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#include "SoundPlayer.h"
|
#include <kiwano-audio/SoundPlayer.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -34,11 +34,11 @@ namespace kiwano
|
||||||
ClearCache();
|
ClearCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
UInt32 SoundPlayer::Load(String const& file_path)
|
size_t SoundPlayer::Load(String const& file_path)
|
||||||
{
|
{
|
||||||
UInt32 hash_code = file_path.hash();
|
int hash_code = static_cast<int>(file_path.hash());
|
||||||
if (sound_cache_.end() != sound_cache_.find(hash_code))
|
if (sound_cache_.end() != sound_cache_.find(hash_code))
|
||||||
return true;
|
return hash_code;
|
||||||
|
|
||||||
SoundPtr sound = new (std::nothrow) Sound;
|
SoundPtr sound = new (std::nothrow) Sound;
|
||||||
|
|
||||||
|
|
@ -48,17 +48,17 @@ namespace kiwano
|
||||||
{
|
{
|
||||||
sound->SetVolume(volume_);
|
sound->SetVolume(volume_);
|
||||||
sound_cache_.insert(std::make_pair(hash_code, sound));
|
sound_cache_.insert(std::make_pair(hash_code, sound));
|
||||||
return true;
|
return hash_code;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
UInt32 SoundPlayer::Load(Resource const& res)
|
size_t SoundPlayer::Load(Resource const& res)
|
||||||
{
|
{
|
||||||
UInt32 hash_code = res.GetId();
|
size_t hash_code = static_cast<size_t>(res.GetId());
|
||||||
if (sound_cache_.end() != sound_cache_.find(hash_code))
|
if (sound_cache_.end() != sound_cache_.find(hash_code))
|
||||||
return true;
|
return hash_code;
|
||||||
|
|
||||||
SoundPtr sound = new (std::nothrow) Sound;
|
SoundPtr sound = new (std::nothrow) Sound;
|
||||||
|
|
||||||
|
|
@ -68,41 +68,41 @@ namespace kiwano
|
||||||
{
|
{
|
||||||
sound->SetVolume(volume_);
|
sound->SetVolume(volume_);
|
||||||
sound_cache_.insert(std::make_pair(hash_code, sound));
|
sound_cache_.insert(std::make_pair(hash_code, sound));
|
||||||
return true;
|
return hash_code;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SoundPlayer::Play(UInt32 id, Int32 loop_count)
|
void SoundPlayer::Play(size_t id, int loop_count)
|
||||||
{
|
{
|
||||||
auto iter = sound_cache_.find(id);
|
auto iter = sound_cache_.find(id);
|
||||||
if (sound_cache_.end() != iter)
|
if (sound_cache_.end() != iter)
|
||||||
iter->second->Play(loop_count);
|
iter->second->Play(loop_count);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SoundPlayer::Pause(UInt32 id)
|
void SoundPlayer::Pause(size_t id)
|
||||||
{
|
{
|
||||||
auto iter = sound_cache_.find(id);
|
auto iter = sound_cache_.find(id);
|
||||||
if (sound_cache_.end() != iter)
|
if (sound_cache_.end() != iter)
|
||||||
iter->second->Pause();
|
iter->second->Pause();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SoundPlayer::Resume(UInt32 id)
|
void SoundPlayer::Resume(size_t id)
|
||||||
{
|
{
|
||||||
auto iter = sound_cache_.find(id);
|
auto iter = sound_cache_.find(id);
|
||||||
if (sound_cache_.end() != iter)
|
if (sound_cache_.end() != iter)
|
||||||
iter->second->Resume();
|
iter->second->Resume();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SoundPlayer::Stop(UInt32 id)
|
void SoundPlayer::Stop(size_t id)
|
||||||
{
|
{
|
||||||
auto iter = sound_cache_.find(id);
|
auto iter = sound_cache_.find(id);
|
||||||
if (sound_cache_.end() != iter)
|
if (sound_cache_.end() != iter)
|
||||||
iter->second->Stop();
|
iter->second->Stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SoundPlayer::IsPlaying(UInt32 id)
|
bool SoundPlayer::IsPlaying(size_t id)
|
||||||
{
|
{
|
||||||
auto iter = sound_cache_.find(id);
|
auto iter = sound_cache_.find(id);
|
||||||
if (sound_cache_.end() != iter)
|
if (sound_cache_.end() != iter)
|
||||||
|
|
@ -110,12 +110,12 @@ namespace kiwano
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Float32 SoundPlayer::GetVolume() const
|
float SoundPlayer::GetVolume() const
|
||||||
{
|
{
|
||||||
return volume_;
|
return volume_;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SoundPlayer::SetVolume(Float32 volume)
|
void SoundPlayer::SetVolume(float volume)
|
||||||
{
|
{
|
||||||
volume_ = std::min(std::max(volume, -224.f), 224.f);
|
volume_ = std::min(std::max(volume, -224.f), 224.f);
|
||||||
for (const auto& pair : sound_cache_)
|
for (const auto& pair : sound_cache_)
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include <kiwano/core/intrusive_ptr.hpp>
|
#include <kiwano/core/intrusive_ptr.hpp>
|
||||||
#include <kiwano/base/ObjectBase.h>
|
#include <kiwano/base/ObjectBase.h>
|
||||||
#include "Sound.h"
|
#include <kiwano-audio/Sound.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -39,47 +39,47 @@ namespace kiwano
|
||||||
~SoundPlayer();
|
~SoundPlayer();
|
||||||
|
|
||||||
// 속潼굶뒈稜틉匡숭, 럿쀼맡栗都돨깃街륜
|
// 속潼굶뒈稜틉匡숭, 럿쀼맡栗都돨깃街륜
|
||||||
UInt32 Load(
|
size_t Load(
|
||||||
String const& file_path
|
String const& file_path
|
||||||
);
|
);
|
||||||
|
|
||||||
// 속潼稜있栗都, 럿쀼맡栗都돨깃街륜
|
// 속潼稜있栗都, 럿쀼맡栗都돨깃街륜
|
||||||
UInt32 Load(
|
size_t Load(
|
||||||
Resource const& res /* 音乐资源 */
|
Resource const& res /* 音乐资源 */
|
||||||
);
|
);
|
||||||
|
|
||||||
// 꺄렴稜있
|
// 꺄렴稜있
|
||||||
void Play(
|
void Play(
|
||||||
UInt32 id, /* 标识符 */
|
size_t id, /* 标识符 */
|
||||||
Int32 loop_count = 0 /* 播放循环次数 (-1 为循环播放) */
|
int loop_count = 0 /* 播放循环次数 (-1 为循环播放) */
|
||||||
);
|
);
|
||||||
|
|
||||||
// 董界稜있
|
// 董界稜있
|
||||||
void Pause(
|
void Pause(
|
||||||
UInt32 id /* 标识符 */
|
size_t id /* 标识符 */
|
||||||
);
|
);
|
||||||
|
|
||||||
// 셨崎꺄렴稜있
|
// 셨崎꺄렴稜있
|
||||||
void Resume(
|
void Resume(
|
||||||
UInt32 id /* 标识符 */
|
size_t id /* 标识符 */
|
||||||
);
|
);
|
||||||
|
|
||||||
// 界岺稜있
|
// 界岺稜있
|
||||||
void Stop(
|
void Stop(
|
||||||
UInt32 id /* 标识符 */
|
size_t id /* 标识符 */
|
||||||
);
|
);
|
||||||
|
|
||||||
// 삿혤稜있꺄렴榴檄
|
// 삿혤稜있꺄렴榴檄
|
||||||
bool IsPlaying(
|
bool IsPlaying(
|
||||||
UInt32 id /* 标识符 */
|
size_t id /* 标识符 */
|
||||||
);
|
);
|
||||||
|
|
||||||
// 삿혤稜좆
|
// 삿혤稜좆
|
||||||
Float32 GetVolume() const;
|
float GetVolume() const;
|
||||||
|
|
||||||
// <20>零稜좆
|
// <20>零稜좆
|
||||||
void SetVolume(
|
void SetVolume(
|
||||||
Float32 volume /* 1.0 为原始音量 */
|
float volume /* 1.0 为原始音量 */
|
||||||
);
|
);
|
||||||
|
|
||||||
// 董界杰唐稜있
|
// 董界杰唐稜있
|
||||||
|
|
@ -95,10 +95,10 @@ namespace kiwano
|
||||||
void ClearCache();
|
void ClearCache();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Float32 volume_;
|
float volume_;
|
||||||
|
|
||||||
using MusicMap = Map<UInt32, SoundPtr>;
|
using SoundMap = Map<size_t, SoundPtr>;
|
||||||
MusicMap sound_cache_;
|
SoundMap sound_cache_;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -26,10 +26,10 @@
|
||||||
#include <kiwano/core/string.hpp>
|
#include <kiwano/core/string.hpp>
|
||||||
#include <kiwano/base/Resource.h>
|
#include <kiwano/base/Resource.h>
|
||||||
#include <kiwano/base/Logger.h>
|
#include <kiwano/base/Logger.h>
|
||||||
#include <kiwano/renderer/win32/ComPtr.hpp>
|
#include <kiwano/base/win32/ComPtr.hpp>
|
||||||
#include <kiwano/platform/modules.h>
|
#include <kiwano/platform/modules.h>
|
||||||
#include "audio-modules.h"
|
#include <kiwano-audio/audio-modules.h>
|
||||||
#include "Transcoder.h"
|
#include <kiwano-audio/Transcoder.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -102,8 +102,8 @@ namespace kiwano
|
||||||
if (!data) { return E_FAIL; }
|
if (!data) { return E_FAIL; }
|
||||||
|
|
||||||
stream = kiwano::modules::Shlwapi::Get().SHCreateMemStream(
|
stream = kiwano::modules::Shlwapi::Get().SHCreateMemStream(
|
||||||
static_cast<const Byte*>(data.buffer),
|
static_cast<const BYTE*>(data.buffer),
|
||||||
static_cast<UInt32>(data.size)
|
static_cast<uint32_t>(data.size)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (stream == nullptr)
|
if (stream == nullptr)
|
||||||
|
|
@ -185,7 +185,7 @@ namespace kiwano
|
||||||
// »ñÈ¡ WAVEFORMAT Êý¾Ý
|
// »ñÈ¡ WAVEFORMAT Êý¾Ý
|
||||||
if (SUCCEEDED(hr))
|
if (SUCCEEDED(hr))
|
||||||
{
|
{
|
||||||
UInt32 size = 0;
|
uint32_t size = 0;
|
||||||
hr = modules::MediaFoundation::Get().MFCreateWaveFormatExFromMFMediaType(
|
hr = modules::MediaFoundation::Get().MFCreateWaveFormatExFromMFMediaType(
|
||||||
uncompressed_type.get(),
|
uncompressed_type.get(),
|
||||||
&wave_format_,
|
&wave_format_,
|
||||||
|
|
@ -218,7 +218,7 @@ namespace kiwano
|
||||||
{
|
{
|
||||||
DWORD flags = 0;
|
DWORD flags = 0;
|
||||||
DWORD position = 0;
|
DWORD position = 0;
|
||||||
Byte* data = new (std::nothrow) Byte[max_stream_size];
|
BYTE* data = new (std::nothrow) BYTE[max_stream_size];
|
||||||
|
|
||||||
ComPtr<IMFSample> sample;
|
ComPtr<IMFSample> sample;
|
||||||
ComPtr<IMFMediaBuffer> buffer;
|
ComPtr<IMFMediaBuffer> buffer;
|
||||||
|
|
@ -251,7 +251,7 @@ namespace kiwano
|
||||||
|
|
||||||
if (SUCCEEDED(hr))
|
if (SUCCEEDED(hr))
|
||||||
{
|
{
|
||||||
Byte* audio_data = nullptr;
|
BYTE* audio_data = nullptr;
|
||||||
DWORD sample_buffer_length = 0;
|
DWORD sample_buffer_length = 0;
|
||||||
|
|
||||||
hr = buffer->Lock(
|
hr = buffer->Lock(
|
||||||
|
|
@ -260,12 +260,15 @@ namespace kiwano
|
||||||
&sample_buffer_length
|
&sample_buffer_length
|
||||||
);
|
);
|
||||||
|
|
||||||
if (SUCCEEDED(hr) && sample_buffer_length <= max_stream_size)
|
if (position + sample_buffer_length >= max_stream_size)
|
||||||
{
|
{
|
||||||
for (DWORD i = 0; i < sample_buffer_length; i++)
|
hr = E_FAIL;
|
||||||
{
|
}
|
||||||
data[position++] = audio_data[i];
|
|
||||||
}
|
if (SUCCEEDED(hr))
|
||||||
|
{
|
||||||
|
::memcpy(data + position, audio_data, sample_buffer_length);
|
||||||
|
position += sample_buffer_length;
|
||||||
hr = buffer->Unlock();
|
hr = buffer->Unlock();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -281,6 +284,11 @@ namespace kiwano
|
||||||
wave_data_ = data;
|
wave_data_ = data;
|
||||||
wave_size_ = position;
|
wave_size_ = position;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
delete[] data;
|
||||||
|
data = nullptr;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
#include <kiwano/base/Resource.h>
|
||||||
#include <mfapi.h>
|
#include <mfapi.h>
|
||||||
#include <mfidl.h>
|
#include <mfidl.h>
|
||||||
#include <mfreadwrite.h>
|
#include <mfreadwrite.h>
|
||||||
|
|
@ -33,8 +34,8 @@ namespace kiwano
|
||||||
public:
|
public:
|
||||||
struct Buffer
|
struct Buffer
|
||||||
{
|
{
|
||||||
Byte* data;
|
BYTE* data;
|
||||||
UInt32 size;
|
uint32_t size;
|
||||||
const WAVEFORMATEX* format;
|
const WAVEFORMATEX* format;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -59,8 +60,8 @@ namespace kiwano
|
||||||
);
|
);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Byte* wave_data_;
|
BYTE* wave_data_;
|
||||||
UInt32 wave_size_;
|
uint32_t wave_size_;
|
||||||
WAVEFORMATEX* wave_format_;
|
WAVEFORMATEX* wave_format_;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#include <kiwano/base/Logger.h>
|
#include <kiwano/base/Logger.h>
|
||||||
#include "audio-modules.h"
|
#include <kiwano-audio/audio-modules.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -37,7 +37,7 @@ namespace kiwano
|
||||||
HMODULE xaudio2;
|
HMODULE xaudio2;
|
||||||
|
|
||||||
// XAudio2 functions
|
// XAudio2 functions
|
||||||
typedef HRESULT(WINAPI* PFN_XAudio2Create)(IXAudio2**, UInt32, XAUDIO2_PROCESSOR);
|
typedef HRESULT(WINAPI* PFN_XAudio2Create)(IXAudio2**, UINT32, XAUDIO2_PROCESSOR);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static inline XAudio2& Get()
|
static inline XAudio2& Get()
|
||||||
|
|
@ -61,7 +61,7 @@ namespace kiwano
|
||||||
typedef HRESULT(WINAPI* PFN_MFStartup)(ULONG, DWORD);
|
typedef HRESULT(WINAPI* PFN_MFStartup)(ULONG, DWORD);
|
||||||
typedef HRESULT(WINAPI* PFN_MFShutdown)();
|
typedef HRESULT(WINAPI* PFN_MFShutdown)();
|
||||||
typedef HRESULT(WINAPI* PFN_MFCreateMediaType)(IMFMediaType**);
|
typedef HRESULT(WINAPI* PFN_MFCreateMediaType)(IMFMediaType**);
|
||||||
typedef HRESULT(WINAPI* PFN_MFCreateWaveFormatExFromMFMediaType)(IMFMediaType*, WAVEFORMATEX**, UInt32*, UInt32);
|
typedef HRESULT(WINAPI* PFN_MFCreateWaveFormatExFromMFMediaType)(IMFMediaType*, WAVEFORMATEX**, UINT32*, UINT32);
|
||||||
typedef HRESULT(WINAPI* PFN_MFCreateSourceReaderFromURL)(LPCWSTR, IMFAttributes*, IMFSourceReader**);
|
typedef HRESULT(WINAPI* PFN_MFCreateSourceReaderFromURL)(LPCWSTR, IMFAttributes*, IMFSourceReader**);
|
||||||
typedef HRESULT(WINAPI* PFN_MFCreateSourceReaderFromByteStream)(IMFByteStream*, IMFAttributes*, IMFSourceReader**);
|
typedef HRESULT(WINAPI* PFN_MFCreateSourceReaderFromByteStream)(IMFByteStream*, IMFAttributes*, IMFSourceReader**);
|
||||||
typedef HRESULT(WINAPI* PFN_MFCreateMFByteStreamOnStream)(IStream*, IMFByteStream**);
|
typedef HRESULT(WINAPI* PFN_MFCreateMFByteStreamOnStream)(IStream*, IMFByteStream**);
|
||||||
|
|
@ -20,6 +20,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "src/audio.h"
|
#include <kiwano-audio/AudioEngine.h>
|
||||||
#include "src/Sound.h"
|
#include <kiwano-audio/Sound.h>
|
||||||
#include "src/SoundPlayer.h"
|
#include <kiwano-audio/SoundPlayer.h>
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#include "ImGuiLayer.h"
|
#include <kiwano-imgui/ImGuiLayer.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -6,8 +6,8 @@
|
||||||
#include <kiwano/base/Window.h>
|
#include <kiwano/base/Window.h>
|
||||||
#include <kiwano/base/Input.h>
|
#include <kiwano/base/Input.h>
|
||||||
#include <kiwano/renderer/Renderer.h>
|
#include <kiwano/renderer/Renderer.h>
|
||||||
#include "ImGuiModule.h"
|
#include <kiwano-imgui/ImGuiModule.h>
|
||||||
#include "imgui_impl.h"
|
#include <kiwano-imgui/imgui_impl.h>
|
||||||
|
|
||||||
#include <XInput.h>
|
#include <XInput.h>
|
||||||
#pragma comment(lib, "xinput")
|
#pragma comment(lib, "xinput")
|
||||||
|
|
@ -119,7 +119,7 @@ namespace kiwano
|
||||||
Render();
|
Render();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ImGuiModule::HandleMessage(HWND hwnd, UInt32 msg, WPARAM wparam, LPARAM lparam)
|
void ImGuiModule::HandleMessage(HWND hwnd, UINT32 msg, WPARAM wparam, LPARAM lparam)
|
||||||
{
|
{
|
||||||
if (ImGui::GetCurrentContext() == NULL)
|
if (ImGui::GetCurrentContext() == NULL)
|
||||||
return;
|
return;
|
||||||
|
|
@ -132,7 +132,7 @@ namespace kiwano
|
||||||
case WM_MBUTTONDOWN: case WM_MBUTTONDBLCLK:
|
case WM_MBUTTONDOWN: case WM_MBUTTONDBLCLK:
|
||||||
case WM_XBUTTONDOWN: case WM_XBUTTONDBLCLK:
|
case WM_XBUTTONDOWN: case WM_XBUTTONDBLCLK:
|
||||||
{
|
{
|
||||||
Int32 button = 0;
|
int button = 0;
|
||||||
if (msg == WM_LBUTTONDOWN || msg == WM_LBUTTONDBLCLK) { button = 0; }
|
if (msg == WM_LBUTTONDOWN || msg == WM_LBUTTONDBLCLK) { button = 0; }
|
||||||
if (msg == WM_RBUTTONDOWN || msg == WM_RBUTTONDBLCLK) { button = 1; }
|
if (msg == WM_RBUTTONDOWN || msg == WM_RBUTTONDBLCLK) { button = 1; }
|
||||||
if (msg == WM_MBUTTONDOWN || msg == WM_MBUTTONDBLCLK) { button = 2; }
|
if (msg == WM_MBUTTONDOWN || msg == WM_MBUTTONDBLCLK) { button = 2; }
|
||||||
|
|
@ -148,7 +148,7 @@ namespace kiwano
|
||||||
case WM_MBUTTONUP:
|
case WM_MBUTTONUP:
|
||||||
case WM_XBUTTONUP:
|
case WM_XBUTTONUP:
|
||||||
{
|
{
|
||||||
Int32 button = 0;
|
int button = 0;
|
||||||
if (msg == WM_LBUTTONUP) { button = 0; }
|
if (msg == WM_LBUTTONUP) { button = 0; }
|
||||||
if (msg == WM_RBUTTONUP) { button = 1; }
|
if (msg == WM_RBUTTONUP) { button = 1; }
|
||||||
if (msg == WM_MBUTTONUP) { button = 2; }
|
if (msg == WM_MBUTTONUP) { button = 2; }
|
||||||
|
|
@ -160,12 +160,12 @@ namespace kiwano
|
||||||
}
|
}
|
||||||
case WM_MOUSEWHEEL:
|
case WM_MOUSEWHEEL:
|
||||||
{
|
{
|
||||||
io.MouseWheel += (Float32)GET_WHEEL_DELTA_WPARAM(wparam) / (Float32)WHEEL_DELTA;
|
io.MouseWheel += (float)GET_WHEEL_DELTA_WPARAM(wparam) / (float)WHEEL_DELTA;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case WM_MOUSEHWHEEL:
|
case WM_MOUSEHWHEEL:
|
||||||
{
|
{
|
||||||
io.MouseWheelH += (Float32)GET_WHEEL_DELTA_WPARAM(wparam) / (Float32)WHEEL_DELTA;
|
io.MouseWheelH += (float)GET_WHEEL_DELTA_WPARAM(wparam) / (float)WHEEL_DELTA;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case WM_KEYDOWN:
|
case WM_KEYDOWN:
|
||||||
|
|
@ -185,7 +185,7 @@ namespace kiwano
|
||||||
case WM_CHAR:
|
case WM_CHAR:
|
||||||
{
|
{
|
||||||
// You can also use ToAscii()+GetKeyboardState() to retrieve characters.
|
// You can also use ToAscii()+GetKeyboardState() to retrieve characters.
|
||||||
io.AddInputCharacter((UInt32)wparam);
|
io.AddInputCharacter((uint32_t)wparam);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case WM_SETCURSOR:
|
case WM_SETCURSOR:
|
||||||
|
|
@ -198,7 +198,7 @@ namespace kiwano
|
||||||
}
|
}
|
||||||
case WM_DEVICECHANGE:
|
case WM_DEVICECHANGE:
|
||||||
{
|
{
|
||||||
if ((UInt32)wparam == DBT_DEVNODES_CHANGED)
|
if ((uint32_t)wparam == DBT_DEVNODES_CHANGED)
|
||||||
want_update_has_gamepad_ = true;
|
want_update_has_gamepad_ = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -233,7 +233,7 @@ namespace kiwano
|
||||||
// Set OS mouse position if requested (rarely used, only when ImGuiConfigFlags_NavEnableSetMousePos is enabled by user)
|
// Set OS mouse position if requested (rarely used, only when ImGuiConfigFlags_NavEnableSetMousePos is enabled by user)
|
||||||
if (io.WantSetMousePos)
|
if (io.WantSetMousePos)
|
||||||
{
|
{
|
||||||
POINT pos = { (Int32)io.MousePos.x, (Int32)io.MousePos.y };
|
POINT pos = { (int)io.MousePos.x, (int)io.MousePos.y };
|
||||||
::ClientToScreen(target_window_, &pos);
|
::ClientToScreen(target_window_, &pos);
|
||||||
::SetCursorPos(pos.x, pos.y);
|
::SetCursorPos(pos.x, pos.y);
|
||||||
}
|
}
|
||||||
|
|
@ -286,7 +286,7 @@ namespace kiwano
|
||||||
io.BackendFlags |= ImGuiBackendFlags_HasGamepad;
|
io.BackendFlags |= ImGuiBackendFlags_HasGamepad;
|
||||||
|
|
||||||
#define MAP_BUTTON(NAV_NO, BUTTON_ENUM) { io.NavInputs[NAV_NO] = (gamepad.wButtons & BUTTON_ENUM) ? 1.0f : 0.0f; }
|
#define MAP_BUTTON(NAV_NO, BUTTON_ENUM) { io.NavInputs[NAV_NO] = (gamepad.wButtons & BUTTON_ENUM) ? 1.0f : 0.0f; }
|
||||||
#define MAP_ANALOG(NAV_NO, VALUE, V0, V1) { Float32 vn = (Float32)(VALUE - V0) / (Float32)(V1 - V0); if (vn > 1.0f) vn = 1.0f; if (vn > 0.0f && io.NavInputs[NAV_NO] < vn) io.NavInputs[NAV_NO] = vn; }
|
#define MAP_ANALOG(NAV_NO, VALUE, V0, V1) { float vn = (float)(VALUE - V0) / (float)(V1 - V0); if (vn > 1.0f) vn = 1.0f; if (vn > 0.0f && io.NavInputs[NAV_NO] < vn) io.NavInputs[NAV_NO] = vn; }
|
||||||
MAP_BUTTON(ImGuiNavInput_Activate, XINPUT_GAMEPAD_A); // Cross / A
|
MAP_BUTTON(ImGuiNavInput_Activate, XINPUT_GAMEPAD_A); // Cross / A
|
||||||
MAP_BUTTON(ImGuiNavInput_Cancel, XINPUT_GAMEPAD_B); // Circle / B
|
MAP_BUTTON(ImGuiNavInput_Cancel, XINPUT_GAMEPAD_B); // Circle / B
|
||||||
MAP_BUTTON(ImGuiNavInput_Menu, XINPUT_GAMEPAD_X); // Square / X
|
MAP_BUTTON(ImGuiNavInput_Menu, XINPUT_GAMEPAD_X); // Square / X
|
||||||
|
|
@ -28,7 +28,9 @@ namespace kiwano
|
||||||
{
|
{
|
||||||
class ImGuiModule
|
class ImGuiModule
|
||||||
: public Singleton<ImGuiModule>
|
: public Singleton<ImGuiModule>
|
||||||
, public Component
|
, public RenderComponent
|
||||||
|
, public UpdateComponent
|
||||||
|
, public EventComponent
|
||||||
{
|
{
|
||||||
KGE_DECLARE_SINGLETON(ImGuiModule);
|
KGE_DECLARE_SINGLETON(ImGuiModule);
|
||||||
|
|
||||||
|
|
@ -52,7 +54,7 @@ namespace kiwano
|
||||||
|
|
||||||
void AfterRender() override;
|
void AfterRender() override;
|
||||||
|
|
||||||
void HandleMessage(HWND hwnd, UInt32 msg, WPARAM wparam, LPARAM lparam) override;
|
void HandleMessage(HWND hwnd, UINT32 msg, WPARAM wparam, LPARAM lparam) override;
|
||||||
|
|
||||||
void UpdateMousePos();
|
void UpdateMousePos();
|
||||||
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#if !defined(KGE_USE_DIRECTX10)
|
#if !defined(KGE_USE_DIRECTX10)
|
||||||
|
|
||||||
#include "imgui_impl_dx11.h"
|
#include <kiwano-imgui/imgui_impl_dx11.h>
|
||||||
|
|
||||||
inline bool ImGui_Impl_Init(::kiwano::Renderer* renderer) { return ImGui_ImplDX11_Init(renderer->GetD3DDeviceResources()->GetDevice(), renderer->GetD3DDeviceResources()->GetDeviceContext()); }
|
inline bool ImGui_Impl_Init(::kiwano::Renderer* renderer) { return ImGui_ImplDX11_Init(renderer->GetD3DDeviceResources()->GetDevice(), renderer->GetD3DDeviceResources()->GetDeviceContext()); }
|
||||||
inline void ImGui_Impl_Shutdown() { ImGui_ImplDX11_Shutdown(); }
|
inline void ImGui_Impl_Shutdown() { ImGui_ImplDX11_Shutdown(); }
|
||||||
|
|
@ -16,7 +16,7 @@ inline bool ImGui_Impl_CreateDeviceObjects() { return ImGui_ImplDX11_Cre
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#include "imgui_impl_dx10.h"
|
#include <kiwano-imgui/imgui_impl_dx10.h>
|
||||||
|
|
||||||
inline bool ImGui_Impl_Init(::kiwano::Renderer* renderer) { return ImGui_ImplDX10_Init(renderer->GetD3DDeviceResources()->GetDevice()); }
|
inline bool ImGui_Impl_Init(::kiwano::Renderer* renderer) { return ImGui_ImplDX10_Init(renderer->GetD3DDeviceResources()->GetDevice()); }
|
||||||
inline void ImGui_Impl_Shutdown() { ImGui_ImplDX10_Shutdown(); }
|
inline void ImGui_Impl_Shutdown() { ImGui_ImplDX10_Shutdown(); }
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
// dear imgui: Renderer for Kiwano (DirectX10)
|
// dear imgui: Renderer for Kiwano (DirectX10)
|
||||||
|
|
||||||
#include "imgui_impl_dx10.h"
|
#include <kiwano-imgui/imgui_impl_dx10.h>
|
||||||
|
|
||||||
// DirectX
|
// DirectX
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
// dear imgui: Renderer for Kiwano (DirectX10)
|
// dear imgui: Renderer for Kiwano (DirectX10)
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "../third-party/ImGui/imgui.h"
|
#include <3rd-party/imgui/imgui.h>
|
||||||
|
|
||||||
struct ID3D10Device;
|
struct ID3D10Device;
|
||||||
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
// dear imgui: Renderer for Kiwano (DirectX11)
|
// dear imgui: Renderer for Kiwano (DirectX11)
|
||||||
|
|
||||||
#include <kiwano/base/Logger.h>
|
#include <kiwano/base/win32/helper.h>
|
||||||
#include "imgui_impl_dx11.h"
|
#include <kiwano-imgui/imgui_impl_dx11.h>
|
||||||
|
|
||||||
// DirectX
|
// DirectX
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
// dear imgui: Renderer for Kiwano (DirectX11)
|
// dear imgui: Renderer for Kiwano (DirectX11)
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "../third-party/ImGui/imgui.h"
|
#include <3rd-party/imgui/imgui.h>
|
||||||
|
|
||||||
struct ID3D11Device;
|
struct ID3D11Device;
|
||||||
struct ID3D11DeviceContext;
|
struct ID3D11DeviceContext;
|
||||||
|
|
@ -20,8 +20,8 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "src/ImGuiLayer.h"
|
#include <kiwano-imgui/ImGuiLayer.h>
|
||||||
#include "src/ImGuiModule.h"
|
#include <kiwano-imgui/ImGuiModule.h>
|
||||||
|
|
||||||
// ImGui
|
// ImGui
|
||||||
#include "third-party/ImGui/imgui.h"
|
#include <3rd-party/imgui/imgui.h>
|
||||||
|
|
|
||||||
|
|
@ -18,27 +18,26 @@
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#include <kiwano/base/Logger.h>
|
|
||||||
#include <kiwano/platform/Application.h>
|
|
||||||
#include "helper.h"
|
|
||||||
#include "HttpRequest.hpp"
|
|
||||||
#include "HttpResponse.hpp"
|
|
||||||
#include "HttpClient.h"
|
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <codecvt>
|
#include <codecvt>
|
||||||
|
|
||||||
// CURL
|
#include <kiwano-network/HttpRequest.h>
|
||||||
#include "../third-party/curl/curl.h"
|
#include <kiwano-network/HttpResponse.hpp>
|
||||||
|
#include <kiwano-network/HttpClient.h>
|
||||||
|
|
||||||
|
#include <kiwano/base/Logger.h>
|
||||||
|
#include <kiwano/platform/Application.h>
|
||||||
|
#include <3rd-party/curl/curl.h> // CURL
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
using namespace kiwano;
|
using namespace kiwano;
|
||||||
using namespace kiwano::network;
|
using namespace kiwano::network;
|
||||||
|
|
||||||
UInt32 write_data(void* buffer, UInt32 size, UInt32 nmemb, void* userp)
|
uint32_t write_data(void* buffer, uint32_t size, uint32_t nmemb, void* userp)
|
||||||
{
|
{
|
||||||
kiwano::string* recv_buffer = (kiwano::string*)userp;
|
kiwano::string* recv_buffer = (kiwano::string*)userp;
|
||||||
UInt32 total = size * nmemb;
|
uint32_t total = size * nmemb;
|
||||||
|
|
||||||
// add data to the end of recv_buffer
|
// add data to the end of recv_buffer
|
||||||
// write data maybe called more than once in a single request
|
// write data maybe called more than once in a single request
|
||||||
|
|
@ -49,7 +48,7 @@ namespace
|
||||||
|
|
||||||
kiwano::string convert_to_utf8(kiwano::wstring const& str)
|
kiwano::string convert_to_utf8(kiwano::wstring const& str)
|
||||||
{
|
{
|
||||||
std::wstring_convert<std::codecvt_utf8<WChar>> utf8_conv;
|
std::wstring_convert<std::codecvt_utf8<wchar_t>> utf8_conv;
|
||||||
kiwano::string result;
|
kiwano::string result;
|
||||||
|
|
||||||
try
|
try
|
||||||
|
|
@ -66,7 +65,7 @@ namespace
|
||||||
|
|
||||||
kiwano::wstring convert_from_utf8(kiwano::string const& str)
|
kiwano::wstring convert_from_utf8(kiwano::string const& str)
|
||||||
{
|
{
|
||||||
kiwano::string_convert<std::codecvt_utf8<WChar>> utf8_conv;
|
kiwano::string_convert<std::codecvt_utf8<wchar_t>> utf8_conv;
|
||||||
kiwano::wstring result;
|
kiwano::wstring result;
|
||||||
|
|
||||||
try
|
try
|
||||||
|
|
@ -373,7 +372,7 @@ namespace kiwano
|
||||||
|
|
||||||
if (callback)
|
if (callback)
|
||||||
{
|
{
|
||||||
callback(request, response);
|
callback(request.get(), response.get());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -31,7 +31,7 @@ namespace kiwano
|
||||||
{
|
{
|
||||||
class KGE_API HttpClient
|
class KGE_API HttpClient
|
||||||
: public Singleton<HttpClient>
|
: public Singleton<HttpClient>
|
||||||
, public Component
|
, public ComponentBase
|
||||||
{
|
{
|
||||||
KGE_DECLARE_SINGLETON(HttpClient);
|
KGE_DECLARE_SINGLETON(HttpClient);
|
||||||
|
|
||||||
|
|
@ -19,13 +19,30 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include <kiwano/base/SmartPtr.hpp>
|
#include <kiwano-network/HttpRequest.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
namespace network
|
namespace network
|
||||||
{
|
{
|
||||||
KGE_DECLARE_SMART_PTR(HttpRequest);
|
void HttpRequest::SetJsonData(Json const& json)
|
||||||
KGE_DECLARE_SMART_PTR(HttpResponse);
|
{
|
||||||
|
SetHeader(L"Content-Type", L"application/json;charset=UTF-8");
|
||||||
|
data_ = json.dump();
|
||||||
|
}
|
||||||
|
|
||||||
|
void HttpRequest::SetHeader(String const& field, String const& content)
|
||||||
|
{
|
||||||
|
auto iter = headers_.find(field);
|
||||||
|
if (iter != headers_.end())
|
||||||
|
{
|
||||||
|
headers_[field] = content;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
headers_.insert(std::make_pair(field, content));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -19,20 +19,25 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include <kiwano/core/Function.hpp>
|
#include <kiwano/core/function.hpp>
|
||||||
#include <kiwano/core/basic_json.hpp>
|
#include <kiwano/core/basic_json.hpp>
|
||||||
#include <kiwano/base/ObjectBase.h>
|
#include <kiwano/base/ObjectBase.h>
|
||||||
|
#include <kiwano/base/SmartPtr.hpp>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
namespace network
|
namespace network
|
||||||
{
|
{
|
||||||
typedef Function<void(HttpRequestPtr, HttpResponsePtr)> ResponseCallback;
|
class HttpResponse;
|
||||||
|
|
||||||
|
KGE_DECLARE_SMART_PTR(HttpRequest);
|
||||||
|
|
||||||
class KGE_API HttpRequest
|
class KGE_API HttpRequest
|
||||||
: public ObjectBase
|
: public ObjectBase
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
using ResponseCallback = Function<void(HttpRequest*, HttpResponse*)>;
|
||||||
|
|
||||||
enum class Type
|
enum class Type
|
||||||
{
|
{
|
||||||
Unknown,
|
Unknown,
|
||||||
|
|
@ -42,91 +47,35 @@ namespace kiwano
|
||||||
Delete
|
Delete
|
||||||
};
|
};
|
||||||
|
|
||||||
inline HttpRequest()
|
inline HttpRequest() : type_(Type::Unknown) {}
|
||||||
: type_(Type::Unknown)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
inline HttpRequest(Type type) : type_(type) {}
|
||||||
|
|
||||||
inline HttpRequest(Type type)
|
inline void SetUrl(String const& url) { url_ = url; }
|
||||||
: type_(type)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
inline String const& GetUrl() const { return url_; }
|
||||||
|
|
||||||
inline void SetUrl(String const& url)
|
inline void SetType(Type type) { type_ = type; }
|
||||||
{
|
|
||||||
url_ = url;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline String const& GetUrl() const
|
inline Type GetType() const { return type_; }
|
||||||
{
|
|
||||||
return url_;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void SetType(Type type)
|
inline void SetData(String const& data) { data_ = data; }
|
||||||
{
|
|
||||||
type_ = type;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline Type GetType() const
|
void SetJsonData(Json const& json);
|
||||||
{
|
|
||||||
return type_;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void SetData(String const& data)
|
inline String const& GetData() const { return data_; }
|
||||||
{
|
|
||||||
data_ = data;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void SetJsonData(Json const& json)
|
inline void SetHeaders(Map<String, String> const& headers) { headers_ = headers; }
|
||||||
{
|
|
||||||
SetHeader(L"Content-Type", L"application/json;charset=UTF-8");
|
|
||||||
data_ = json.dump();
|
|
||||||
}
|
|
||||||
|
|
||||||
inline String const& GetData() const
|
void SetHeader(String const& field, String const& content);
|
||||||
{
|
|
||||||
return data_;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void SetHeaders(Map<String, String> const& headers)
|
inline Map<String, String>& GetHeaders() { return headers_; }
|
||||||
{
|
|
||||||
headers_ = headers;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void SetHeader(String const& field, String const& content)
|
inline String const& GetHeader(String const& header) const { return headers_.at(header); }
|
||||||
{
|
|
||||||
auto iter = headers_.find(field);
|
|
||||||
if (iter != headers_.end())
|
|
||||||
{
|
|
||||||
headers_[field] = content;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
headers_.insert(std::make_pair(field, content));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline Map<String, String>& GetHeaders()
|
inline void SetResponseCallback(ResponseCallback const& callback) { response_cb_ = callback; }
|
||||||
{
|
|
||||||
return headers_;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline String const& GetHeader(String const& header) const
|
inline ResponseCallback const& GetResponseCallback() const { return response_cb_; }
|
||||||
{
|
|
||||||
return headers_.at(header);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void SetResponseCallback(ResponseCallback const& callback)
|
|
||||||
{
|
|
||||||
response_cb_ = callback;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline ResponseCallback const& GetResponseCallback() const
|
|
||||||
{
|
|
||||||
return response_cb_;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Type type_;
|
Type type_;
|
||||||
|
|
@ -19,79 +19,41 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include <kiwano/core/Function.hpp>
|
#include <kiwano-network/HttpRequest.h>
|
||||||
#include <kiwano/core/basic_json.hpp>
|
|
||||||
#include <kiwano/base/ObjectBase.h>
|
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
namespace network
|
namespace network
|
||||||
{
|
{
|
||||||
|
KGE_DECLARE_SMART_PTR(HttpResponse);
|
||||||
|
|
||||||
class KGE_API HttpResponse
|
class KGE_API HttpResponse
|
||||||
: public ObjectBase
|
: public ObjectBase
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
inline HttpResponse(HttpRequestPtr request)
|
inline HttpResponse(HttpRequestPtr request) : request_(request), succeed_(false), response_code_(0) {}
|
||||||
: request_(request)
|
|
||||||
, succeed_(false)
|
|
||||||
, response_code_(0)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
inline HttpRequestPtr GetRequest() const
|
inline HttpRequestPtr GetRequest() const { return request_; }
|
||||||
{
|
|
||||||
return request_;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void SetSucceed(bool succeed)
|
inline void SetSucceed(bool succeed) { succeed_ = succeed; }
|
||||||
{
|
|
||||||
succeed_ = succeed;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool IsSucceed() const
|
inline bool IsSucceed() const { return succeed_; }
|
||||||
{
|
|
||||||
return succeed_;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void SetResponseCode(long response_code)
|
inline void SetResponseCode(long response_code) { response_code_ = response_code; }
|
||||||
{
|
|
||||||
response_code_ = response_code;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline long GetResponseCode() const
|
inline long GetResponseCode() const { return response_code_; }
|
||||||
{
|
|
||||||
return response_code_;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void SetHeader(String const& response_header)
|
inline void SetHeader(String const& response_header) { response_header_ = response_header; }
|
||||||
{
|
|
||||||
response_header_ = response_header;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline String GetHeader() const
|
inline String GetHeader() const { return response_header_; }
|
||||||
{
|
|
||||||
return response_header_;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void SetData(String const& response_data)
|
inline void SetData(String const& response_data) { response_data_ = response_data; }
|
||||||
{
|
|
||||||
response_data_ = response_data;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline String const& GetData() const
|
inline String const& GetData() const { return response_data_; }
|
||||||
{
|
|
||||||
return response_data_;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void SetError(String const& error_buffer)
|
inline void SetError(String const& error_buffer) { error_buffer_ = error_buffer; }
|
||||||
{
|
|
||||||
error_buffer_ = error_buffer;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline String const& GetError() const
|
inline String const& GetError() const { return error_buffer_; }
|
||||||
{
|
|
||||||
return error_buffer_;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool succeed_;
|
bool succeed_;
|
||||||
|
|
@ -20,10 +20,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "src/helper.h"
|
#include <kiwano-network/HttpRequest.h>
|
||||||
#include "src/HttpRequest.hpp"
|
#include <kiwano-network/HttpResponse.hpp>
|
||||||
#include "src/HttpResponse.hpp"
|
#include <kiwano-network/HttpClient.h>
|
||||||
#include "src/HttpClient.h"
|
|
||||||
|
|
||||||
// CURL
|
|
||||||
#include "third-party/curl/curl.h"
|
|
||||||
|
|
|
||||||
|
|
@ -18,20 +18,20 @@
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#include "Actor.h"
|
#include <kiwano/2d/Actor.h>
|
||||||
#include "Stage.h"
|
#include <kiwano/2d/Stage.h>
|
||||||
#include "../base/Logger.h"
|
#include <kiwano/base/Logger.h>
|
||||||
#include "../renderer/Renderer.h"
|
#include <kiwano/renderer/Renderer.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
Float32 default_anchor_x = 0.f;
|
float default_anchor_x = 0.f;
|
||||||
Float32 default_anchor_y = 0.f;
|
float default_anchor_y = 0.f;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Actor::SetDefaultAnchor(Float32 anchor_x, Float32 anchor_y)
|
void Actor::SetDefaultAnchor(float anchor_x, float anchor_y)
|
||||||
{
|
{
|
||||||
default_anchor_x = anchor_x;
|
default_anchor_x = anchor_x;
|
||||||
default_anchor_y = anchor_y;
|
default_anchor_y = anchor_y;
|
||||||
|
|
@ -325,7 +325,7 @@ namespace kiwano
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Actor::SetZOrder(Int32 zorder)
|
void Actor::SetZOrder(int zorder)
|
||||||
{
|
{
|
||||||
if (z_order_ != zorder)
|
if (z_order_ != zorder)
|
||||||
{
|
{
|
||||||
|
|
@ -334,7 +334,7 @@ namespace kiwano
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Actor::SetOpacity(Float32 opacity)
|
void Actor::SetOpacity(float opacity)
|
||||||
{
|
{
|
||||||
if (opacity_ == opacity)
|
if (opacity_ == opacity)
|
||||||
return;
|
return;
|
||||||
|
|
@ -361,12 +361,12 @@ namespace kiwano
|
||||||
dirty_transform_ = true;
|
dirty_transform_ = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Actor::SetWidth(Float32 width)
|
void Actor::SetWidth(float width)
|
||||||
{
|
{
|
||||||
SetSize(Size{ width, size_.y });
|
SetSize(Size{ width, size_.y });
|
||||||
}
|
}
|
||||||
|
|
||||||
void Actor::SetHeight(Float32 height)
|
void Actor::SetHeight(float height)
|
||||||
{
|
{
|
||||||
SetSize(Size{ size_.x, height });
|
SetSize(Size{ size_.x, height });
|
||||||
}
|
}
|
||||||
|
|
@ -410,12 +410,12 @@ namespace kiwano
|
||||||
dirty_transform_ = true;
|
dirty_transform_ = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Actor::SetPositionX(Float32 x)
|
void Actor::SetPositionX(float x)
|
||||||
{
|
{
|
||||||
SetPosition(Point{ x, transform_.position.y });
|
SetPosition(Point{ x, transform_.position.y });
|
||||||
}
|
}
|
||||||
|
|
||||||
void Actor::SetPositionY(Float32 y)
|
void Actor::SetPositionY(float y)
|
||||||
{
|
{
|
||||||
SetPosition(Point{ transform_.position.x, y });
|
SetPosition(Point{ transform_.position.x, y });
|
||||||
}
|
}
|
||||||
|
|
@ -445,7 +445,7 @@ namespace kiwano
|
||||||
is_fast_transform_ = false;
|
is_fast_transform_ = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Actor::SetRotation(Float32 angle)
|
void Actor::SetRotation(float angle)
|
||||||
{
|
{
|
||||||
if (transform_.rotation == angle)
|
if (transform_.rotation == angle)
|
||||||
return;
|
return;
|
||||||
|
|
@ -502,7 +502,7 @@ namespace kiwano
|
||||||
Vector<ActorPtr> Actor::GetChildren(String const& name) const
|
Vector<ActorPtr> Actor::GetChildren(String const& name) const
|
||||||
{
|
{
|
||||||
Vector<ActorPtr> children;
|
Vector<ActorPtr> children;
|
||||||
UInt32 hash_code = std::hash<String>{}(name);
|
size_t hash_code = std::hash<String>{}(name);
|
||||||
|
|
||||||
for (Actor* child = children_.first_item().get(); child; child = child->next_item().get())
|
for (Actor* child = children_.first_item().get(); child; child = child->next_item().get())
|
||||||
{
|
{
|
||||||
|
|
@ -516,7 +516,7 @@ namespace kiwano
|
||||||
|
|
||||||
ActorPtr Actor::GetChild(String const& name) const
|
ActorPtr Actor::GetChild(String const& name) const
|
||||||
{
|
{
|
||||||
UInt32 hash_code = std::hash<String>{}(name);
|
size_t hash_code = std::hash<String>{}(name);
|
||||||
|
|
||||||
for (Actor* child = children_.first_item().get(); child; child = child->next_item().get())
|
for (Actor* child = children_.first_item().get(); child; child = child->next_item().get())
|
||||||
{
|
{
|
||||||
|
|
@ -568,7 +568,7 @@ namespace kiwano
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
UInt32 hash_code = std::hash<String>{}(child_name);
|
size_t hash_code = std::hash<String>{}(child_name);
|
||||||
|
|
||||||
Actor* next;
|
Actor* next;
|
||||||
for (Actor* child = children_.first_item().get(); child; child = next)
|
for (Actor* child = children_.first_item().get(); child; child = next)
|
||||||
|
|
|
||||||
|
|
@ -19,11 +19,11 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "include-forwards.h"
|
#include <kiwano/2d/include-forwards.h>
|
||||||
#include "Transform.h"
|
#include <kiwano/2d/Transform.h>
|
||||||
#include "action/ActionManager.h"
|
#include <kiwano/2d/action/ActionManager.h>
|
||||||
#include "../base/TimerManager.h"
|
#include <kiwano/base/TimerManager.h>
|
||||||
#include "../base/EventDispatcher.h"
|
#include <kiwano/base/EventDispatcher.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -49,109 +49,109 @@ namespace kiwano
|
||||||
Actor();
|
Actor();
|
||||||
|
|
||||||
// 更新角色
|
// 更新角色
|
||||||
virtual void OnUpdate(Duration dt) { KGE_UNUSED(dt); }
|
virtual void OnUpdate(Duration dt) { KGE_UNUSED(dt); }
|
||||||
|
|
||||||
// 渲染角色
|
// 渲染角色
|
||||||
virtual void OnRender(RenderTarget* rt) { KGE_UNUSED(rt); }
|
virtual void OnRender(RenderTarget* rt) { KGE_UNUSED(rt); }
|
||||||
|
|
||||||
// 获取显示状态
|
// 获取显示状态
|
||||||
bool IsVisible() const { return visible_; }
|
bool IsVisible() const { return visible_; }
|
||||||
|
|
||||||
// 获取响应状态
|
// 获取响应状态
|
||||||
bool IsResponsible() const { return responsible_; }
|
bool IsResponsible() const { return responsible_; }
|
||||||
|
|
||||||
// 是否启用级联透明度
|
// 是否启用级联透明度
|
||||||
bool IsCascadeOpacityEnabled() const { return cascade_opacity_; }
|
bool IsCascadeOpacityEnabled() const { return cascade_opacity_; }
|
||||||
|
|
||||||
// 获取名称的 Hash 值
|
// 获取名称的 Hash 值
|
||||||
UInt32 GetHashName() const { return hash_name_; }
|
size_t GetHashName() const { return hash_name_; }
|
||||||
|
|
||||||
// 获取 Z 轴顺序
|
// 获取 Z 轴顺序
|
||||||
Int32 GetZOrder() const { return z_order_; }
|
int GetZOrder() const { return z_order_; }
|
||||||
|
|
||||||
// 获取坐标
|
// 获取坐标
|
||||||
Point GetPosition() const { return transform_.position; }
|
Point GetPosition() const { return transform_.position; }
|
||||||
|
|
||||||
// 获取 x 坐标
|
// 获取 x 坐标
|
||||||
Float32 GetPositionX() const { return transform_.position.x; }
|
float GetPositionX() const { return transform_.position.x; }
|
||||||
|
|
||||||
// 获取 y 坐标
|
// 获取 y 坐标
|
||||||
Float32 GetPositionY() const { return transform_.position.y; }
|
float GetPositionY() const { return transform_.position.y; }
|
||||||
|
|
||||||
// 获取缩放比例
|
// 获取缩放比例
|
||||||
Point GetScale() const { return transform_.scale; }
|
Point GetScale() const { return transform_.scale; }
|
||||||
|
|
||||||
// 获取横向缩放比例
|
// 获取横向缩放比例
|
||||||
Float32 GetScaleX() const { return transform_.scale.x; }
|
float GetScaleX() const { return transform_.scale.x; }
|
||||||
|
|
||||||
// 获取纵向缩放比例
|
// 获取纵向缩放比例
|
||||||
Float32 GetScaleY() const { return transform_.scale.y; }
|
float GetScaleY() const { return transform_.scale.y; }
|
||||||
|
|
||||||
// 获取错切角度
|
// 获取错切角度
|
||||||
Point GetSkew() const { return transform_.skew; }
|
Point GetSkew() const { return transform_.skew; }
|
||||||
|
|
||||||
// 获取横向错切角度
|
// 获取横向错切角度
|
||||||
Float32 GetSkewX() const { return transform_.skew.x; }
|
float GetSkewX() const { return transform_.skew.x; }
|
||||||
|
|
||||||
// 获取纵向错切角度
|
// 获取纵向错切角度
|
||||||
Float32 GetSkewY() const { return transform_.skew.y; }
|
float GetSkewY() const { return transform_.skew.y; }
|
||||||
|
|
||||||
// 获取旋转角度
|
// 获取旋转角度
|
||||||
Float32 GetRotation() const { return transform_.rotation; }
|
float GetRotation() const { return transform_.rotation; }
|
||||||
|
|
||||||
// 获取宽度
|
// 获取宽度
|
||||||
Float32 GetWidth() const { return size_.x; }
|
float GetWidth() const { return size_.x; }
|
||||||
|
|
||||||
// 获取高度
|
// 获取高度
|
||||||
Float32 GetHeight() const { return size_.y; }
|
float GetHeight() const { return size_.y; }
|
||||||
|
|
||||||
// 获取大小
|
// 获取大小
|
||||||
Size GetSize() const { return size_; }
|
Size GetSize() const { return size_; }
|
||||||
|
|
||||||
// 获取缩放后的宽度
|
// 获取缩放后的宽度
|
||||||
Float32 GetScaledWidth() const { return size_.x * transform_.scale.x; }
|
float GetScaledWidth() const { return size_.x * transform_.scale.x; }
|
||||||
|
|
||||||
// 获取缩放后的高度
|
// 获取缩放后的高度
|
||||||
Float32 GetScaledHeight() const { return size_.y * transform_.scale.y; }
|
float GetScaledHeight() const { return size_.y * transform_.scale.y; }
|
||||||
|
|
||||||
// 获取缩放后的大小
|
// 获取缩放后的大小
|
||||||
Size GetScaledSize() const { return Size{ GetScaledWidth(), GetScaledHeight() }; }
|
Size GetScaledSize() const { return Size{ GetScaledWidth(), GetScaledHeight() }; }
|
||||||
|
|
||||||
// 获取锚点
|
// 获取锚点
|
||||||
Point GetAnchor() const { return anchor_; }
|
Point GetAnchor() const { return anchor_; }
|
||||||
|
|
||||||
// 获取 x 方向锚点
|
// 获取 x 方向锚点
|
||||||
Float32 GetAnchorX() const { return anchor_.x; }
|
float GetAnchorX() const { return anchor_.x; }
|
||||||
|
|
||||||
// 获取 y 方向锚点
|
// 获取 y 方向锚点
|
||||||
Float32 GetAnchorY() const { return anchor_.y; }
|
float GetAnchorY() const { return anchor_.y; }
|
||||||
|
|
||||||
// 获取透明度
|
// 获取透明度
|
||||||
Float32 GetOpacity() const { return opacity_; }
|
float GetOpacity() const { return opacity_; }
|
||||||
|
|
||||||
// 获取显示透明度
|
// 获取显示透明度
|
||||||
Float32 GetDisplayedOpacity() const { return displayed_opacity_; }
|
float GetDisplayedOpacity() const { return displayed_opacity_; }
|
||||||
|
|
||||||
// 获取变换
|
// 获取变换
|
||||||
Transform GetTransform() const { return transform_; }
|
Transform GetTransform() const { return transform_; }
|
||||||
|
|
||||||
// 获取边框
|
|
||||||
virtual Rect GetBounds() const;
|
|
||||||
|
|
||||||
// 获取外切包围盒
|
|
||||||
virtual Rect GetBoundingBox() const;
|
|
||||||
|
|
||||||
// 获取二维变换矩阵
|
|
||||||
Matrix3x2 const& GetTransformMatrix() const;
|
|
||||||
|
|
||||||
// 获取二维变换的逆矩阵
|
|
||||||
Matrix3x2 const& GetTransformInverseMatrix() const;
|
|
||||||
|
|
||||||
// 获取父角色
|
// 获取父角色
|
||||||
inline Actor* GetParent() const { return parent_; }
|
inline Actor* GetParent() const { return parent_; }
|
||||||
|
|
||||||
// 获取所在舞台
|
// 获取所在舞台
|
||||||
inline Stage* GetStage() const { return stage_; }
|
inline Stage* GetStage() const { return stage_; }
|
||||||
|
|
||||||
|
// 获取边框
|
||||||
|
virtual Rect GetBounds() const;
|
||||||
|
|
||||||
|
// 获取外切包围盒
|
||||||
|
virtual Rect GetBoundingBox() const;
|
||||||
|
|
||||||
|
// 获取二维变换矩阵
|
||||||
|
Matrix3x2 const& GetTransformMatrix() const;
|
||||||
|
|
||||||
|
// 获取二维变换的逆矩阵
|
||||||
|
Matrix3x2 const& GetTransformInverseMatrix() const;
|
||||||
|
|
||||||
// 设置是否显示
|
// 设置是否显示
|
||||||
void SetVisible(
|
void SetVisible(
|
||||||
|
|
@ -170,8 +170,8 @@ namespace kiwano
|
||||||
|
|
||||||
// 设置坐标
|
// 设置坐标
|
||||||
inline void SetPosition(
|
inline void SetPosition(
|
||||||
Float32 x,
|
float x,
|
||||||
Float32 y
|
float y
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
SetPosition(Point{ x, y });
|
SetPosition(Point{ x, y });
|
||||||
|
|
@ -179,12 +179,12 @@ namespace kiwano
|
||||||
|
|
||||||
// 设置横坐标
|
// 设置横坐标
|
||||||
void SetPositionX(
|
void SetPositionX(
|
||||||
Float32 x
|
float x
|
||||||
);
|
);
|
||||||
|
|
||||||
// 设置纵坐标
|
// 设置纵坐标
|
||||||
void SetPositionY(
|
void SetPositionY(
|
||||||
Float32 y
|
float y
|
||||||
);
|
);
|
||||||
|
|
||||||
// 移动坐标
|
// 移动坐标
|
||||||
|
|
@ -194,8 +194,8 @@ namespace kiwano
|
||||||
|
|
||||||
// 移动坐标
|
// 移动坐标
|
||||||
inline void Move(
|
inline void Move(
|
||||||
Float32 vx,
|
float vx,
|
||||||
Float32 vy
|
float vy
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
Move(Vec2{ vx, vy });
|
Move(Vec2{ vx, vy });
|
||||||
|
|
@ -210,8 +210,8 @@ namespace kiwano
|
||||||
// 设置缩放比例
|
// 设置缩放比例
|
||||||
// 默认为 (1.0, 1.0)
|
// 默认为 (1.0, 1.0)
|
||||||
inline void SetScale(
|
inline void SetScale(
|
||||||
Float32 scalex,
|
float scalex,
|
||||||
Float32 scaley
|
float scaley
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
SetScale(Vec2{ scalex, scaley });
|
SetScale(Vec2{ scalex, scaley });
|
||||||
|
|
@ -226,8 +226,8 @@ namespace kiwano
|
||||||
// 设置错切角度
|
// 设置错切角度
|
||||||
// 默认为 (0, 0)
|
// 默认为 (0, 0)
|
||||||
inline void SetSkew(
|
inline void SetSkew(
|
||||||
Float32 skewx,
|
float skewx,
|
||||||
Float32 skewy
|
float skewy
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
SetSkew(Vec2{ skewx, skewy });
|
SetSkew(Vec2{ skewx, skewy });
|
||||||
|
|
@ -236,7 +236,7 @@ namespace kiwano
|
||||||
// 设置旋转角度
|
// 设置旋转角度
|
||||||
// 默认为 0
|
// 默认为 0
|
||||||
virtual void SetRotation(
|
virtual void SetRotation(
|
||||||
Float32 rotation
|
float rotation
|
||||||
);
|
);
|
||||||
|
|
||||||
// 设置锚点位置
|
// 设置锚点位置
|
||||||
|
|
@ -248,8 +248,8 @@ namespace kiwano
|
||||||
// 设置锚点位置
|
// 设置锚点位置
|
||||||
// 默认为 (0, 0), 范围 [0, 1]
|
// 默认为 (0, 0), 范围 [0, 1]
|
||||||
inline void SetAnchor(
|
inline void SetAnchor(
|
||||||
Float32 anchorx,
|
float anchorx,
|
||||||
Float32 anchory
|
float anchory
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
SetAnchor(Vec2{ anchorx, anchory });
|
SetAnchor(Vec2{ anchorx, anchory });
|
||||||
|
|
@ -257,12 +257,12 @@ namespace kiwano
|
||||||
|
|
||||||
// 修改宽度
|
// 修改宽度
|
||||||
virtual void SetWidth(
|
virtual void SetWidth(
|
||||||
Float32 width
|
float width
|
||||||
);
|
);
|
||||||
|
|
||||||
// 修改高度
|
// 修改高度
|
||||||
virtual void SetHeight(
|
virtual void SetHeight(
|
||||||
Float32 height
|
float height
|
||||||
);
|
);
|
||||||
|
|
||||||
// 修改大小
|
// 修改大小
|
||||||
|
|
@ -272,8 +272,8 @@ namespace kiwano
|
||||||
|
|
||||||
// 修改大小
|
// 修改大小
|
||||||
inline void SetSize(
|
inline void SetSize(
|
||||||
Float32 width,
|
float width,
|
||||||
Float32 height
|
float height
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
SetSize(Size{ width, height });
|
SetSize(Size{ width, height });
|
||||||
|
|
@ -282,7 +282,7 @@ namespace kiwano
|
||||||
// 设置透明度
|
// 设置透明度
|
||||||
// 默认为 1.0, 范围 [0, 1]
|
// 默认为 1.0, 范围 [0, 1]
|
||||||
virtual void SetOpacity(
|
virtual void SetOpacity(
|
||||||
Float32 opacity
|
float opacity
|
||||||
);
|
);
|
||||||
|
|
||||||
// 启用或禁用级联透明度
|
// 启用或禁用级联透明度
|
||||||
|
|
@ -298,7 +298,7 @@ namespace kiwano
|
||||||
// 设置 Z 轴顺序
|
// 设置 Z 轴顺序
|
||||||
// 默认为 0
|
// 默认为 0
|
||||||
void SetZOrder(
|
void SetZOrder(
|
||||||
Int32 zorder
|
int zorder
|
||||||
);
|
);
|
||||||
|
|
||||||
// 是否可响应 (鼠标 Hover | Out | Click 消息)
|
// 是否可响应 (鼠标 Hover | Out | Click 消息)
|
||||||
|
|
@ -354,33 +354,33 @@ namespace kiwano
|
||||||
// 判断点是否在角色内
|
// 判断点是否在角色内
|
||||||
virtual bool ContainsPoint(const Point& point) const;
|
virtual bool ContainsPoint(const Point& point) const;
|
||||||
|
|
||||||
// 暂停角色更新
|
|
||||||
inline void PauseUpdating() { update_pausing_ = true; }
|
|
||||||
|
|
||||||
// 继续角色更新
|
|
||||||
inline void ResumeUpdating() { update_pausing_ = false; }
|
|
||||||
|
|
||||||
// 角色更新是否暂停
|
|
||||||
inline bool IsUpdatePausing() const { return update_pausing_; }
|
|
||||||
|
|
||||||
// 设置更新时的回调函数
|
|
||||||
inline void SetCallbackOnUpdate(UpdateCallback const& cb) { cb_update_ = cb; }
|
|
||||||
|
|
||||||
// 获取更新时的回调函数
|
|
||||||
inline UpdateCallback GetCallbackOnUpdate() const { return cb_update_; }
|
|
||||||
|
|
||||||
// 渲染角色边界
|
|
||||||
inline void ShowBorder(bool show) { show_border_ = show; }
|
|
||||||
|
|
||||||
// 事件分发
|
// 事件分发
|
||||||
void Dispatch(Event& evt) override;
|
void Dispatch(Event& evt) override;
|
||||||
|
|
||||||
// 设置默认锚点
|
// 设置默认锚点
|
||||||
static void SetDefaultAnchor(
|
static void SetDefaultAnchor(
|
||||||
Float32 anchor_x,
|
float anchor_x,
|
||||||
Float32 anchor_y
|
float anchor_y
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// 暂停角色更新
|
||||||
|
inline void PauseUpdating() { update_pausing_ = true; }
|
||||||
|
|
||||||
|
// 继续角色更新
|
||||||
|
inline void ResumeUpdating() { update_pausing_ = false; }
|
||||||
|
|
||||||
|
// 角色更新是否暂停
|
||||||
|
inline bool IsUpdatePausing() const { return update_pausing_; }
|
||||||
|
|
||||||
|
// 设置更新时的回调函数
|
||||||
|
inline void SetCallbackOnUpdate(UpdateCallback const& cb) { cb_update_ = cb; }
|
||||||
|
|
||||||
|
// 获取更新时的回调函数
|
||||||
|
inline UpdateCallback GetCallbackOnUpdate() const { return cb_update_; }
|
||||||
|
|
||||||
|
// 渲染角色边界
|
||||||
|
inline void ShowBorder(bool show) { show_border_ = show; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void Update(Duration dt);
|
virtual void Update(Duration dt);
|
||||||
|
|
||||||
|
|
@ -408,12 +408,12 @@ namespace kiwano
|
||||||
bool hover_;
|
bool hover_;
|
||||||
bool pressed_;
|
bool pressed_;
|
||||||
bool responsible_;
|
bool responsible_;
|
||||||
Int32 z_order_;
|
int z_order_;
|
||||||
Float32 opacity_;
|
float opacity_;
|
||||||
Float32 displayed_opacity_;
|
float displayed_opacity_;
|
||||||
Actor* parent_;
|
Actor* parent_;
|
||||||
Stage* stage_;
|
Stage* stage_;
|
||||||
UInt32 hash_name_;
|
size_t hash_name_;
|
||||||
Point anchor_;
|
Point anchor_;
|
||||||
Size size_;
|
Size size_;
|
||||||
Children children_;
|
Children children_;
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,9 @@
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#include "Canvas.h"
|
#include <kiwano/2d/Canvas.h>
|
||||||
#include "../base/Logger.h"
|
#include <kiwano/base/Logger.h>
|
||||||
#include "../renderer/Renderer.h"
|
#include <kiwano/renderer/Renderer.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -72,7 +72,7 @@ namespace kiwano
|
||||||
fill_color_ = color;
|
fill_color_ = color;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Canvas::SetStrokeWidth(Float32 width)
|
void Canvas::SetStrokeWidth(float width)
|
||||||
{
|
{
|
||||||
stroke_width_ = std::max(width, 0.f);
|
stroke_width_ = std::max(width, 0.f);
|
||||||
}
|
}
|
||||||
|
|
@ -92,7 +92,7 @@ namespace kiwano
|
||||||
text_style_ = text_style;
|
text_style_ = text_style;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Canvas::SetBrushOpacity(Float32 opacity)
|
void Canvas::SetBrushOpacity(float opacity)
|
||||||
{
|
{
|
||||||
rt_.SetOpacity(opacity);
|
rt_.SetOpacity(opacity);
|
||||||
}
|
}
|
||||||
|
|
@ -107,12 +107,12 @@ namespace kiwano
|
||||||
return fill_color_;
|
return fill_color_;
|
||||||
}
|
}
|
||||||
|
|
||||||
Float32 Canvas::GetStrokeWidth() const
|
float Canvas::GetStrokeWidth() const
|
||||||
{
|
{
|
||||||
return stroke_width_;
|
return stroke_width_;
|
||||||
}
|
}
|
||||||
|
|
||||||
Float32 Canvas::GetBrushOpacity() const
|
float Canvas::GetBrushOpacity() const
|
||||||
{
|
{
|
||||||
return rt_.GetOpacity();
|
return rt_.GetOpacity();
|
||||||
}
|
}
|
||||||
|
|
@ -159,7 +159,7 @@ namespace kiwano
|
||||||
cache_expired_ = true;
|
cache_expired_ = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Canvas::DrawCircle(Point const& center, Float32 radius)
|
void Canvas::DrawCircle(Point const& center, float radius)
|
||||||
{
|
{
|
||||||
rt_.SetDefaultBrushColor(stroke_color_);
|
rt_.SetDefaultBrushColor(stroke_color_);
|
||||||
rt_.DrawEllipse(
|
rt_.DrawEllipse(
|
||||||
|
|
@ -206,7 +206,7 @@ namespace kiwano
|
||||||
cache_expired_ = true;
|
cache_expired_ = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Canvas::FillCircle(Point const& center, Float32 radius)
|
void Canvas::FillCircle(Point const& center, float radius)
|
||||||
{
|
{
|
||||||
rt_.SetDefaultBrushColor(fill_color_);
|
rt_.SetDefaultBrushColor(fill_color_);
|
||||||
rt_.FillEllipse(
|
rt_.FillEllipse(
|
||||||
|
|
@ -289,7 +289,7 @@ namespace kiwano
|
||||||
geo_sink_.AddBezier(point1, point2, point3);
|
geo_sink_.AddBezier(point1, point2, point3);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Canvas::AddArc(Point const & point, Point const & radius, Float32 rotation, bool clockwise, bool is_small)
|
void Canvas::AddArc(Point const & point, Point const & radius, float rotation, bool clockwise, bool is_small)
|
||||||
{
|
{
|
||||||
geo_sink_.AddArc(point, radius, rotation, clockwise, is_small);
|
geo_sink_.AddArc(point, radius, rotation, clockwise, is_small);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "Actor.h"
|
#include <kiwano/2d/Actor.h>
|
||||||
#include "../renderer/RenderTarget.h"
|
#include <kiwano/renderer/RenderTarget.h>
|
||||||
|
|
||||||
#ifdef DrawText
|
#ifdef DrawText
|
||||||
# undef DrawText
|
# undef DrawText
|
||||||
|
|
@ -52,7 +52,7 @@ namespace kiwano
|
||||||
// 画圆形边框
|
// 画圆形边框
|
||||||
void DrawCircle(
|
void DrawCircle(
|
||||||
Point const& center,
|
Point const& center,
|
||||||
Float32 radius
|
float radius
|
||||||
);
|
);
|
||||||
|
|
||||||
// 画椭圆形边框
|
// 画椭圆形边框
|
||||||
|
|
@ -75,7 +75,7 @@ namespace kiwano
|
||||||
// 填充圆形
|
// 填充圆形
|
||||||
void FillCircle(
|
void FillCircle(
|
||||||
Point const& center,
|
Point const& center,
|
||||||
Float32 radius
|
float radius
|
||||||
);
|
);
|
||||||
|
|
||||||
// 填充椭圆形
|
// 填充椭圆形
|
||||||
|
|
@ -139,7 +139,7 @@ namespace kiwano
|
||||||
void AddArc(
|
void AddArc(
|
||||||
Point const& point, /* 终点 */
|
Point const& point, /* 终点 */
|
||||||
Point const& radius, /* 椭圆半径 */
|
Point const& radius, /* 椭圆半径 */
|
||||||
Float32 rotation, /* ÍÖÔ²Ðýת½Ç¶È */
|
float rotation, /* ÍÖÔ²Ðýת½Ç¶È */
|
||||||
bool clockwise = true, /* 顺时针 or 逆时针 */
|
bool clockwise = true, /* 顺时针 or 逆时针 */
|
||||||
bool is_small = true /* 是否取小于 180° 的弧 */
|
bool is_small = true /* 是否取小于 180° 的弧 */
|
||||||
);
|
);
|
||||||
|
|
@ -170,7 +170,7 @@ namespace kiwano
|
||||||
|
|
||||||
// 设置轮廓宽度
|
// 设置轮廓宽度
|
||||||
void SetStrokeWidth(
|
void SetStrokeWidth(
|
||||||
Float32 width
|
float width
|
||||||
);
|
);
|
||||||
|
|
||||||
// 设置轮廓样式
|
// 设置轮廓样式
|
||||||
|
|
@ -190,7 +190,7 @@ namespace kiwano
|
||||||
|
|
||||||
// 设置画笔透明度
|
// 设置画笔透明度
|
||||||
void SetBrushOpacity(
|
void SetBrushOpacity(
|
||||||
Float32 opacity
|
float opacity
|
||||||
);
|
);
|
||||||
|
|
||||||
// 画笔二维变换
|
// 画笔二维变换
|
||||||
|
|
@ -226,10 +226,10 @@ namespace kiwano
|
||||||
Color GetStrokeColor() const;
|
Color GetStrokeColor() const;
|
||||||
|
|
||||||
// 获取轮廓宽度
|
// 获取轮廓宽度
|
||||||
Float32 GetStrokeWidth() const;
|
float GetStrokeWidth() const;
|
||||||
|
|
||||||
// 获取画笔透明度
|
// 获取画笔透明度
|
||||||
Float32 GetBrushOpacity() const;
|
float GetBrushOpacity() const;
|
||||||
|
|
||||||
// 导出为图片
|
// 导出为图片
|
||||||
Texture ExportToTexture() const;
|
Texture ExportToTexture() const;
|
||||||
|
|
@ -240,7 +240,7 @@ namespace kiwano
|
||||||
void UpdateCache() const;
|
void UpdateCache() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Float32 stroke_width_;
|
float stroke_width_;
|
||||||
Color fill_color_;
|
Color fill_color_;
|
||||||
Color stroke_color_;
|
Color stroke_color_;
|
||||||
Font text_font_;
|
Font text_font_;
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,9 @@
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#include "DebugActor.h"
|
#include <kiwano/2d/DebugActor.h>
|
||||||
#include "Text.h"
|
#include <kiwano/2d/Text.h>
|
||||||
#include "../renderer/Renderer.h"
|
#include <kiwano/renderer/Renderer.h>
|
||||||
#include <psapi.h>
|
#include <psapi.h>
|
||||||
|
|
||||||
#pragma comment(lib, "psapi.lib")
|
#pragma comment(lib, "psapi.lib")
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "Actor.h"
|
#include <kiwano/2d/Actor.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,8 @@
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#include "Frame.h"
|
#include <kiwano/2d/Frame.h>
|
||||||
#include "../renderer/TextureCache.h"
|
#include <kiwano/renderer/TextureCache.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "../base/ObjectBase.h"
|
#include <kiwano/base/ObjectBase.h>
|
||||||
#include "../renderer/Texture.h"
|
#include <kiwano/renderer/Texture.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -62,22 +62,22 @@ namespace kiwano
|
||||||
);
|
);
|
||||||
|
|
||||||
// 获取宽度
|
// 获取宽度
|
||||||
Float32 GetWidth() const { return crop_rect_.GetWidth(); }
|
float GetWidth() const { return crop_rect_.GetWidth(); }
|
||||||
|
|
||||||
// 获取高度
|
// 获取高度
|
||||||
Float32 GetHeight() const { return crop_rect_.GetHeight(); }
|
float GetHeight() const { return crop_rect_.GetHeight(); }
|
||||||
|
|
||||||
// 获取大小
|
// 获取大小
|
||||||
Size GetSize() const { return crop_rect_.GetSize(); }
|
Size GetSize() const { return crop_rect_.GetSize(); }
|
||||||
|
|
||||||
// 获取裁剪位置
|
// 获取裁剪位置
|
||||||
Point GetCropPoint() const { return crop_rect_.GetLeftTop(); }
|
Point GetCropPoint() const { return crop_rect_.GetLeftTop(); }
|
||||||
|
|
||||||
// 获取裁剪矩形
|
// 获取裁剪矩形
|
||||||
inline Rect const& GetCropRect() const { return crop_rect_; }
|
inline Rect const& GetCropRect() const { return crop_rect_; }
|
||||||
|
|
||||||
// 获取纹理
|
// 获取纹理
|
||||||
inline Texture const& GetTexture() const { return texture_; }
|
inline Texture const& GetTexture() const { return texture_; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Texture texture_;
|
Texture texture_;
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,9 @@
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#include "FrameSequence.h"
|
#include <kiwano/2d/FrameSequence.h>
|
||||||
#include "Frame.h"
|
#include <kiwano/2d/Frame.h>
|
||||||
#include "../base/Logger.h"
|
#include <kiwano/base/Logger.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -59,7 +59,7 @@ namespace kiwano
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
FramePtr FrameSequence::GetFrame(UInt32 index) const
|
FramePtr FrameSequence::GetFrame(size_t index) const
|
||||||
{
|
{
|
||||||
KGE_ASSERT(index < frames_.size());
|
KGE_ASSERT(index < frames_.size());
|
||||||
return frames_[index];
|
return frames_[index];
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "include-forwards.h"
|
#include <kiwano/2d/include-forwards.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -47,7 +47,7 @@ namespace kiwano
|
||||||
);
|
);
|
||||||
|
|
||||||
// 获取关键帧
|
// 获取关键帧
|
||||||
FramePtr GetFrame(UInt32 index) const;
|
FramePtr GetFrame(size_t index) const;
|
||||||
|
|
||||||
// 获取关键帧
|
// 获取关键帧
|
||||||
Vector<FramePtr> const& GetFrames() const;
|
Vector<FramePtr> const& GetFrames() const;
|
||||||
|
|
|
||||||
|
|
@ -18,10 +18,10 @@
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#include "GifSprite.h"
|
#include <kiwano/2d/GifSprite.h>
|
||||||
#include "../base/Logger.h"
|
#include <kiwano/base/win32/helper.h>
|
||||||
#include "../renderer/TextureCache.h"
|
#include <kiwano/renderer/TextureCache.h>
|
||||||
#include "../renderer/Renderer.h"
|
#include <kiwano/renderer/Renderer.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -71,7 +71,7 @@ namespace kiwano
|
||||||
loop_count_ = 0;
|
loop_count_ = 0;
|
||||||
frame_.disposal_type = GifImage::DisposalType::None;
|
frame_.disposal_type = GifImage::DisposalType::None;
|
||||||
|
|
||||||
SetSize(Size{ static_cast<Float32>(gif_.GetWidthInPixels()), static_cast<Float32>(gif_.GetHeightInPixels()) });
|
SetSize(Size{ static_cast<float>(gif_.GetWidthInPixels()), static_cast<float>(gif_.GetHeightInPixels()) });
|
||||||
|
|
||||||
if (!frame_rt_.IsValid())
|
if (!frame_rt_.IsValid())
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -19,10 +19,10 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "Actor.h"
|
#include <kiwano/2d/Actor.h>
|
||||||
#include "../base/Resource.h"
|
#include <kiwano/base/Resource.h>
|
||||||
#include "../renderer/RenderTarget.h"
|
#include <kiwano/renderer/RenderTarget.h>
|
||||||
#include "../renderer/GifImage.h"
|
#include <kiwano/renderer/GifImage.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -31,7 +31,7 @@ namespace kiwano
|
||||||
: public Actor
|
: public Actor
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
using LoopDoneCallback = Function<void(Int32)>;
|
using LoopDoneCallback = Function<void(int)>;
|
||||||
using DoneCallback = Function<void()>;
|
using DoneCallback = Function<void()>;
|
||||||
|
|
||||||
GifSprite();
|
GifSprite();
|
||||||
|
|
@ -61,7 +61,7 @@ namespace kiwano
|
||||||
);
|
);
|
||||||
|
|
||||||
// 设置 GIF 动画循环次数
|
// 设置 GIF 动画循环次数
|
||||||
inline void SetLoopCount(Int32 loops) { total_loop_count_ = loops; }
|
inline void SetLoopCount(int loops) { total_loop_count_ = loops; }
|
||||||
|
|
||||||
// 设置 GIF 动画每次循环结束回调函数
|
// 设置 GIF 动画每次循环结束回调函数
|
||||||
inline void SetLoopDoneCallback(LoopDoneCallback const& cb) { loop_cb_ = cb; }
|
inline void SetLoopDoneCallback(LoopDoneCallback const& cb) { loop_cb_ = cb; }
|
||||||
|
|
@ -104,9 +104,9 @@ namespace kiwano
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool animating_;
|
bool animating_;
|
||||||
Int32 total_loop_count_;
|
int total_loop_count_;
|
||||||
Int32 loop_count_;
|
int loop_count_;
|
||||||
UInt32 next_index_;
|
size_t next_index_;
|
||||||
Duration frame_elapsed_;
|
Duration frame_elapsed_;
|
||||||
LoopDoneCallback loop_cb_;
|
LoopDoneCallback loop_cb_;
|
||||||
DoneCallback done_cb_;
|
DoneCallback done_cb_;
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "Layer.h"
|
#include <kiwano/2d/Layer.h>
|
||||||
#include "../renderer/Renderer.h"
|
#include <kiwano/renderer/Renderer.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -48,7 +48,7 @@ namespace kiwano
|
||||||
area_.SetAreaRect(clip_rect);
|
area_.SetAreaRect(clip_rect);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Layer::SetOpacity(Float32 opacity)
|
void Layer::SetOpacity(float opacity)
|
||||||
{
|
{
|
||||||
// Actor::SetOpacity(opacity);
|
// Actor::SetOpacity(opacity);
|
||||||
area_.SetOpacity(opacity);
|
area_.SetOpacity(opacity);
|
||||||
|
|
|
||||||
|
|
@ -19,9 +19,9 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "Actor.h"
|
#include <kiwano/2d/Actor.h>
|
||||||
#include "..\renderer\LayerArea.h"
|
#include <kiwano/2d/..\renderer\LayerArea.h>
|
||||||
#include "..\renderer\RenderTarget.h"
|
#include <kiwano/2d/..\renderer\RenderTarget.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -34,12 +34,12 @@ namespace kiwano
|
||||||
virtual ~Layer();
|
virtual ~Layer();
|
||||||
|
|
||||||
// 重载下列函数以获取图层事件
|
// 重载下列函数以获取图层事件
|
||||||
virtual void OnMouseButtonDown(Int32 btn, Point const& p) {}
|
virtual void OnMouseButtonDown(int btn, Point const& p) {}
|
||||||
virtual void OnMouseButtonUp(Int32 btn, Point const& p) {}
|
virtual void OnMouseButtonUp(int btn, Point const& p) {}
|
||||||
virtual void OnMouseMoved(Point const& p) {}
|
virtual void OnMouseMoved(Point const& p) {}
|
||||||
virtual void OnMouseWheel(Float32 wheel) {}
|
virtual void OnMouseWheel(float wheel) {}
|
||||||
virtual void OnKeyDown(Int32 key) {}
|
virtual void OnKeyDown(int key) {}
|
||||||
virtual void OnKeyUp(Int32 key) {}
|
virtual void OnKeyUp(int key) {}
|
||||||
virtual void OnChar(char c) {}
|
virtual void OnChar(char c) {}
|
||||||
|
|
||||||
// 是否开启消息吞没
|
// 是否开启消息吞没
|
||||||
|
|
@ -52,7 +52,7 @@ namespace kiwano
|
||||||
void SetClipRect(Rect const& clip_rect);
|
void SetClipRect(Rect const& clip_rect);
|
||||||
|
|
||||||
// 设置图层透明度
|
// 设置图层透明度
|
||||||
void SetOpacity(Float32 opacity) override;
|
void SetOpacity(float opacity) override;
|
||||||
|
|
||||||
// 设置几何蒙层
|
// 设置几何蒙层
|
||||||
void SetMaskGeometry(Geometry const& mask);
|
void SetMaskGeometry(Geometry const& mask);
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,9 @@
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#include "ShapeActor.h"
|
#include <kiwano/2d/ShapeActor.h>
|
||||||
#include "../base/Logger.h"
|
#include <kiwano/base/Logger.h>
|
||||||
#include "../renderer/Renderer.h"
|
#include <kiwano/renderer/Renderer.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -70,7 +70,7 @@ namespace kiwano
|
||||||
stroke_color_ = color;
|
stroke_color_ = color;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ShapeActor::SetStrokeWidth(Float32 width)
|
void ShapeActor::SetStrokeWidth(float width)
|
||||||
{
|
{
|
||||||
stroke_width_ = std::max(width, 0.f);
|
stroke_width_ = std::max(width, 0.f);
|
||||||
}
|
}
|
||||||
|
|
@ -217,7 +217,7 @@ namespace kiwano
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
CircleActor::CircleActor(Float32 radius)
|
CircleActor::CircleActor(float radius)
|
||||||
{
|
{
|
||||||
SetRadius(radius);
|
SetRadius(radius);
|
||||||
}
|
}
|
||||||
|
|
@ -226,7 +226,7 @@ namespace kiwano
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void CircleActor::SetRadius(Float32 radius)
|
void CircleActor::SetRadius(float radius)
|
||||||
{
|
{
|
||||||
if (radius_ != radius)
|
if (radius_ != radius)
|
||||||
{
|
{
|
||||||
|
|
@ -338,7 +338,7 @@ namespace kiwano
|
||||||
sink_.AddBezier(point1, point2, point3);
|
sink_.AddBezier(point1, point2, point3);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PathActor::AddArc(Point const& point, Size const& radius, Float32 rotation, bool clockwise, bool is_small)
|
void PathActor::AddArc(Point const& point, Size const& radius, float rotation, bool clockwise, bool is_small)
|
||||||
{
|
{
|
||||||
sink_.AddArc(point, radius, rotation, clockwise, is_small);
|
sink_.AddArc(point, radius, rotation, clockwise, is_small);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,9 +19,9 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "Actor.h"
|
#include <kiwano/2d/Actor.h>
|
||||||
#include "../renderer/Geometry.h"
|
#include <kiwano/renderer/Geometry.h>
|
||||||
#include "../renderer/StrokeStyle.h"
|
#include <kiwano/renderer/StrokeStyle.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
@ -45,7 +45,7 @@ namespace kiwano
|
||||||
inline Color GetStrokeColor() const { return stroke_color_; }
|
inline Color GetStrokeColor() const { return stroke_color_; }
|
||||||
|
|
||||||
// 获取线条宽度
|
// 获取线条宽度
|
||||||
inline Float32 GetStrokeWidth() const { return stroke_width_; }
|
inline float GetStrokeWidth() const { return stroke_width_; }
|
||||||
|
|
||||||
// 获取线条样式
|
// 获取线条样式
|
||||||
inline StrokeStyle SetStrokeStyle() const { return stroke_style_; }
|
inline StrokeStyle SetStrokeStyle() const { return stroke_style_; }
|
||||||
|
|
@ -69,7 +69,7 @@ namespace kiwano
|
||||||
void SetStrokeColor(const Color& color);
|
void SetStrokeColor(const Color& color);
|
||||||
|
|
||||||
// 设置线条宽度
|
// 设置线条宽度
|
||||||
void SetStrokeWidth(Float32 width);
|
void SetStrokeWidth(float width);
|
||||||
|
|
||||||
// 设置线条样式
|
// 设置线条样式
|
||||||
void SetStrokeStyle(StrokeStyle stroke_style);
|
void SetStrokeStyle(StrokeStyle stroke_style);
|
||||||
|
|
@ -82,7 +82,7 @@ namespace kiwano
|
||||||
protected:
|
protected:
|
||||||
Color fill_color_;
|
Color fill_color_;
|
||||||
Color stroke_color_;
|
Color stroke_color_;
|
||||||
Float32 stroke_width_;
|
float stroke_width_;
|
||||||
StrokeStyle stroke_style_;
|
StrokeStyle stroke_style_;
|
||||||
Rect bounds_;
|
Rect bounds_;
|
||||||
Geometry geo_;
|
Geometry geo_;
|
||||||
|
|
@ -195,17 +195,17 @@ namespace kiwano
|
||||||
CircleActor();
|
CircleActor();
|
||||||
|
|
||||||
CircleActor(
|
CircleActor(
|
||||||
Float32 radius
|
float radius
|
||||||
);
|
);
|
||||||
|
|
||||||
virtual ~CircleActor();
|
virtual ~CircleActor();
|
||||||
|
|
||||||
inline Float32 GetRadius() const { return radius_; }
|
inline float GetRadius() const { return radius_; }
|
||||||
|
|
||||||
void SetRadius(Float32 radius);
|
void SetRadius(float radius);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Float32 radius_;
|
float radius_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -292,7 +292,7 @@ namespace kiwano
|
||||||
void AddArc(
|
void AddArc(
|
||||||
Point const& point, /* 终点 */
|
Point const& point, /* 终点 */
|
||||||
Size const& radius, /* 椭圆半径 */
|
Size const& radius, /* 椭圆半径 */
|
||||||
Float32 rotation, /* ÍÖÔ²Ðýת½Ç¶È */
|
float rotation, /* ÍÖÔ²Ðýת½Ç¶È */
|
||||||
bool clockwise = true, /* 顺时针 or 逆时针 */
|
bool clockwise = true, /* 顺时针 or 逆时针 */
|
||||||
bool is_small = true /* 是否取小于 180° 的弧 */
|
bool is_small = true /* 是否取小于 180° 的弧 */
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,8 @@
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#include "Sprite.h"
|
#include <kiwano/2d/Sprite.h>
|
||||||
#include "../renderer/Renderer.h"
|
#include <kiwano/renderer/Renderer.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "Actor.h"
|
#include <kiwano/2d/Actor.h>
|
||||||
#include "Frame.h"
|
#include <kiwano/2d/Frame.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,9 @@
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#include "Stage.h"
|
#include <kiwano/2d/Stage.h>
|
||||||
#include "../base/Logger.h"
|
#include <kiwano/base/Logger.h>
|
||||||
#include "../renderer/Renderer.h"
|
#include <kiwano/renderer/Renderer.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "Actor.h"
|
#include <kiwano/2d/Actor.h>
|
||||||
|
|
||||||
namespace kiwano
|
namespace kiwano
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue