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

reconstruct project

This commit is contained in:
Nomango 2019-02-03 00:16:53 +08:00 committed by Nomango
parent cbb4b4b318
commit 5a4279c15c
28 changed files with 367 additions and 1564 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,8 +1,6 @@
x86/
x64/
Debug/
Release/
prebuilt/
# vs2010
ipch/

32
project/vs2017/Easy2D.sln → project/Easy2D.sln
View File

@ -1,28 +1,38 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2009
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D", "Easy2D.vcxproj", "{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld\HelloWorld.vcxproj", "{3561A359-F9FD-48AB-A977-34E7E568BC8E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D", "Easy2D\Easy2D.vcxproj", "{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|Win32 = Debug|Win32
Release|x64 = Release|x64
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|x64.ActiveCfg = Debug|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|x64.Build.0 = Debug|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|x64.Deploy.0 = Debug|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|Win32.ActiveCfg = Debug|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|Win32.Build.0 = Debug|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|Win32.Deploy.0 = Debug|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|x64.ActiveCfg = Release|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|x64.Build.0 = Release|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|x64.ActiveCfg = Debug|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|x64.Build.0 = Debug|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|x64.Deploy.0 = Debug|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|Win32.ActiveCfg = Release|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|Win32.Build.0 = Release|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|x64.ActiveCfg = Release|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|x64.Build.0 = Release|x64
{3561A359-F9FD-48AB-A977-34E7E568BC8E}.Debug|Win32.ActiveCfg = Debug|Win32
{3561A359-F9FD-48AB-A977-34E7E568BC8E}.Debug|Win32.Build.0 = Debug|Win32
{3561A359-F9FD-48AB-A977-34E7E568BC8E}.Debug|x64.ActiveCfg = Debug|x64
{3561A359-F9FD-48AB-A977-34E7E568BC8E}.Debug|x64.Build.0 = Debug|x64
{3561A359-F9FD-48AB-A977-34E7E568BC8E}.Release|Win32.ActiveCfg = Release|Win32
{3561A359-F9FD-48AB-A977-34E7E568BC8E}.Release|Win32.Build.0 = Release|Win32
{3561A359-F9FD-48AB-A977-34E7E568BC8E}.Release|x64.ActiveCfg = Release|x64
{3561A359-F9FD-48AB-A977-34E7E568BC8E}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

113
project/vs2013/Easy2D.vcxproj → project/Easy2D/Easy2D.vcxproj
View File

@ -1,23 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\core\Action.hpp" />
<ClInclude Include="..\..\src\core\ActionGroup.h" />
@ -135,36 +117,49 @@
<ClCompile Include="..\..\src\utils\string.cpp" />
<ClCompile Include="..\..\src\utils\Transcoder.cpp" />
</ItemGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{91DBDFCC-4083-427C-AAAD-55715118DB26}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>Win32Project1</RootNamespace>
<ProjectGuid>{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}</ProjectGuid>
<RootNamespace>Easy2D</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>false</WholeProgramOptimization>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>false</WholeProgramOptimization>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@ -184,74 +179,58 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)x86\</OutDir>
<IntDir>$(Configuration)\x86\</IntDir>
<TargetName>Easy2Ddw</TargetName>
<OutDir>$(ProjectDir)$(Configuration)\</OutDir>
<IntDir>$(ProjectDir)$(Configuration)\</IntDir>
<TargetName>easy2dd</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(Configuration)\$(Platform)\</IntDir>
<TargetName>Easy2Ddw</TargetName>
<OutDir>$(SolutionDir)$(Platform)\</OutDir>
<IntDir>$(ProjectDir)$(Configuration)\</IntDir>
<OutDir>$(ProjectDir)$(Configuration)\</OutDir>
<TargetName>easy2dd</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)x86\</OutDir>
<IntDir>$(Configuration)\x86\</IntDir>
<TargetName>Easy2Dw</TargetName>
<OutDir>$(ProjectDir)$(Configuration)\</OutDir>
<IntDir>$(ProjectDir)$(Configuration)\</IntDir>
<TargetName>easy2d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(Configuration)\$(Platform)\</IntDir>
<TargetName>Easy2Dw</TargetName>
<OutDir>$(SolutionDir)$(Platform)\</OutDir>
<IntDir>$(ProjectDir)$(Configuration)\</IntDir>
<OutDir>$(ProjectDir)$(Configuration)\</OutDir>
<TargetName>easy2d</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<DebugInformationFormat>None</DebugInformationFormat>
<MinimalRebuild>false</MinimalRebuild>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<DebugInformationFormat>None</DebugInformationFormat>
<MinimalRebuild>false</MinimalRebuild>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>
</FunctionLevelLinking>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<DebugInformationFormat>None</DebugInformationFormat>
<BufferSecurityCheck>false</BufferSecurityCheck>
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
@ -260,20 +239,14 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>
</FunctionLevelLinking>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<DebugInformationFormat>None</DebugInformationFormat>
<BufferSecurityCheck>false</BufferSecurityCheck>
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>

30
project/vs2017/Easy2D.vcxproj.filters → project/Easy2D/Easy2D.vcxproj.filters
View File

@ -1,5 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="core">
<UniqueIdentifier>{896bdedf-6e82-449b-9b6e-0bc69f3699b1}</UniqueIdentifier>
</Filter>
<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>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\easy2d.h" />
<ClInclude Include="..\..\src\core\Animation.h">
@ -204,20 +218,6 @@
<Filter>math</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="core">
<UniqueIdentifier>{896bdedf-6e82-449b-9b6e-0bc69f3699b1}</UniqueIdentifier>
</Filter>
<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>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\core\Animation.cpp">
<Filter>core</Filter>

153
project/HelloWorld/HelloWorld.vcxproj Normal file
View File

@ -0,0 +1,153 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{3561A359-F9FD-48AB-A977-34E7E568BC8E}</ProjectGuid>
<RootNamespace>HelloWorld</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../../src</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="main.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Easy2D\Easy2D.vcxproj">
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

6
project/HelloWorld/HelloWorld.vcxproj.filters Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="main.cpp" />
</ItemGroup>
</Project>

52
project/HelloWorld/main.cpp Normal file
View File

@ -0,0 +1,52 @@
// Copyright (C) 2019 Nomango
#include "easy2d.h"
const int WINDOW_WIDTH = 640;
const int WINDOW_HEIGHT = 480;
class MainScene
: public easy2d::Scene
{
public:
MainScene()
{
// 创建文字节点
easy2d::TextPtr text = new easy2d::Text(L"Hello Easy2D!");
// 修改节点位置
text->SetPosition(WINDOW_WIDTH / 2, WINDOW_HEIGHT / 2);
// 修改节点锚点, 使节点在屏幕上居中
text->SetAnchor(0.5, 0.5);
// 添加到场景中
this->AddChild(text);
}
};
int main()
{
try
{
// 创建 Easy2D 程序实例
easy2d::Application app;
// 创建初始化选项
easy2d::Options options;
// 设置窗口宽高
options.width = WINDOW_WIDTH;
options.height = WINDOW_HEIGHT;
// 初始化 app
app.Init(options);
// 创建场景并进入
easy2d::ScenePtr scene = new MainScene;
app.EnterScene(scene);
// 运行
app.Run();
}
catch (std::exception& e)
{
::MessageBoxA(nullptr, e.what(), "An exception has occurred!", MB_ICONERROR | MB_TASKMODAL);
}
return 0;
}

28
project/vs2013/Easy2D.sln
View File

@ -1,28 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D", "Easy2D.vcxproj", "{91DBDFCC-4083-427C-AAAD-55715118DB26}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{91DBDFCC-4083-427C-AAAD-55715118DB26}.Debug|Win32.ActiveCfg = Debug|Win32
{91DBDFCC-4083-427C-AAAD-55715118DB26}.Debug|Win32.Build.0 = Debug|Win32
{91DBDFCC-4083-427C-AAAD-55715118DB26}.Debug|x64.ActiveCfg = Debug|x64
{91DBDFCC-4083-427C-AAAD-55715118DB26}.Debug|x64.Build.0 = Debug|x64
{91DBDFCC-4083-427C-AAAD-55715118DB26}.Release|Win32.ActiveCfg = Release|Win32
{91DBDFCC-4083-427C-AAAD-55715118DB26}.Release|Win32.Build.0 = Release|Win32
{91DBDFCC-4083-427C-AAAD-55715118DB26}.Release|x64.ActiveCfg = Release|x64
{91DBDFCC-4083-427C-AAAD-55715118DB26}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

358
project/vs2013/Easy2D.vcxproj.filters
View File

@ -1,358 +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\easy2d.h" />
<ClInclude Include="..\..\src\core\Animation.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\audio.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Canvas.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Color.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Image.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Input.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\logs.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\macros.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\modules.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Node.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\render.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Resource.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Scene.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Sprite.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Task.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Text.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\TextRenderer.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\time.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Transition.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\window.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\rand.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\scalar.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\vector.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\Data.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\File.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\Path.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\Player.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\Transcoder.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ui\Button.h">
<Filter>ui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ui\Menu.h">
<Filter>ui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Music.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Singleton.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\RefCounter.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Action.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\ActionManager.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\TaskManager.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\TextStyle.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Font.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Transform.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\noncopyable.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\string.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Geometry.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\GeometryNode.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\ease.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\ActionTween.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Delay.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Frames.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\constants.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Factory.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\EventDispatcher.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\EventListener.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Object.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\helper.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\d2dhelper.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\keys.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\include-forwards.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\DebugNode.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\Rect.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\ResLoader.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Application.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Event.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\IntrusiveList.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\IntrusivePtr.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\closure.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\ActionGroup.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\ActionHelper.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\Matrix.h">
<Filter>math</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="core">
<UniqueIdentifier>{896bdedf-6e82-449b-9b6e-0bc69f3699b1}</UniqueIdentifier>
</Filter>
<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>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\core\Animation.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\audio.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Canvas.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Color.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Image.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Input.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\modules.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Node.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\render.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Resource.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Scene.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Sprite.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Task.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Text.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\TextRenderer.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\time.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Transition.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\window.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\math\rand.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\Data.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\File.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\Path.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\Player.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\Transcoder.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ui\Button.cpp">
<Filter>ui</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ui\Menu.cpp">
<Filter>ui</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Music.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\TaskManager.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\ActionManager.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\logs.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\string.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Geometry.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\GeometryNode.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\ActionTween.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Delay.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Frames.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Factory.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\EventDispatcher.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\EventListener.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Object.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\DebugNode.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\ResLoader.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Application.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\ActionGroup.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\math\Matrix.cpp">
<Filter>math</Filter>
</ClCompile>
</ItemGroup>
</Project>

32
project/vs2015/Easy2D.sln
View File

@ -1,32 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Easy2D", "Easy2D.vcxproj", "{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|Win32 = Debug|Win32
Release|x64 = Release|x64
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|x64.ActiveCfg = Debug|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|x64.Build.0 = Debug|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|x64.Deploy.0 = Debug|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|Win32.ActiveCfg = Debug|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|Win32.Build.0 = Debug|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|x64.ActiveCfg = Release|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|x64.Build.0 = Release|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|Win32.ActiveCfg = Release|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FAC2BE2F-19AF-477A-8DC6-4645E66868A4}
EndGlobalSection
EndGlobal

317
project/vs2015/Easy2D.vcxproj
View File

@ -1,317 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\core\Action.hpp" />
<ClInclude Include="..\..\src\core\ActionGroup.h" />
<ClInclude Include="..\..\src\core\ActionHelper.h" />
<ClInclude Include="..\..\src\core\ActionTween.h" />
<ClInclude Include="..\..\src\core\ActionManager.h" />
<ClInclude Include="..\..\src\core\Animation.h" />
<ClInclude Include="..\..\src\core\audio.h" />
<ClInclude Include="..\..\src\core\Canvas.h" />
<ClInclude Include="..\..\src\core\closure.hpp" />
<ClInclude Include="..\..\src\core\Color.h" />
<ClInclude Include="..\..\src\core\d2dhelper.hpp" />
<ClInclude Include="..\..\src\core\DebugNode.h" />
<ClInclude Include="..\..\src\core\Delay.h" />
<ClInclude Include="..\..\src\core\Event.hpp" />
<ClInclude Include="..\..\src\core\EventDispatcher.h" />
<ClInclude Include="..\..\src\core\EventListener.h" />
<ClInclude Include="..\..\src\core\Factory.h" />
<ClInclude Include="..\..\src\core\Font.hpp" />
<ClInclude Include="..\..\src\core\Frames.h" />
<ClInclude Include="..\..\src\core\Application.h" />
<ClInclude Include="..\..\src\core\Geometry.h" />
<ClInclude Include="..\..\src\core\GeometryNode.h" />
<ClInclude Include="..\..\src\core\helper.hpp" />
<ClInclude Include="..\..\src\core\Image.h" />
<ClInclude Include="..\..\src\core\include-forwards.h" />
<ClInclude Include="..\..\src\core\Input.h" />
<ClInclude Include="..\..\src\core\IntrusiveList.hpp" />
<ClInclude Include="..\..\src\core\IntrusivePtr.hpp" />
<ClInclude Include="..\..\src\core\keys.hpp" />
<ClInclude Include="..\..\src\core\logs.h" />
<ClInclude Include="..\..\src\core\macros.h" />
<ClInclude Include="..\..\src\core\modules.h" />
<ClInclude Include="..\..\src\core\Music.h" />
<ClInclude Include="..\..\src\core\Node.h" />
<ClInclude Include="..\..\src\core\noncopyable.hpp" />
<ClInclude Include="..\..\src\core\Object.h" />
<ClInclude Include="..\..\src\core\RefCounter.hpp" />
<ClInclude Include="..\..\src\core\render.h" />
<ClInclude Include="..\..\src\core\Resource.h" />
<ClInclude Include="..\..\src\core\Scene.h" />
<ClInclude Include="..\..\src\core\Singleton.hpp" />
<ClInclude Include="..\..\src\core\Sprite.h" />
<ClInclude Include="..\..\src\core\Task.h" />
<ClInclude Include="..\..\src\core\TaskManager.h" />
<ClInclude Include="..\..\src\core\Text.h" />
<ClInclude Include="..\..\src\core\TextRenderer.h" />
<ClInclude Include="..\..\src\core\TextStyle.hpp" />
<ClInclude Include="..\..\src\core\time.h" />
<ClInclude Include="..\..\src\core\Transform.hpp" />
<ClInclude Include="..\..\src\core\Transition.h" />
<ClInclude Include="..\..\src\core\window.h" />
<ClInclude Include="..\..\src\easy2d.h" />
<ClInclude Include="..\..\src\math\constants.hpp" />
<ClInclude Include="..\..\src\math\ease.hpp" />
<ClInclude Include="..\..\src\math\Matrix.h" />
<ClInclude Include="..\..\src\math\rand.h" />
<ClInclude Include="..\..\src\math\Rect.hpp" />
<ClInclude Include="..\..\src\math\scalar.hpp" />
<ClInclude Include="..\..\src\math\vector.hpp" />
<ClInclude Include="..\..\src\ui\Button.h" />
<ClInclude Include="..\..\src\ui\Menu.h" />
<ClInclude Include="..\..\src\utils\Data.h" />
<ClInclude Include="..\..\src\utils\File.h" />
<ClInclude Include="..\..\src\utils\Path.h" />
<ClInclude Include="..\..\src\utils\Player.h" />
<ClInclude Include="..\..\src\utils\ResLoader.h" />
<ClInclude Include="..\..\src\utils\string.h" />
<ClInclude Include="..\..\src\utils\Transcoder.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\core\ActionGroup.cpp" />
<ClCompile Include="..\..\src\core\ActionTween.cpp" />
<ClCompile Include="..\..\src\core\ActionManager.cpp" />
<ClCompile Include="..\..\src\core\Animation.cpp" />
<ClCompile Include="..\..\src\core\audio.cpp" />
<ClCompile Include="..\..\src\core\Canvas.cpp" />
<ClCompile Include="..\..\src\core\Color.cpp" />
<ClCompile Include="..\..\src\core\DebugNode.cpp" />
<ClCompile Include="..\..\src\core\Delay.cpp" />
<ClCompile Include="..\..\src\core\EventDispatcher.cpp" />
<ClCompile Include="..\..\src\core\EventListener.cpp" />
<ClCompile Include="..\..\src\core\Factory.cpp" />
<ClCompile Include="..\..\src\core\Frames.cpp" />
<ClCompile Include="..\..\src\core\Application.cpp" />
<ClCompile Include="..\..\src\core\Geometry.cpp" />
<ClCompile Include="..\..\src\core\GeometryNode.cpp" />
<ClCompile Include="..\..\src\core\Image.cpp" />
<ClCompile Include="..\..\src\core\Input.cpp" />
<ClCompile Include="..\..\src\core\logs.cpp" />
<ClCompile Include="..\..\src\core\modules.cpp" />
<ClCompile Include="..\..\src\core\Music.cpp" />
<ClCompile Include="..\..\src\core\Node.cpp" />
<ClCompile Include="..\..\src\core\Object.cpp" />
<ClCompile Include="..\..\src\core\render.cpp" />
<ClCompile Include="..\..\src\core\Resource.cpp" />
<ClCompile Include="..\..\src\core\Scene.cpp" />
<ClCompile Include="..\..\src\core\Sprite.cpp" />
<ClCompile Include="..\..\src\core\Task.cpp" />
<ClCompile Include="..\..\src\core\TaskManager.cpp" />
<ClCompile Include="..\..\src\core\Text.cpp" />
<ClCompile Include="..\..\src\core\TextRenderer.cpp" />
<ClCompile Include="..\..\src\core\time.cpp" />
<ClCompile Include="..\..\src\core\Transition.cpp" />
<ClCompile Include="..\..\src\core\window.cpp" />
<ClCompile Include="..\..\src\math\Matrix.cpp" />
<ClCompile Include="..\..\src\math\rand.cpp" />
<ClCompile Include="..\..\src\ui\Button.cpp" />
<ClCompile Include="..\..\src\ui\Menu.cpp" />
<ClCompile Include="..\..\src\utils\Data.cpp" />
<ClCompile Include="..\..\src\utils\File.cpp" />
<ClCompile Include="..\..\src\utils\Path.cpp" />
<ClCompile Include="..\..\src\utils\Player.cpp" />
<ClCompile Include="..\..\src\utils\ResLoader.cpp" />
<ClCompile Include="..\..\src\utils\string.cpp" />
<ClCompile Include="..\..\src\utils\Transcoder.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>Easy2D</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</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>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<TargetName>Easy2Ddw</TargetName>
<OutDir>$(SolutionDir)x86\</OutDir>
<IntDir>$(Configuration)\x86\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<TargetName>Easy2Ddw</TargetName>
<OutDir>$(SolutionDir)$(Platform)\</OutDir>
<IntDir>$(Configuration)\$(Platform)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<TargetName>Easy2Dw</TargetName>
<OutDir>$(SolutionDir)x86\</OutDir>
<IntDir>$(Configuration)\x86\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<TargetName>Easy2Dw</TargetName>
<OutDir>$(SolutionDir)$(Platform)\</OutDir>
<IntDir>$(Configuration)\$(Platform)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<DebugInformationFormat>None</DebugInformationFormat>
<MinimalRebuild>false</MinimalRebuild>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Lib>
<AdditionalDependencies>
</AdditionalDependencies>
<IgnoreAllDefaultLibraries>
</IgnoreAllDefaultLibraries>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<DebugInformationFormat>None</DebugInformationFormat>
<MinimalRebuild>false</MinimalRebuild>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Lib>
<AdditionalDependencies>
</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<DebugInformationFormat>None</DebugInformationFormat>
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Lib>
<AdditionalDependencies>
</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>
</IgnoreSpecificDefaultLibraries>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<DebugInformationFormat>None</DebugInformationFormat>
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Lib>
<AdditionalDependencies>
</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

358
project/vs2015/Easy2D.vcxproj.filters
View File

@ -1,358 +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\easy2d.h" />
<ClInclude Include="..\..\src\core\Animation.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\audio.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Canvas.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Color.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Image.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Input.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\logs.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\macros.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\modules.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Node.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\render.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Resource.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Scene.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Sprite.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Task.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Text.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\TextRenderer.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\time.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Transition.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\window.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\rand.h">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\scalar.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\vector.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\Data.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\File.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\Path.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\Player.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\Transcoder.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ui\Button.h">
<Filter>ui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ui\Menu.h">
<Filter>ui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Music.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Singleton.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\RefCounter.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Action.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\ActionManager.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\TaskManager.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\TextStyle.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Font.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Transform.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\noncopyable.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\string.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Geometry.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\GeometryNode.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\ease.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\ActionTween.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Delay.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Frames.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\constants.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Factory.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\EventDispatcher.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\EventListener.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Object.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\helper.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\d2dhelper.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\keys.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\include-forwards.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\DebugNode.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\Rect.hpp">
<Filter>math</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utils\ResLoader.h">
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Application.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\Event.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\IntrusiveList.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\IntrusivePtr.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\closure.hpp">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\ActionGroup.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\ActionHelper.h">
<Filter>core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\math\Matrix.h">
<Filter>math</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="core">
<UniqueIdentifier>{896bdedf-6e82-449b-9b6e-0bc69f3699b1}</UniqueIdentifier>
</Filter>
<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>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\core\Animation.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\audio.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Canvas.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Color.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Image.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Input.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\modules.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Node.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\render.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Resource.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Scene.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Sprite.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Task.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Text.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\TextRenderer.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\time.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Transition.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\window.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\math\rand.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\Data.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\File.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\Path.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\Player.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\Transcoder.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ui\Button.cpp">
<Filter>ui</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ui\Menu.cpp">
<Filter>ui</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Music.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\TaskManager.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\ActionManager.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\logs.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\string.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Geometry.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\GeometryNode.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\ActionTween.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Delay.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Frames.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Factory.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\EventDispatcher.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\EventListener.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Object.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\DebugNode.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utils\ResLoader.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\Application.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\ActionGroup.cpp">
<Filter>core</Filter>
</ClCompile>
<ClCompile Include="..\..\src\math\Matrix.cpp">
<Filter>math</Filter>
</ClCompile>
</ItemGroup>
</Project>

325
project/vs2017/Easy2D.vcxproj
View File

@ -1,325 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\core\Action.hpp" />
<ClInclude Include="..\..\src\core\ActionGroup.h" />
<ClInclude Include="..\..\src\core\ActionHelper.h" />
<ClInclude Include="..\..\src\core\ActionTween.h" />
<ClInclude Include="..\..\src\core\ActionManager.h" />
<ClInclude Include="..\..\src\core\Animation.h" />
<ClInclude Include="..\..\src\core\audio.h" />
<ClInclude Include="..\..\src\core\Canvas.h" />
<ClInclude Include="..\..\src\core\closure.hpp" />
<ClInclude Include="..\..\src\core\Color.h" />
<ClInclude Include="..\..\src\core\d2dhelper.hpp" />
<ClInclude Include="..\..\src\core\DebugNode.h" />
<ClInclude Include="..\..\src\core\Delay.h" />
<ClInclude Include="..\..\src\core\Event.hpp" />
<ClInclude Include="..\..\src\core\EventDispatcher.h" />
<ClInclude Include="..\..\src\core\EventListener.h" />
<ClInclude Include="..\..\src\core\Factory.h" />
<ClInclude Include="..\..\src\core\Font.hpp" />
<ClInclude Include="..\..\src\core\Frames.h" />
<ClInclude Include="..\..\src\core\Application.h" />
<ClInclude Include="..\..\src\core\Geometry.h" />
<ClInclude Include="..\..\src\core\GeometryNode.h" />
<ClInclude Include="..\..\src\core\helper.hpp" />
<ClInclude Include="..\..\src\core\Image.h" />
<ClInclude Include="..\..\src\core\include-forwards.h" />
<ClInclude Include="..\..\src\core\Input.h" />
<ClInclude Include="..\..\src\core\IntrusiveList.hpp" />
<ClInclude Include="..\..\src\core\IntrusivePtr.hpp" />
<ClInclude Include="..\..\src\core\keys.hpp" />
<ClInclude Include="..\..\src\core\logs.h" />
<ClInclude Include="..\..\src\core\macros.h" />
<ClInclude Include="..\..\src\core\modules.h" />
<ClInclude Include="..\..\src\core\Music.h" />
<ClInclude Include="..\..\src\core\Node.h" />
<ClInclude Include="..\..\src\core\noncopyable.hpp" />
<ClInclude Include="..\..\src\core\Object.h" />
<ClInclude Include="..\..\src\core\RefCounter.hpp" />
<ClInclude Include="..\..\src\core\render.h" />
<ClInclude Include="..\..\src\core\Resource.h" />
<ClInclude Include="..\..\src\core\Scene.h" />
<ClInclude Include="..\..\src\core\Singleton.hpp" />
<ClInclude Include="..\..\src\core\Sprite.h" />
<ClInclude Include="..\..\src\core\Task.h" />
<ClInclude Include="..\..\src\core\TaskManager.h" />
<ClInclude Include="..\..\src\core\Text.h" />
<ClInclude Include="..\..\src\core\TextRenderer.h" />
<ClInclude Include="..\..\src\core\TextStyle.hpp" />
<ClInclude Include="..\..\src\core\time.h" />
<ClInclude Include="..\..\src\core\Transform.hpp" />
<ClInclude Include="..\..\src\core\Transition.h" />
<ClInclude Include="..\..\src\core\window.h" />
<ClInclude Include="..\..\src\easy2d.h" />
<ClInclude Include="..\..\src\math\constants.hpp" />
<ClInclude Include="..\..\src\math\ease.hpp" />
<ClInclude Include="..\..\src\math\Matrix.h" />
<ClInclude Include="..\..\src\math\rand.h" />
<ClInclude Include="..\..\src\math\Rect.hpp" />
<ClInclude Include="..\..\src\math\scalar.hpp" />
<ClInclude Include="..\..\src\math\vector.hpp" />
<ClInclude Include="..\..\src\ui\Button.h" />
<ClInclude Include="..\..\src\ui\Menu.h" />
<ClInclude Include="..\..\src\utils\Data.h" />
<ClInclude Include="..\..\src\utils\File.h" />
<ClInclude Include="..\..\src\utils\Path.h" />
<ClInclude Include="..\..\src\utils\Player.h" />
<ClInclude Include="..\..\src\utils\ResLoader.h" />
<ClInclude Include="..\..\src\utils\string.h" />
<ClInclude Include="..\..\src\utils\Transcoder.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\core\ActionGroup.cpp" />
<ClCompile Include="..\..\src\core\ActionTween.cpp" />
<ClCompile Include="..\..\src\core\ActionManager.cpp" />
<ClCompile Include="..\..\src\core\Animation.cpp" />
<ClCompile Include="..\..\src\core\audio.cpp" />
<ClCompile Include="..\..\src\core\Canvas.cpp" />
<ClCompile Include="..\..\src\core\Color.cpp" />
<ClCompile Include="..\..\src\core\DebugNode.cpp" />
<ClCompile Include="..\..\src\core\Delay.cpp" />
<ClCompile Include="..\..\src\core\EventDispatcher.cpp" />
<ClCompile Include="..\..\src\core\EventListener.cpp" />
<ClCompile Include="..\..\src\core\Factory.cpp" />
<ClCompile Include="..\..\src\core\Frames.cpp" />
<ClCompile Include="..\..\src\core\Application.cpp" />
<ClCompile Include="..\..\src\core\Geometry.cpp" />
<ClCompile Include="..\..\src\core\GeometryNode.cpp" />
<ClCompile Include="..\..\src\core\Image.cpp" />
<ClCompile Include="..\..\src\core\Input.cpp" />
<ClCompile Include="..\..\src\core\logs.cpp" />
<ClCompile Include="..\..\src\core\modules.cpp" />
<ClCompile Include="..\..\src\core\Music.cpp" />
<ClCompile Include="..\..\src\core\Node.cpp" />
<ClCompile Include="..\..\src\core\Object.cpp" />
<ClCompile Include="..\..\src\core\render.cpp" />
<ClCompile Include="..\..\src\core\Resource.cpp" />
<ClCompile Include="..\..\src\core\Scene.cpp" />
<ClCompile Include="..\..\src\core\Sprite.cpp" />
<ClCompile Include="..\..\src\core\Task.cpp" />
<ClCompile Include="..\..\src\core\TaskManager.cpp" />
<ClCompile Include="..\..\src\core\Text.cpp" />
<ClCompile Include="..\..\src\core\TextRenderer.cpp" />
<ClCompile Include="..\..\src\core\time.cpp" />
<ClCompile Include="..\..\src\core\Transition.cpp" />
<ClCompile Include="..\..\src\core\window.cpp" />
<ClCompile Include="..\..\src\math\Matrix.cpp" />
<ClCompile Include="..\..\src\math\rand.cpp" />
<ClCompile Include="..\..\src\ui\Button.cpp" />
<ClCompile Include="..\..\src\ui\Menu.cpp" />
<ClCompile Include="..\..\src\utils\Data.cpp" />
<ClCompile Include="..\..\src\utils\File.cpp" />
<ClCompile Include="..\..\src\utils\Path.cpp" />
<ClCompile Include="..\..\src\utils\Player.cpp" />
<ClCompile Include="..\..\src\utils\ResLoader.cpp" />
<ClCompile Include="..\..\src\utils\string.cpp" />
<ClCompile Include="..\..\src\utils\Transcoder.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>Easy2D</RootNamespace>
<WindowsTargetPlatformVersion>
</WindowsTargetPlatformVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'==''">
<!-- Latest Target Version property -->
<LatestTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
<TargetPlatformVersion>$(WindowsTargetPlatformVersion)</TargetPlatformVersion>
</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>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<TargetName>Easy2Ddw</TargetName>
<OutDir>$(SolutionDir)x86\</OutDir>
<IntDir>$(Configuration)\x86\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<TargetName>Easy2Ddw</TargetName>
<OutDir>$(SolutionDir)$(Platform)\</OutDir>
<IntDir>$(Configuration)\$(Platform)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<TargetName>Easy2Dw</TargetName>
<OutDir>$(SolutionDir)x86\</OutDir>
<IntDir>$(Configuration)\x86\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<TargetName>Easy2Dw</TargetName>
<OutDir>$(SolutionDir)$(Platform)\</OutDir>
<IntDir>$(Configuration)\$(Platform)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<DebugInformationFormat>None</DebugInformationFormat>
<MinimalRebuild>false</MinimalRebuild>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Lib>
<AdditionalDependencies>
</AdditionalDependencies>
<IgnoreAllDefaultLibraries>
</IgnoreAllDefaultLibraries>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<DebugInformationFormat>None</DebugInformationFormat>
<MinimalRebuild>false</MinimalRebuild>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Lib>
<AdditionalDependencies>
</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<DebugInformationFormat>None</DebugInformationFormat>
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Lib>
<AdditionalDependencies>
</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>
</IgnoreSpecificDefaultLibraries>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<DebugInformationFormat>None</DebugInformationFormat>
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Lib>
<AdditionalDependencies>
</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

3
src/core/Action.hpp
View File

@ -79,10 +79,11 @@ namespace easy2d
this->Reset();
}
virtual void Init(Node* target) { initialized_ = true; }
virtual void Init(Node* target) { E2D_NOT_USED(target); initialized_ = true; }
virtual void Update(Node* target, Duration dt)
{
E2D_NOT_USED(dt);
if (!initialized_)
{
Init(target);

36
src/core/Application.cpp
View File

@ -55,12 +55,15 @@ namespace easy2d
debug_ = options.debug;
// show console if debug mode enabled
HWND console = ::GetConsoleWindow();
if (debug_ && !console)
if (debug_ && !::GetConsoleWindow())
{
if (::AllocConsole())
if (!::AllocConsole())
{
console = ::GetConsoleWindow();
logs::Warningln(L"AllocConsole failed");
}
else
{
HWND console = ::GetConsoleWindow();
FILE * dummy;
freopen_s(&dummy, "CONOUT$", "w+t", stdout);
freopen_s(&dummy, "CONIN$", "r+t", stdin);
@ -73,19 +76,14 @@ namespace easy2d
std::wcin.clear();
std::cerr.clear();
std::wcerr.clear();
}
}
else if (!debug_ && console)
{
::ShowWindow(console, SW_HIDE);
console = nullptr;
}
// disable the close button of console
if (console)
{
HMENU hmenu = ::GetSystemMenu(console, FALSE);
::RemoveMenu(hmenu, SC_CLOSE, MF_BYCOMMAND);
// disable the close button of console
if (console)
{
HMENU hmenu = ::GetSystemMenu(console, FALSE);
::RemoveMenu(hmenu, SC_CLOSE, MF_BYCOMMAND);
}
}
}
ThrowIfFailed(
@ -131,7 +129,7 @@ namespace easy2d
::ImmAssociateContext(hwnd, nullptr);
// use Application instance in message loop
::SetWindowLongPtr(hwnd, GWLP_USERDATA, PtrToUlong(this));
::SetWindowLongPtr(hwnd, GWLP_USERDATA, LONG_PTR(this));
}
void Application::Run()
@ -259,7 +257,9 @@ namespace easy2d
LRESULT CALLBACK Application::WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
{
Application * app = reinterpret_cast<Application*>(::GetWindowLongW(hwnd, GWLP_USERDATA));
Application * app = reinterpret_cast<Application*>(
static_cast<LONG_PTR>(::GetWindowLongPtrW(hwnd, GWLP_USERDATA))
);
if (!app)
return ::DefWindowProcW(hwnd, msg, wparam, lparam);

2
src/core/DebugNode.cpp
View File

@ -82,6 +82,8 @@ namespace easy2d
void DebugNode::OnUpdate(Duration dt)
{
E2D_NOT_USED(dt);
try
{
frame_time_.push_back(time::Now());

2
src/core/Input.cpp
View File

@ -40,6 +40,8 @@ namespace easy2d
HRESULT Input::Init(HWND hwnd, bool debug)
{
E2D_NOT_USED(debug);
E2D_LOG(L"Initing input device");
hwnd_ = hwnd;

3
src/core/IntrusiveList.hpp
View File

@ -172,8 +172,7 @@ namespace easy2d
T tmp = first_;
while (tmp != child)
{
if (tmp == last_)
E2D_ASSERT(false && "The node to be removed is not in this list");
E2D_ASSERT((tmp != last_) && "The node to be removed is not in this list");
tmp = tmp->next_;
}
#endif

3
src/core/Node.cpp
View File

@ -280,7 +280,8 @@ namespace easy2d
if (sibling && sibling->GetZOrder() > zorder)
{
while (sibling = sibling->PrevItem().Get())
sibling = sibling->PrevItem().Get();
while (sibling)
{
if (sibling->GetZOrder() <= zorder)
break;

2
src/core/Node.h
View File

@ -50,7 +50,7 @@ namespace easy2d
Node();
// 更新节点
virtual void OnUpdate(Duration dt) {}
virtual void OnUpdate(Duration dt) { E2D_NOT_USED(dt); }
// 渲染节点
virtual void OnRender() {}

24
src/core/TextRenderer.cpp
View File

@ -85,6 +85,11 @@ namespace easy2d
__in DWRITE_GLYPH_RUN_DESCRIPTION const* glyphRunDescription,
IUnknown* clientDrawingEffect)
{
E2D_NOT_USED(clientDrawingContext);
E2D_NOT_USED(measuringMode);
E2D_NOT_USED(glyphRunDescription);
E2D_NOT_USED(clientDrawingEffect);
HRESULT hr = S_OK;
ID2D1PathGeometry* pPathGeometry = nullptr;
@ -171,6 +176,9 @@ namespace easy2d
__in DWRITE_UNDERLINE const* underline,
IUnknown* clientDrawingEffect)
{
E2D_NOT_USED(clientDrawingContext);
E2D_NOT_USED(clientDrawingEffect);
HRESULT hr;
D2D1_RECT_F rect = D2D1::RectF(
@ -237,6 +245,9 @@ namespace easy2d
__in DWRITE_STRIKETHROUGH const* strikethrough,
IUnknown* clientDrawingEffect)
{
E2D_NOT_USED(clientDrawingContext);
E2D_NOT_USED(clientDrawingEffect);
HRESULT hr;
D2D1_RECT_F rect = D2D1::RectF(
@ -305,6 +316,13 @@ namespace easy2d
BOOL IsRightToLeft,
IUnknown* clientDrawingEffect)
{
E2D_NOT_USED(clientDrawingContext);
E2D_NOT_USED(originX);
E2D_NOT_USED(originY);
E2D_NOT_USED(inlineObject);
E2D_NOT_USED(IsSideways);
E2D_NOT_USED(IsRightToLeft);
E2D_NOT_USED(clientDrawingEffect);
return E_NOTIMPL;
}
@ -330,6 +348,8 @@ namespace easy2d
__maybenull void* clientDrawingContext,
__out BOOL* isDisabled)
{
E2D_NOT_USED(clientDrawingContext);
*isDisabled = FALSE;
return S_OK;
}
@ -338,6 +358,8 @@ namespace easy2d
__maybenull void* clientDrawingContext,
__out DWRITE_MATRIX* transform)
{
E2D_NOT_USED(clientDrawingContext);
pRT_->GetTransform(reinterpret_cast<D2D1_MATRIX_3X2_F*>(transform));
return S_OK;
}
@ -346,6 +368,8 @@ namespace easy2d
__maybenull void* clientDrawingContext,
__out FLOAT* pixelsPerDip)
{
E2D_NOT_USED(clientDrawingContext);
float x, yUnused;
pRT_->GetDpi(&x, &yUnused);

2
src/core/audio.cpp
View File

@ -184,6 +184,8 @@ namespace easy2d
HRESULT Audio::Init(bool debug)
{
E2D_NOT_USED(debug);
E2D_LOG(L"Initing audio device");
HRESULT hr = modules::MediaFoundation::Get().MFStartup(MF_VERSION, MFSTARTUP_FULL);

8
src/core/macros.h
View File

@ -82,7 +82,7 @@
#include <wincodec.h>
// C++ RunTime Header Files
#include <cstdlib>
#include <cassert>
#include <string>
#include <vector>
#include <algorithm>
@ -99,8 +99,12 @@
#ifndef E2D_ASSERT
# ifdef E2D_DEBUG
# define E2D_ASSERT(expr) if (!(expr)) { ::OutputDebugStringA("[easy2d] Assert failed: " #expr "\n"); abort(); }
# define E2D_ASSERT(expr) assert(expr)
# else
# define E2D_ASSERT __noop
# endif
#endif
#ifndef E2D_NOT_USED
# define E2D_NOT_USED(var) ((void)var);
#endif

12
src/core/time.cpp
View File

@ -36,35 +36,35 @@ namespace easy2d
}
TimePoint::TimePoint(long dur)
: dur(dur)
: dur_(dur)
{
}
const TimePoint TimePoint::operator+(const Duration & dur) const
{
return TimePoint{ (dur + dur).Milliseconds() };
return TimePoint{ dur_ + dur.Milliseconds() };
}
const TimePoint TimePoint::operator-(const Duration & dur) const
{
return TimePoint{ (dur - dur).Milliseconds() };
return TimePoint{ dur_ - dur.Milliseconds() };
}
TimePoint & TimePoint::operator+=(const Duration & other)
{
dur += other.Milliseconds();
dur_ += other.Milliseconds();
return (*this);
}
TimePoint & TimePoint::operator-=(const Duration &other)
{
dur -= other.Milliseconds();
dur_ -= other.Milliseconds();
return (*this);
}
const Duration TimePoint::operator-(const TimePoint & other) const
{
return Duration(dur - other.dur);
return Duration(dur_ - other.dur_);
}

4
src/core/time.h
View File

@ -130,7 +130,7 @@ namespace easy2d
TimePoint(long);
// 是否是零时
inline bool IsZero() const { return dur == 0; }
inline bool IsZero() const { return dur_ == 0; }
const TimePoint operator + (const Duration &) const;
const TimePoint operator - (const Duration &) const;
@ -141,7 +141,7 @@ namespace easy2d
const Duration operator - (const TimePoint &) const;
private:
long dur;
long dur_;
};
// 获取当前时间

2
src/core/window.cpp
View File

@ -65,6 +65,8 @@ namespace easy2d
HRESULT Window::Init(String title, int width, int height, LPCWSTR icon, bool fullscreen, WNDPROC proc, bool debug)
{
E2D_NOT_USED(debug);
E2D_LOG(L"Creating window");
HINSTANCE hinst = GetModuleHandleW(nullptr);

7
src/easy2d.h
View File

@ -112,10 +112,3 @@
#include "ui/Button.h"
#include "ui/Menu.h"
#if defined(DEBUG) || defined(_DEBUG)
# pragma comment(lib, "Easy2Ddw.lib")
#else
# pragma comment(lib, "Easy2Dw.lib")
#endif

15
src/utils/Transcoder.cpp
View File

@ -68,7 +68,6 @@ namespace easy2d
HRESULT Transcoder::LoadMediaResource(Resource const& res, BYTE** wave_data, UINT32* wave_data_size)
{
HRESULT hr = S_OK;
HINSTANCE hinstance = GetModuleHandle(nullptr);
IntrusivePtr<IStream> stream;
IntrusivePtr<IMFByteStream> byte_stream;
@ -135,7 +134,7 @@ namespace easy2d
if (SUCCEEDED(hr))
{
hr = reader->SetCurrentMediaType(
MF_SOURCE_READER_FIRST_AUDIO_STREAM,
(DWORD)MF_SOURCE_READER_FIRST_AUDIO_STREAM,
0,
partial_type.Get()
);
@ -145,7 +144,7 @@ namespace easy2d
if (SUCCEEDED(hr))
{
hr = reader->GetCurrentMediaType(
MF_SOURCE_READER_FIRST_AUDIO_STREAM,
(DWORD)MF_SOURCE_READER_FIRST_AUDIO_STREAM,
&uncompressed_type
);
}
@ -154,7 +153,7 @@ namespace easy2d
if (SUCCEEDED(hr))
{
hr = reader->SetStreamSelection(
MF_SOURCE_READER_FIRST_AUDIO_STREAM,
(DWORD)MF_SOURCE_READER_FIRST_AUDIO_STREAM,
true
);
}
@ -167,7 +166,7 @@ namespace easy2d
uncompressed_type.Get(),
&wave_format_,
&size,
MFWaveFormatExConvertFlag_Normal
(DWORD)MFWaveFormatExConvertFlag_Normal
);
}
@ -178,7 +177,7 @@ namespace easy2d
PropVariantInit(&prop);
hr = reader->GetPresentationAttribute(
MF_SOURCE_READER_MEDIASOURCE,
(DWORD)MF_SOURCE_READER_MEDIASOURCE,
MF_PD_DURATION,
&prop
);
@ -186,7 +185,7 @@ namespace easy2d
LONGLONG duration = prop.uhVal.QuadPart;
max_stream_size = static_cast<DWORD>(
(duration * wave_format_->nAvgBytesPerSec) / 10000000 + 1
);
);
PropVariantClear(&prop);
}
@ -210,7 +209,7 @@ namespace easy2d
while (true)
{
hr = reader->ReadSample(
MF_SOURCE_READER_FIRST_AUDIO_STREAM,
(DWORD)MF_SOURCE_READER_FIRST_AUDIO_STREAM,
0,
nullptr,
&flags,