Compare commits
5 Commits
b1c4939b16
...
Ex2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2fe3bc4a27 | ||
|
|
17f77bdcf9 | ||
|
|
c7f66ad59c | ||
|
|
e1039eec4e | ||
|
|
25f977e43d |
47
.gitignore
vendored
47
.gitignore
vendored
@@ -1,47 +0,0 @@
|
|||||||
# Prerequisites
|
|
||||||
*.d
|
|
||||||
|
|
||||||
# Compiled Object files
|
|
||||||
*.slo
|
|
||||||
*.lo
|
|
||||||
*.o
|
|
||||||
*.obj
|
|
||||||
|
|
||||||
# Precompiled Headers
|
|
||||||
*.gch
|
|
||||||
*.pch
|
|
||||||
|
|
||||||
# Compiled Dynamic libraries
|
|
||||||
*.so
|
|
||||||
*.dylib
|
|
||||||
*.dll
|
|
||||||
|
|
||||||
# Fortran module files
|
|
||||||
*.mod
|
|
||||||
*.smod
|
|
||||||
|
|
||||||
# Compiled Static libraries
|
|
||||||
*.lai
|
|
||||||
*.la
|
|
||||||
*.a
|
|
||||||
*.lib
|
|
||||||
|
|
||||||
# Executables
|
|
||||||
*.exe
|
|
||||||
*.out
|
|
||||||
*.app
|
|
||||||
|
|
||||||
|
|
||||||
.DS_STORE
|
|
||||||
|
|
||||||
Win32
|
|
||||||
*.vcxproj.user
|
|
||||||
|
|
||||||
.vs
|
|
||||||
SimulationsRunner/Debug
|
|
||||||
SimulationsRunner/Release
|
|
||||||
|
|
||||||
x64/
|
|
||||||
Win32/
|
|
||||||
Debug/
|
|
||||||
Release/
|
|
||||||
@@ -1,496 +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>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{B99E1FA1-C30A-45F2-9D57-9E9C21B2DF42}</ProjectGuid>
|
|
||||||
<RootNamespace>AntTweakBar</RootNamespace>
|
|
||||||
<ProjectName>AntTweakBar</ProjectName>
|
|
||||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<UseOfMfc>false</UseOfMfc>
|
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<UseOfMfc>false</UseOfMfc>
|
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<UseOfMfc>false</UseOfMfc>
|
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<UseOfMfc>false</UseOfMfc>
|
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</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" />
|
|
||||||
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
|
|
||||||
</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" />
|
|
||||||
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
|
|
||||||
</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" />
|
|
||||||
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
|
|
||||||
</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" />
|
|
||||||
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
|
|
||||||
</ImportGroup>
|
|
||||||
<PropertyGroup Label="UserMacros" />
|
|
||||||
<PropertyGroup>
|
|
||||||
<_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<OutDir>../lib\</OutDir>
|
|
||||||
<IntDir>release64\</IntDir>
|
|
||||||
<IgnoreImportLibrary>false</IgnoreImportLibrary>
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
<TargetName>$(ProjectName)64</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<IgnoreImportLibrary>false</IgnoreImportLibrary>
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
<TargetName>$(ProjectName)</TargetName>
|
|
||||||
<OutDir>../lib\</OutDir>
|
|
||||||
<IntDir>release32\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
<OutDir>../lib/debug\</OutDir>
|
|
||||||
<IntDir>debug64\</IntDir>
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
<TargetName>$(ProjectName)64</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
<TargetName>$(ProjectName)</TargetName>
|
|
||||||
<OutDir>../lib/debug\</OutDir>
|
|
||||||
<IntDir>debug32\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>fxc /T vs_4_0_level_9_1 /E LineRectVS /Fh $(IntDir)TwDirect3D11_LineRectVS.h TwDirect3D11.hlsl
|
|
||||||
fxc/T vs_4_0_level_9_1 /E LineRectCstColorVS /Fh $(IntDir)TwDirect3D11_LineRectCstColorVS.h TwDirect3D11.hlsl
|
|
||||||
fxc /T ps_4_0_level_9_1 /E LineRectPS /Fh $(IntDir)TwDirect3D11_LineRectPS.h TwDirect3D11.hlsl
|
|
||||||
fxc /T vs_4_0_level_9_1 /E TextVS /Fh $(IntDir)TwDirect3D11_TextVS.h TwDirect3D11.hlsl
|
|
||||||
fxc /T vs_4_0_level_9_1 /E TextCstColorVS /Fh $(IntDir)TwDirect3D11_TextCstColorVS.h TwDirect3D11.hlsl
|
|
||||||
fxc /T ps_4_0_level_9_1 /E TextPS /Fh $(IntDir)TwDirect3D11_TextPS.h TwDirect3D11.hlsl
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<Midl>
|
|
||||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<MkTypLibCompatible>true</MkTypLibCompatible>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<TargetEnvironment>X64</TargetEnvironment>
|
|
||||||
<TypeLibraryName>$(OutDir)AntTweakBar.tlb</TypeLibraryName>
|
|
||||||
</Midl>
|
|
||||||
<ClCompile>
|
|
||||||
<Optimization>Full</Optimization>
|
|
||||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
|
||||||
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN64;_WIN64;NDEBUG;_WINDOWS;_USRDLL;TW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<StringPooling>true</StringPooling>
|
|
||||||
<ExceptionHandling />
|
|
||||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>TwPrecomp.h</PrecompiledHeaderFile>
|
|
||||||
<PrecompiledHeaderOutputFile>$(IntDir)AntTweakBar.pch</PrecompiledHeaderOutputFile>
|
|
||||||
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
|
|
||||||
<ObjectFileName>$(IntDir)</ObjectFileName>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<DebugInformationFormat />
|
|
||||||
<CompileAs>Default</CompileAs>
|
|
||||||
</ClCompile>
|
|
||||||
<ResourceCompile>
|
|
||||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<Culture>0x0409</Culture>
|
|
||||||
<AdditionalIncludeDirectories>res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
</ResourceCompile>
|
|
||||||
<Link>
|
|
||||||
<RegisterOutput>false</RegisterOutput>
|
|
||||||
<OutputFile>$(OutDir)AntTweakBar64.dll</OutputFile>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
|
||||||
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
|
|
||||||
<MapExports>false</MapExports>
|
|
||||||
<SetChecksum>true</SetChecksum>
|
|
||||||
<RandomizedBaseAddress>false</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention />
|
|
||||||
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
|
|
||||||
<TargetMachine>MachineX64</TargetMachine>
|
|
||||||
</Link>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>mkdir "$(SolutionDir)$(Platform)/$(Configuration)"
|
|
||||||
xcopy /y /f "$(TargetPath)" "$(SolutionDir)$(Platform)/$(Configuration)"</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>fxc /T vs_4_0_level_9_1 /E LineRectVS /Fh $(IntDir)TwDirect3D11_LineRectVS.h TwDirect3D11.hlsl
|
|
||||||
fxc/T vs_4_0_level_9_1 /E LineRectCstColorVS /Fh $(IntDir)TwDirect3D11_LineRectCstColorVS.h TwDirect3D11.hlsl
|
|
||||||
fxc /T ps_4_0_level_9_1 /E LineRectPS /Fh $(IntDir)TwDirect3D11_LineRectPS.h TwDirect3D11.hlsl
|
|
||||||
fxc /T vs_4_0_level_9_1 /E TextVS /Fh $(IntDir)TwDirect3D11_TextVS.h TwDirect3D11.hlsl
|
|
||||||
fxc /T vs_4_0_level_9_1 /E TextCstColorVS /Fh $(IntDir)TwDirect3D11_TextCstColorVS.h TwDirect3D11.hlsl
|
|
||||||
fxc /T ps_4_0_level_9_1 /E TextPS /Fh $(IntDir)TwDirect3D11_TextPS.h TwDirect3D11.hlsl
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<Midl>
|
|
||||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<MkTypLibCompatible>true</MkTypLibCompatible>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<TypeLibraryName>$(OutDir)AntTweakBar.tlb</TypeLibraryName>
|
|
||||||
</Midl>
|
|
||||||
<ClCompile>
|
|
||||||
<Optimization>Full</Optimization>
|
|
||||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
|
||||||
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<StringPooling>true</StringPooling>
|
|
||||||
<ExceptionHandling>
|
|
||||||
</ExceptionHandling>
|
|
||||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>TwPrecomp.h</PrecompiledHeaderFile>
|
|
||||||
<PrecompiledHeaderOutputFile>$(IntDir)AntTweakBar.pch</PrecompiledHeaderOutputFile>
|
|
||||||
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
|
|
||||||
<ObjectFileName>$(IntDir)</ObjectFileName>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<DebugInformationFormat>
|
|
||||||
</DebugInformationFormat>
|
|
||||||
<CompileAs>Default</CompileAs>
|
|
||||||
</ClCompile>
|
|
||||||
<ResourceCompile>
|
|
||||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<Culture>0x0409</Culture>
|
|
||||||
<AdditionalIncludeDirectories>res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
</ResourceCompile>
|
|
||||||
<Link>
|
|
||||||
<RegisterOutput>false</RegisterOutput>
|
|
||||||
<OutputFile>$(OutDir)AntTweakBar.dll</OutputFile>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
|
||||||
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
|
|
||||||
<MapExports>false</MapExports>
|
|
||||||
<SetChecksum>true</SetChecksum>
|
|
||||||
<RandomizedBaseAddress>false</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>
|
|
||||||
</DataExecutionPrevention>
|
|
||||||
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
|
|
||||||
</Link>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>mkdir "$(SolutionDir)$(Platform)/$(Configuration)"
|
|
||||||
xcopy /y /f "$(TargetPath)" "$(SolutionDir)$(Platform)/$(Configuration)"</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>fxc /Od /Zi /T vs_4_0_level_9_1 /E LineRectVS /Fh $(IntDir)TwDirect3D11_LineRectVS.h TwDirect3D11.hlsl
|
|
||||||
fxc /Od /Zi /T vs_4_0_level_9_1 /E LineRectCstColorVS /Fh $(IntDir)TwDirect3D11_LineRectCstColorVS.h TwDirect3D11.hlsl
|
|
||||||
fxc /Od /Zi /T ps_4_0_level_9_1 /E LineRectPS /Fh $(IntDir)TwDirect3D11_LineRectPS.h TwDirect3D11.hlsl
|
|
||||||
fxc /Od /Zi /T vs_4_0_level_9_1 /E TextVS /Fh $(IntDir)TwDirect3D11_TextVS.h TwDirect3D11.hlsl
|
|
||||||
fxc /Od /Zi /T vs_4_0_level_9_1 /E TextCstColorVS /Fh $(IntDir)TwDirect3D11_TextCstColorVS.h TwDirect3D11.hlsl
|
|
||||||
fxc /Od /Zi /T ps_4_0_level_9_1 /E TextPS /Fh $(IntDir)TwDirect3D11_TextPS.h TwDirect3D11.hlsl
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<Midl>
|
|
||||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<MkTypLibCompatible>true</MkTypLibCompatible>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<TargetEnvironment>X64</TargetEnvironment>
|
|
||||||
<TypeLibraryName>$(OutDir)AntTweakBar.tlb</TypeLibraryName>
|
|
||||||
</Midl>
|
|
||||||
<ClCompile>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN64;_WIN64;_DEBUG;_WINDOWS;_USRDLL;TW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
||||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>TwPrecomp.h</PrecompiledHeaderFile>
|
|
||||||
<PrecompiledHeaderOutputFile>$(IntDir)AntTweakBar.pch</PrecompiledHeaderOutputFile>
|
|
||||||
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
|
|
||||||
<ObjectFileName>$(IntDir)</ObjectFileName>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
|
||||||
<CompileAs>Default</CompileAs>
|
|
||||||
</ClCompile>
|
|
||||||
<ResourceCompile>
|
|
||||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<Culture>0x0409</Culture>
|
|
||||||
<AdditionalIncludeDirectories>res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
</ResourceCompile>
|
|
||||||
<Link>
|
|
||||||
<OutputFile>$(OutDir)AntTweakBar64.dll</OutputFile>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
|
|
||||||
<RandomizedBaseAddress>false</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention />
|
|
||||||
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
|
|
||||||
<TargetMachine>MachineX64</TargetMachine>
|
|
||||||
</Link>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>mkdir "$(SolutionDir)$(Platform)/$(Configuration)"
|
|
||||||
xcopy /y /f "$(TargetPath)" "$(SolutionDir)$(Platform)/$(Configuration)"</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>fxc /Od /Zi /T vs_4_0_level_9_1 /E LineRectVS /Fh $(IntDir)TwDirect3D11_LineRectVS.h TwDirect3D11.hlsl
|
|
||||||
fxc /Od /Zi /T vs_4_0_level_9_1 /E LineRectCstColorVS /Fh $(IntDir)TwDirect3D11_LineRectCstColorVS.h TwDirect3D11.hlsl
|
|
||||||
fxc /Od /Zi /T ps_4_0_level_9_1 /E LineRectPS /Fh $(IntDir)TwDirect3D11_LineRectPS.h TwDirect3D11.hlsl
|
|
||||||
fxc /Od /Zi /T vs_4_0_level_9_1 /E TextVS /Fh $(IntDir)TwDirect3D11_TextVS.h TwDirect3D11.hlsl
|
|
||||||
fxc /Od /Zi /T vs_4_0_level_9_1 /E TextCstColorVS /Fh $(IntDir)TwDirect3D11_TextCstColorVS.h TwDirect3D11.hlsl
|
|
||||||
fxc /Od /Zi /T ps_4_0_level_9_1 /E TextPS /Fh $(IntDir)TwDirect3D11_TextPS.h TwDirect3D11.hlsl
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<Midl>
|
|
||||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<MkTypLibCompatible>true</MkTypLibCompatible>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<TypeLibraryName>$(OutDir)AntTweakBar.tlb</TypeLibraryName>
|
|
||||||
</Midl>
|
|
||||||
<ClCompile>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
||||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>TwPrecomp.h</PrecompiledHeaderFile>
|
|
||||||
<PrecompiledHeaderOutputFile>$(IntDir)AntTweakBar.pch</PrecompiledHeaderOutputFile>
|
|
||||||
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
|
|
||||||
<ObjectFileName>$(IntDir)</ObjectFileName>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
|
||||||
<CompileAs>Default</CompileAs>
|
|
||||||
</ClCompile>
|
|
||||||
<ResourceCompile>
|
|
||||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<Culture>0x0409</Culture>
|
|
||||||
<AdditionalIncludeDirectories>res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
</ResourceCompile>
|
|
||||||
<Link>
|
|
||||||
<OutputFile>$(OutDir)AntTweakBar.dll</OutputFile>
|
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
|
|
||||||
<RandomizedBaseAddress>false</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>
|
|
||||||
</DataExecutionPrevention>
|
|
||||||
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
|
|
||||||
</Link>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>mkdir "$(SolutionDir)$(Platform)/$(Configuration)"
|
|
||||||
xcopy /y /f "$(TargetPath)" "$(SolutionDir)$(Platform)/$(Configuration)"</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="LoadOGL.cpp" />
|
|
||||||
<ClCompile Include="LoadOGLCore.cpp" />
|
|
||||||
<ClCompile Include="TwBar.cpp" />
|
|
||||||
<ClCompile Include="TwColors.cpp" />
|
|
||||||
<ClCompile Include="TwDirect3D10.cpp" />
|
|
||||||
<ClCompile Include="TwDirect3D11.cpp" />
|
|
||||||
<ClCompile Include="TwDirect3D9.cpp" />
|
|
||||||
<ClCompile Include="TwEventGLFW.c">
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="TwEventGLUT.c">
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="TwEventSDL.c">
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="TwEventSDL12.c">
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="TwEventSDL13.c">
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="TwEventSFML.cpp">
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="TwEventWin.c">
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="TwFonts.cpp" />
|
|
||||||
<ClCompile Include="TwMgr.cpp" />
|
|
||||||
<ClCompile Include="TwOpenGL.cpp" />
|
|
||||||
<ClCompile Include="TwOpenGLCore.cpp">
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="TwPrecomp.cpp">
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<CustomBuild Include="TwDirect3D11.hlsl">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
|
||||||
</CustomBuild>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="..\include\AntTweakBar.h" />
|
|
||||||
<ClInclude Include="AntPerfTimer.h" />
|
|
||||||
<ClInclude Include="LoadOGL.h" />
|
|
||||||
<ClInclude Include="LoadOGLCore.h" />
|
|
||||||
<ClInclude Include="MiniGLFW.h" />
|
|
||||||
<ClInclude Include="MiniGLUT.h" />
|
|
||||||
<ClInclude Include="MiniSDL12.h" />
|
|
||||||
<ClInclude Include="MiniSDL13.h" />
|
|
||||||
<ClInclude Include="MiniSFML16.h" />
|
|
||||||
<ClInclude Include="resource.h" />
|
|
||||||
<ClInclude Include="TwBar.h" />
|
|
||||||
<ClInclude Include="TwColors.h" />
|
|
||||||
<ClInclude Include="TwDirect3D10.h" />
|
|
||||||
<ClInclude Include="TwDirect3D11.h" />
|
|
||||||
<ClInclude Include="TwDirect3D9.h" />
|
|
||||||
<ClInclude Include="TwFonts.h" />
|
|
||||||
<ClInclude Include="TwGraph.h" />
|
|
||||||
<ClInclude Include="TwMgr.h" />
|
|
||||||
<ClInclude Include="TwOpenGL.h" />
|
|
||||||
<ClInclude Include="TwOpenGLCore.h" />
|
|
||||||
<ClInclude Include="TwPrecomp.h" />
|
|
||||||
<ClInclude Include="res\TwXCursors.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ResourceCompile Include="AntTweakBar.rc" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="res\cur00000.cur" />
|
|
||||||
<None Include="res\cur00001.cur" />
|
|
||||||
<None Include="res\cur00002.cur" />
|
|
||||||
<None Include="res\cur00003.cur" />
|
|
||||||
<None Include="res\cur00004.cur" />
|
|
||||||
<None Include="res\cur00005.cur" />
|
|
||||||
<None Include="res\cur00006.cur" />
|
|
||||||
<None Include="res\cur00007.cur" />
|
|
||||||
<None Include="res\cur00008.cur" />
|
|
||||||
<None Include="res\cur00009.cur" />
|
|
||||||
<None Include="res\cur00010.cur" />
|
|
||||||
<None Include="res\cur00011.cur" />
|
|
||||||
<None Include="res\cur00012.cur" />
|
|
||||||
<None Include="res\cur00013.cur" />
|
|
||||||
<None Include="res\FontFixed1.pgm" />
|
|
||||||
<None Include="res\FontLargeAA.pgm" />
|
|
||||||
<None Include="res\FontNormal.pgm" />
|
|
||||||
<None Include="FontSmall.pgm" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Text Include="res\FontChars.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -5748,13 +5748,8 @@ int ANT_CALL TwKeyTest(int _Key, int _Modifiers)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201402L) || __cplusplus >= 201402L)
|
|
||||||
#include <functional>
|
|
||||||
|
|
||||||
struct StructCompare : public function<bool(TwType, TwType)>
|
|
||||||
#else
|
|
||||||
struct StructCompare : public binary_function<TwType, TwType, bool>
|
struct StructCompare : public binary_function<TwType, TwType, bool>
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
bool operator()(const TwType& _Left, const TwType& _Right) const
|
bool operator()(const TwType& _Left, const TwType& _Right) const
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,426 +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="Profile|Win32">
|
|
||||||
<Configuration>Profile</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Profile|x64">
|
|
||||||
<Configuration>Profile</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">
|
|
||||||
<ProjectName>DXUT</ProjectName>
|
|
||||||
<ProjectGuid>{85344B7F-5AA0-4e12-A065-D1333D11F6CA}</ProjectGuid>
|
|
||||||
<RootNamespace>DXUT</RootNamespace>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings" />
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|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|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)'=='Profile|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>
|
|
||||||
<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>
|
|
||||||
<PropertyGroup Label="UserMacros" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
<GenerateManifest>true</GenerateManifest>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
<OutDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DXUT</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
<GenerateManifest>true</GenerateManifest>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
<OutDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DXUT</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
<GenerateManifest>true</GenerateManifest>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
<OutDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DXUT</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
<GenerateManifest>true</GenerateManifest>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
<OutDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DXUT</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
<GenerateManifest>true</GenerateManifest>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
<OutDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DXUT</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
<GenerateManifest>true</GenerateManifest>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
<OutDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DXUT</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_2;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
|
||||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>DXUT.h</PrecompiledHeaderFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_2;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>DXUT.h</PrecompiledHeaderFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX64</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_2;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>DXUT.h</PrecompiledHeaderFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_2;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>DXUT.h</PrecompiledHeaderFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX64</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_2;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>DXUT.h</PrecompiledHeaderFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>..\..\DirectXTK\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_2;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>DXUT.h</PrecompiledHeaderFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX64</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup />
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="DXUT.cpp">
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<CLInclude Include="DXUT.h" />
|
|
||||||
<ClCompile Include="DXUTDevice11.cpp" />
|
|
||||||
<CLInclude Include="DXUTDevice11.h" />
|
|
||||||
<ClCompile Include="DXUTmisc.cpp" />
|
|
||||||
<CLInclude Include="DXUTmisc.h" />
|
|
||||||
<CLInclude Include="DXErr.h" />
|
|
||||||
<ClCompile Include="DXErr.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets" />
|
|
||||||
</Project>
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns:atg="http://atg.xbox.com" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<Filter Include="Resource Files">
|
|
||||||
<UniqueIdentifier>{8e114980-c1a3-4ada-ad7c-83caadf5daeb}</UniqueIdentifier>
|
|
||||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
|
|
||||||
</Filter>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup />
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="DXUT.cpp" />
|
|
||||||
<CLInclude Include="DXUT.h" />
|
|
||||||
<ClCompile Include="DXUTDevice11.cpp" />
|
|
||||||
<CLInclude Include="DXUTDevice11.h" />
|
|
||||||
<ClCompile Include="DXUTmisc.cpp" />
|
|
||||||
<CLInclude Include="DXUTmisc.h" />
|
|
||||||
<CLInclude Include="DXErr.h" />
|
|
||||||
<ClCompile Include="DXErr.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup></ItemGroup>
|
|
||||||
<ItemGroup></ItemGroup>
|
|
||||||
<ItemGroup></ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,433 +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="Profile|Win32">
|
|
||||||
<Configuration>Profile</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Profile|x64">
|
|
||||||
<Configuration>Profile</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">
|
|
||||||
<ProjectName>DXUTOpt</ProjectName>
|
|
||||||
<ProjectGuid>{61B333C2-C4F7-4cc1-A9BF-83F6D95588EB}</ProjectGuid>
|
|
||||||
<RootNamespace>DXUTOpt</RootNamespace>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings" />
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|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|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)'=='Profile|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>
|
|
||||||
<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>
|
|
||||||
<PropertyGroup Label="UserMacros" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
<GenerateManifest>true</GenerateManifest>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
<OutDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DXUTOpt</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
<GenerateManifest>true</GenerateManifest>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
<OutDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DXUTOpt</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
<GenerateManifest>true</GenerateManifest>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
<OutDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DXUTOpt</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
<GenerateManifest>true</GenerateManifest>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
<OutDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DXUTOpt</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
<GenerateManifest>true</GenerateManifest>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
<OutDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DXUTOpt</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
<GenerateManifest>true</GenerateManifest>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
<OutDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\DirectXTK_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DXUTOpt</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_2;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
|
||||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>DXUT.h</PrecompiledHeaderFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_2;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>DXUT.h</PrecompiledHeaderFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX64</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_2;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>DXUT.h</PrecompiledHeaderFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;USE_DIRECT3D11_2;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>DXUT.h</PrecompiledHeaderFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX64</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_2;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>DXUT.h</PrecompiledHeaderFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>..\..\DirectXTK\Inc;..\Core\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;USE_DIRECT3D11_2;USE_DIRECTXTK;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<PrecompiledHeaderFile>DXUT.h</PrecompiledHeaderFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX64</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup />
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="DXUTcamera.cpp" />
|
|
||||||
<CLInclude Include="DXUTcamera.h" />
|
|
||||||
<ClCompile Include="DXUTgui.cpp" />
|
|
||||||
<CLInclude Include="DXUTgui.h" />
|
|
||||||
<ClCompile Include="DXUTguiIME.cpp" />
|
|
||||||
<CLInclude Include="DXUTguiIME.h" />
|
|
||||||
<CLInclude Include="DXUTlockfreepipe.h" />
|
|
||||||
<ClCompile Include="DXUTres.cpp">
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<CLInclude Include="DXUTres.h" />
|
|
||||||
<ClCompile Include="DXUTsettingsdlg.cpp" />
|
|
||||||
<CLInclude Include="DXUTsettingsdlg.h" />
|
|
||||||
<ClCompile Include="ImeUi.cpp" />
|
|
||||||
<CLInclude Include="ImeUi.h" />
|
|
||||||
<ClCompile Include="SDKmisc.cpp" />
|
|
||||||
<CLInclude Include="SDKmisc.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets" />
|
|
||||||
</Project>
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns:atg="http://atg.xbox.com" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<Filter Include="Resource Files">
|
|
||||||
<UniqueIdentifier>{8e114980-c1a3-4ada-ad7c-83caadf5daeb}</UniqueIdentifier>
|
|
||||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
|
|
||||||
</Filter>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup />
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="DXUTcamera.cpp" />
|
|
||||||
<CLInclude Include="DXUTcamera.h" />
|
|
||||||
<ClCompile Include="DXUTgui.cpp" />
|
|
||||||
<CLInclude Include="DXUTgui.h" />
|
|
||||||
<ClCompile Include="DXUTguiIME.cpp" />
|
|
||||||
<CLInclude Include="DXUTguiIME.h" />
|
|
||||||
<CLInclude Include="DXUTlockfreepipe.h" />
|
|
||||||
<ClCompile Include="DXUTres.cpp" />
|
|
||||||
<CLInclude Include="DXUTres.h" />
|
|
||||||
<ClCompile Include="DXUTsettingsdlg.cpp" />
|
|
||||||
<CLInclude Include="DXUTsettingsdlg.h" />
|
|
||||||
<ClCompile Include="ImeUi.cpp" />
|
|
||||||
<CLInclude Include="ImeUi.h" />
|
|
||||||
<ClCompile Include="SDKmisc.cpp" />
|
|
||||||
<CLInclude Include="SDKmisc.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup></ItemGroup>
|
|
||||||
<ItemGroup></ItemGroup>
|
|
||||||
<ItemGroup></ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,601 +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="Inc\CommonStates.h" />
|
|
||||||
<ClInclude Include="Inc\DDSTextureLoader.h" />
|
|
||||||
<ClInclude Include="Inc\DirectXHelpers.h" />
|
|
||||||
<ClInclude Include="Inc\Effects.h" />
|
|
||||||
<ClInclude Include="Inc\GamePad.h" />
|
|
||||||
<ClInclude Include="Inc\GeometricPrimitive.h" />
|
|
||||||
<ClInclude Include="Inc\GraphicsMemory.h" />
|
|
||||||
<ClInclude Include="Inc\Keyboard.h" />
|
|
||||||
<ClInclude Include="Inc\Model.h" />
|
|
||||||
<ClInclude Include="Inc\Mouse.h" />
|
|
||||||
<ClInclude Include="Inc\PostProcess.h" />
|
|
||||||
<ClInclude Include="Inc\SimpleMath.h" />
|
|
||||||
<ClInclude Include="Inc\SimpleMath.inl" />
|
|
||||||
<ClInclude Include="Inc\ScreenGrab.h" />
|
|
||||||
<ClInclude Include="Inc\SpriteBatch.h" />
|
|
||||||
<ClInclude Include="Inc\PrimitiveBatch.h" />
|
|
||||||
<ClInclude Include="Inc\SpriteFont.h" />
|
|
||||||
<ClInclude Include="Inc\VertexTypes.h" />
|
|
||||||
<ClInclude Include="Inc\WICTextureLoader.h" />
|
|
||||||
<ClInclude Include="Src\AlignedNew.h" />
|
|
||||||
<ClInclude Include="Src\Bezier.h" />
|
|
||||||
<ClInclude Include="Src\ConstantBuffer.h" />
|
|
||||||
<ClInclude Include="Src\BinaryReader.h" />
|
|
||||||
<ClInclude Include="Src\DemandCreate.h" />
|
|
||||||
<ClInclude Include="Src\EffectCommon.h" />
|
|
||||||
<ClInclude Include="Src\Geometry.h" />
|
|
||||||
<ClInclude Include="Src\LoaderHelpers.h" />
|
|
||||||
<ClInclude Include="Src\pch.h" />
|
|
||||||
<ClInclude Include="Src\PlatformHelpers.h" />
|
|
||||||
<ClInclude Include="Src\SDKMesh.h" />
|
|
||||||
<ClInclude Include="Src\SharedResourcePool.h" />
|
|
||||||
<ClInclude Include="Src\DDS.h" />
|
|
||||||
<ClInclude Include="Src\vbo.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="Src\AlphaTestEffect.cpp" />
|
|
||||||
<ClCompile Include="Src\BasicEffect.cpp" />
|
|
||||||
<ClCompile Include="Src\BasicPostProcess.cpp" />
|
|
||||||
<ClCompile Include="Src\CommonStates.cpp" />
|
|
||||||
<ClCompile Include="Src\DDSTextureLoader.cpp" />
|
|
||||||
<ClCompile Include="Src\DGSLEffect.cpp" />
|
|
||||||
<ClCompile Include="Src\DGSLEffectFactory.cpp" />
|
|
||||||
<ClCompile Include="Src\DualPostProcess.cpp" />
|
|
||||||
<ClCompile Include="Src\DualTextureEffect.cpp" />
|
|
||||||
<ClCompile Include="Src\BinaryReader.cpp" />
|
|
||||||
<ClCompile Include="Src\EffectCommon.cpp" />
|
|
||||||
<ClCompile Include="Src\EffectFactory.cpp" />
|
|
||||||
<ClCompile Include="Src\EnvironmentMapEffect.cpp" />
|
|
||||||
<ClCompile Include="Src\GamePad.cpp" />
|
|
||||||
<ClCompile Include="Src\GeometricPrimitive.cpp" />
|
|
||||||
<ClCompile Include="Src\Geometry.cpp" />
|
|
||||||
<ClCompile Include="Src\GraphicsMemory.cpp" />
|
|
||||||
<ClCompile Include="Src\Keyboard.cpp" />
|
|
||||||
<ClCompile Include="Src\Model.cpp" />
|
|
||||||
<ClCompile Include="Src\ModelLoadCMO.cpp" />
|
|
||||||
<ClCompile Include="Src\ModelLoadSDKMESH.cpp" />
|
|
||||||
<ClCompile Include="Src\ModelLoadVBO.cpp" />
|
|
||||||
<ClCompile Include="Src\Mouse.cpp" />
|
|
||||||
<ClCompile Include="Src\NormalMapEffect.cpp" />
|
|
||||||
<ClCompile Include="Src\pch.cpp">
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="Src\ScreenGrab.cpp" />
|
|
||||||
<ClCompile Include="Src\SimpleMath.cpp" />
|
|
||||||
<ClCompile Include="Src\SkinnedEffect.cpp" />
|
|
||||||
<ClCompile Include="Src\SpriteBatch.cpp" />
|
|
||||||
<ClCompile Include="Src\PrimitiveBatch.cpp" />
|
|
||||||
<ClCompile Include="Src\SpriteFont.cpp" />
|
|
||||||
<ClCompile Include="Src\ToneMapPostProcess.cpp" />
|
|
||||||
<ClCompile Include="Src\VertexTypes.cpp" />
|
|
||||||
<ClCompile Include="Src\WICTextureLoader.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Readme.txt" />
|
|
||||||
<None Include="Src\Shaders\Common.fxh" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_PSAlphaTestEqNe.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_PSAlphaTestEqNe.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_PSAlphaTestEqNeNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_PSAlphaTestEqNeNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_PSAlphaTestLtGt.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_PSAlphaTestLtGt.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_PSAlphaTestLtGtNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_PSAlphaTestLtGtNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_VSAlphaTest.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_VSAlphaTest.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_VSAlphaTestNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_VSAlphaTestNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_VSAlphaTestVc.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_VSAlphaTestVc.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_VSAlphaTestVcNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\AlphaTestEffect_VSAlphaTestVcNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasic.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasic.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicPixelLighting.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicPixelLighting.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicPixelLightingTx.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicPixelLightingTx.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicTx.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicTx.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicTxNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicTxNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicVertexLighting.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicVertexLighting.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicVertexLightingNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicVertexLightingNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicVertexLightingTx.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicVertexLightingTx.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicVertexLightingTxNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_PSBasicVertexLightingTxNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasic.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasic.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLight.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLight.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLightBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLightBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLightTx.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLightTx.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLightTxBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLightTxBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLightTxVc.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLightTxVc.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLightTxVcBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLightTxVcBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLightVc.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLightVc.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLightVcBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicOneLightVcBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLighting.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLighting.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLightingBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLightingBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLightingTx.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLightingTx.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLightingTxBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLightingTxBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLightingTxVc.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLightingTxVc.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLightingTxVcBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLightingTxVcBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLightingVc.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLightingVc.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLightingVcBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicPixelLightingVcBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicTx.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicTx.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicTxNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicTxNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicTxVc.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicTxVc.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicTxVcNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicTxVcNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVc.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVc.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVcNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVcNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLighting.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLighting.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLightingBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLightingBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLightingTx.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLightingTx.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLightingTxBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLightingTxBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLightingTxVc.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLightingTxVc.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLightingTxVcBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLightingTxVcBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLightingVc.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLightingVc.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLightingVcBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\BasicEffect_VSBasicVertexLightingVcBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_main.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_main.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_main1Bones.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_main1Bones.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_main1BonesVc.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_main1BonesVc.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_main2Bones.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_main2Bones.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_main2BonesVc.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_main2BonesVc.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_main4Bones.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_main4Bones.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_main4BonesVc.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_main4BonesVc.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_mainVc.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLEffect_mainVc.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLLambert_main.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLLambert_main.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLLambert_mainTk.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLLambert_mainTk.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLLambert_mainTx.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLLambert_mainTx.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLLambert_mainTxTk.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLLambert_mainTxTk.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLPhong_main.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLPhong_main.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLPhong_mainTk.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLPhong_mainTk.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLPhong_mainTx.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLPhong_mainTx.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLPhong_mainTxTk.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLPhong_mainTxTk.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLUnlit_main.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLUnlit_main.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLUnlit_mainTk.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLUnlit_mainTk.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLUnlit_mainTx.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLUnlit_mainTx.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLUnlit_mainTxTk.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DGSLUnlit_mainTxTk.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DualTextureEffect_PSDualTexture.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DualTextureEffect_PSDualTexture.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DualTextureEffect_PSDualTextureNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DualTextureEffect_PSDualTextureNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DualTextureEffect_VSDualTexture.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DualTextureEffect_VSDualTexture.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DualTextureEffect_VSDualTextureNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DualTextureEffect_VSDualTextureNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DualTextureEffect_VSDualTextureVc.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DualTextureEffect_VSDualTextureVc.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DualTextureEffect_VSDualTextureVcNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\DualTextureEffect_VSDualTextureVcNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMap.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMap.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMapNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMapNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMapPixelLighting.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMapPixelLighting.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMapPixelLightingFresnel.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMapPixelLightingFresnelNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMapPixelLightingNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMapSpecular.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMapSpecular.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMapSpecularNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_PSEnvMapSpecularNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMap.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMap.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapFresnel.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapFresnel.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapFresnelBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapFresnelBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapOneLight.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapOneLight.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapOneLightBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapOneLightBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapOneLightFresnel.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapOneLightFresnel.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapOneLightFresnelBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapOneLightFresnelBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapPixelLighting.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapPixelLighting.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapPixelLightingBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\EnvironmentMapEffect_VSEnvMapPixelLightingBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_PSNormalPixelLightingTx.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_PSNormalPixelLightingTx.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_PSNormalPixelLightingTxNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_PSNormalPixelLightingTxNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_PSNormalPixelLightingTxNoFogSpec.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_PSNormalPixelLightingTxNoSpec.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_PSNormalPixelLightingTxNoSpec.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_VSNormalPixelLightingTx.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_VSNormalPixelLightingTx.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_VSNormalPixelLightingTxBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_VSNormalPixelLightingTxBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_VSNormalPixelLightingTxVc.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_VSNormalPixelLightingTxVc.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_VSNormalPixelLightingTxVcBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\NormalMapEffect_VSNormalPixelLightingTxVcBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSBloomBlur.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSBloomBlur.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSBloomCombine.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSBloomCombine.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSBloomExtract.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSBloomExtract.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSCopy.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSCopy.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSDownScale2x2.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSDownScale2x2.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSDownScale4x4.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSDownScale4x4.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSGaussianBlur5x5.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSGaussianBlur5x5.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSMerge.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSMerge.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSMonochrome.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSMonochrome.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSSepia.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_PSSepia.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_VSQuad.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\PostProcess_VSQuad.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_PSSkinnedPixelLighting.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_PSSkinnedPixelLighting.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_PSSkinnedVertexLighting.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_PSSkinnedVertexLighting.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_PSSkinnedVertexLightingNoFog.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_PSSkinnedVertexLightingNoFog.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedOneLightFourBones.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedOneLightFourBones.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedOneLightFourBonesBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedOneLightFourBonesBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedOneLightOneBone.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedOneLightOneBone.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedOneLightOneBoneBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedOneLightOneBoneBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedOneLightTwoBones.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedOneLightTwoBones.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedOneLightTwoBonesBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedOneLightTwoBonesBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedPixelLightingFourBones.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedPixelLightingFourBones.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedPixelLightingFourBonesBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedPixelLightingOneBone.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedPixelLightingOneBone.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedPixelLightingOneBoneBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedPixelLightingTwoBones.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedPixelLightingTwoBones.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedPixelLightingTwoBonesBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedVertexLightingFourBones.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedVertexLightingFourBones.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedVertexLightingFourBonesBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedVertexLightingOneBone.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedVertexLightingOneBone.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedVertexLightingOneBoneBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedVertexLightingTwoBones.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedVertexLightingTwoBones.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SpriteEffect_SpritePixelShader.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SpriteEffect_SpritePixelShader.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SpriteEffect_SpriteVertexShader.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\SpriteEffect_SpriteVertexShader.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSACESFilmic.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSACESFilmic.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSACESFilmic_SRGB.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSACESFilmic_SRGB.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSCopy.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSCopy.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSHDR10.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSHDR10.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSReinhard.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSReinhard.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSReinhard_SRGB.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSReinhard_SRGB.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSSaturate.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSSaturate.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSSaturate_SRGB.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PSSaturate_SRGB.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PS_SRGB.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_PS_SRGB.pdb" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_VSQuad.inc" />
|
|
||||||
<None Include="Src\Shaders\Compiled\ToneMap_VSQuad.pdb" />
|
|
||||||
<None Include="Src\Shaders\CompileShaders.cmd" />
|
|
||||||
<None Include="Src\Shaders\Lighting.fxh" />
|
|
||||||
<None Include="Src\Shaders\SpriteEffect.fx" />
|
|
||||||
<None Include="Src\Shaders\Structures.fxh" />
|
|
||||||
<None Include="Src\Shaders\Utilities.fxh" />
|
|
||||||
<None Include="Src\TeapotData.inc" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Src\Shaders\BasicEffect.fx">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Src\Shaders\AlphaTestEffect.fx">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</None>
|
|
||||||
<None Include="Src\Shaders\DualTextureEffect.fx">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</None>
|
|
||||||
<None Include="Src\Shaders\EnvironmentMapEffect.fx">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</None>
|
|
||||||
<None Include="Src\Shaders\SkinnedEffect.fx">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</None>
|
|
||||||
<None Include="Src\Shaders\DGSLEffect.fx">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</None>
|
|
||||||
<None Include="Src\Shaders\DGSLLambert.hlsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</None>
|
|
||||||
<None Include="Src\Shaders\DGSLPhong.hlsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</None>
|
|
||||||
<None Include="Src\Shaders\DGSLUnlit.hlsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Src\Shaders\NormalMapEffect.fx">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Src\Shaders\PostProcess.fx">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Src\Shaders\ToneMap.fx">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals" />
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>DirectXTK</RootNamespace>
|
|
||||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</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)'=='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|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|Win32'" 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'">
|
|
||||||
<OutDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DirectXTK</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<OutDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DirectXTK</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
<OutDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DirectXTK</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<OutDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>DirectXTK</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir)Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
|
|
||||||
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir)Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
|
|
||||||
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir)Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
|
|
||||||
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
|
||||||
<AdditionalIncludeDirectories>$(ProjectDir)Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
|
|
||||||
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
<Target Name="ATGEnsureShaders" BeforeTargets="PrepareForBuild">
|
|
||||||
<Exec Condition="!Exists('src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc')" WorkingDirectory="$(ProjectDir)src/Shaders" Command="CompileShaders" />
|
|
||||||
</Target>
|
|
||||||
</Project>
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,74 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
|
||||||
<ProductVersion>8.0.30703</ProductVersion>
|
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
|
||||||
<ProjectGuid>{7329B02D-C504-482A-A156-181D48CE493C}</ProjectGuid>
|
|
||||||
<OutputType>Exe</OutputType>
|
|
||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
|
||||||
<RootNamespace>MakeSpriteFont</RootNamespace>
|
|
||||||
<AssemblyName>MakeSpriteFont</AssemblyName>
|
|
||||||
<TargetFramework>net48</TargetFramework>
|
|
||||||
<FileAlignment>512</FileAlignment>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|Win32'">
|
|
||||||
<DebugSymbols>true</DebugSymbols>
|
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
||||||
<DebugType>full</DebugType>
|
|
||||||
<PlatformTarget>Win32</PlatformTarget>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|Win32'">
|
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
|
||||||
<DefineConstants>TRACE</DefineConstants>
|
|
||||||
<Optimize>true</Optimize>
|
|
||||||
<DebugType>pdbonly</DebugType>
|
|
||||||
<PlatformTarget>Win32</PlatformTarget>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
|
||||||
<DebugSymbols>true</DebugSymbols>
|
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
||||||
<DebugType>full</DebugType>
|
|
||||||
<PlatformTarget>x64</PlatformTarget>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
|
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
|
||||||
<DefineConstants>TRACE</DefineConstants>
|
|
||||||
<Optimize>true</Optimize>
|
|
||||||
<DebugType>pdbonly</DebugType>
|
|
||||||
<PlatformTarget>x64</PlatformTarget>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Compile Include="BitmapUtils.cs" />
|
|
||||||
<Compile Include="CharacterRegion.cs" />
|
|
||||||
<Compile Include="CommandLineParser.cs" />
|
|
||||||
<Compile Include="GlyphCropper.cs" />
|
|
||||||
<Compile Include="IFontImporter.cs" />
|
|
||||||
<Compile Include="SpriteFontWriter.cs" />
|
|
||||||
<Compile Include="TrueTypeImporter.cs" />
|
|
||||||
<Compile Include="BitmapImporter.cs" />
|
|
||||||
<Compile Include="GlyphPacker.cs" />
|
|
||||||
<Compile Include="CommandLineOptions.cs" />
|
|
||||||
<Compile Include="Program.cs" />
|
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
|
||||||
<Compile Include="Glyph.cs" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Reference Include="System" />
|
|
||||||
<Reference Include="System.Drawing" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
|
||||||
<Target Name="BeforeBuild">
|
|
||||||
</Target>
|
|
||||||
<Target Name="AfterBuild">
|
|
||||||
</Target>
|
|
||||||
-->
|
|
||||||
</Project>
|
|
||||||
@@ -1,419 +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="Profile|Win32">
|
|
||||||
<Configuration>Profile</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Profile|x64">
|
|
||||||
<Configuration>Profile</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">
|
|
||||||
<ProjectName>Effects11</ProjectName>
|
|
||||||
<ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid>
|
|
||||||
<RootNamespace>Effects11</RootNamespace>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings" />
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|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|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)'=='Profile|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>
|
|
||||||
<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>
|
|
||||||
<PropertyGroup Label="UserMacros" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<OutDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>Effects11d</TargetName>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
|
|
||||||
<OutDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>Effects11d</TargetName>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<OutDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>Effects11</TargetName>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
|
|
||||||
<OutDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>Effects11</TargetName>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
|
|
||||||
<OutDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>Effects11</TargetName>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
|
|
||||||
<OutDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>Effects11</TargetName>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
|
||||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX64</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX64</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
|
||||||
<OpenMPSupport>false</OpenMPSupport>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<FloatingPointModel>Fast</FloatingPointModel>
|
|
||||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
|
||||||
<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
||||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<LargeAddressAware>true</LargeAddressAware>
|
|
||||||
<RandomizedBaseAddress>true</RandomizedBaseAddress>
|
|
||||||
<DataExecutionPrevention>true</DataExecutionPrevention>
|
|
||||||
<TargetMachine>MachineX64</TargetMachine>
|
|
||||||
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
|
|
||||||
</Link>
|
|
||||||
<Manifest>
|
|
||||||
<EnableDPIAwareness>false</EnableDPIAwareness>
|
|
||||||
</Manifest>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
<PostBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup />
|
|
||||||
<ItemGroup>
|
|
||||||
<CLInclude Include="pchfx.h" />
|
|
||||||
<CLInclude Include=".\Inc\d3dx11effect.h" />
|
|
||||||
<CLInclude Include=".\Inc\d3dxglobal.h" />
|
|
||||||
<CLInclude Include=".\Binary\EffectBinaryFormat.h" />
|
|
||||||
<CLInclude Include=".\Binary\EffectStateBase11.h" />
|
|
||||||
<CLInclude Include=".\Binary\EffectStates11.h" />
|
|
||||||
<CLInclude Include=".\Binary\SOParser.h" />
|
|
||||||
<ClCompile Include="d3dxGlobal.cpp">
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader>
|
|
||||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">Create</PrecompiledHeader>
|
|
||||||
</ClCompile>
|
|
||||||
<CLInclude Include="Effect.h" />
|
|
||||||
<ClCompile Include="EffectAPI.cpp" />
|
|
||||||
<ClCompile Include="EffectLoad.cpp" />
|
|
||||||
<CLInclude Include="EffectLoad.h" />
|
|
||||||
<ClCompile Include="EffectNonRuntime.cpp" />
|
|
||||||
<ClCompile Include="EffectReflection.cpp" />
|
|
||||||
<ClCompile Include="EffectRuntime.cpp" />
|
|
||||||
<None Include="EffectVariable.inl" />
|
|
||||||
<CLInclude Include="IUnknownImp.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets" />
|
|
||||||
</Project>
|
|
||||||
@@ -1,280 +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>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{3CABED2C-12F1-4408-AAAE-E2185A426F35}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>Simulations</RootNamespace>
|
|
||||||
<ProjectName>Simulations</ProjectName>
|
|
||||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</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)'=='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|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|Win32'" 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|x64'">
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<TargetExt>.lib</TargetExt>
|
|
||||||
<IntDir>$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>$(ProjectName)</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<TargetExt>.lib</TargetExt>
|
|
||||||
<IntDir>$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>$(ProjectName)</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<TargetExt>.lib</TargetExt>
|
|
||||||
<IntDir>$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>$(ProjectName)</TargetName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<TargetExt>.lib</TargetExt>
|
|
||||||
<IntDir>$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
<TargetName>$(ProjectName)</TargetName>
|
|
||||||
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<PreprocessorDefinitions>WIN32;NOMINMAX;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)DirectXTK/Inc;$(SolutionDir)DXUT11/Core;$(SolutionDir)DXUT11/Optional;$(SolutionDir)Effects11/inc;$(SolutionDir)AntTweakBar/include</AdditionalIncludeDirectories>
|
|
||||||
<PrecompiledHeaderFile />
|
|
||||||
<PrecompiledHeaderOutputFile />
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<AdditionalDependencies>D3DCompiler.lib;Mf.lib;mfuuid.lib;Mfplat.lib;Mfreadwrite.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
<FxCompile>
|
|
||||||
<EntryPointName />
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderType>Effect</ShaderType>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderModel>5.0</ShaderModel>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ObjectFileOutput>$(OutDir)%(Filename).fxo</ObjectFileOutput>
|
|
||||||
</FxCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<PreprocessorDefinitions>WIN32;NOMINMAX;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)DirectXTK/Inc;$(SolutionDir)DXUT11/Core;$(SolutionDir)DXUT11/Optional;$(SolutionDir)Effects11/inc;$(SolutionDir)AntTweakBar/include</AdditionalIncludeDirectories>
|
|
||||||
<PrecompiledHeaderFile>
|
|
||||||
</PrecompiledHeaderFile>
|
|
||||||
<PrecompiledHeaderOutputFile>
|
|
||||||
</PrecompiledHeaderOutputFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<AdditionalDependencies>D3DCompiler.lib;Mf.lib;mfuuid.lib;Mfplat.lib;Mfreadwrite.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
<FxCompile>
|
|
||||||
<EntryPointName>
|
|
||||||
</EntryPointName>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderType>Effect</ShaderType>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderModel>5.0</ShaderModel>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ObjectFileOutput>$(OutDir)%(Filename).fxo</ObjectFileOutput>
|
|
||||||
</FxCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<PreprocessorDefinitions>WIN32;NOMINMAX;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)DirectXTK/Inc;$(SolutionDir)DXUT11/Core;$(SolutionDir)DXUT11/Optional;$(SolutionDir)Effects11/inc;$(SolutionDir)AntTweakBar/include</AdditionalIncludeDirectories>
|
|
||||||
<PrecompiledHeaderFile />
|
|
||||||
<PrecompiledHeaderOutputFile />
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<AdditionalDependencies>D3DCompiler.lib;Mf.lib;mfuuid.lib;Mfplat.lib;Mfreadwrite.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
<FxCompile>
|
|
||||||
<EntryPointName />
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderType>Effect</ShaderType>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderModel>5.0</ShaderModel>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ObjectFileOutput>$(OutDir)%(Filename).fxo</ObjectFileOutput>
|
|
||||||
</FxCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<PreprocessorDefinitions>WIN32;NOMINMAX;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)DirectXTK/Inc;$(SolutionDir)DXUT11/Core;$(SolutionDir)DXUT11/Optional;$(SolutionDir)Effects11/inc;$(SolutionDir)AntTweakBar/include</AdditionalIncludeDirectories>
|
|
||||||
<PrecompiledHeaderFile>
|
|
||||||
</PrecompiledHeaderFile>
|
|
||||||
<PrecompiledHeaderOutputFile>
|
|
||||||
</PrecompiledHeaderOutputFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<AdditionalDependencies>D3DCompiler.lib;Mf.lib;mfuuid.lib;Mfplat.lib;Mfreadwrite.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
<FxCompile>
|
|
||||||
<EntryPointName>
|
|
||||||
</EntryPointName>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderType>Effect</ShaderType>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderModel>5.0</ShaderModel>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ObjectFileOutput>$(OutDir)%(Filename).fxo</ObjectFileOutput>
|
|
||||||
</FxCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="MassSpringSystemSimulator.cpp" />
|
|
||||||
<ClCompile Include="TemplateSimulator.cpp" />
|
|
||||||
<ClCompile Include="util\FFmpeg.cpp" />
|
|
||||||
<ClCompile Include="util\util.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="DrawingUtilitiesClass.h" />
|
|
||||||
<ClInclude Include="MassPoint.h" />
|
|
||||||
<ClInclude Include="MassSpringSystemSimulator.h" />
|
|
||||||
<ClInclude Include="Simulator.h" />
|
|
||||||
<ClInclude Include="TemplateSimulator.h" />
|
|
||||||
<ClInclude Include="util\FFmpeg.h" />
|
|
||||||
<ClInclude Include="util\matrixbase.h" />
|
|
||||||
<ClInclude Include="util\quaternion.h" />
|
|
||||||
<ClInclude Include="util\timer.h" />
|
|
||||||
<ClInclude Include="util\util.h" />
|
|
||||||
<ClInclude Include="util\vectorbase.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<FxCompile Include="effect.fx">
|
|
||||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
</EntryPointName>
|
|
||||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
</EntryPointName>
|
|
||||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
</EntryPointName>
|
|
||||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
</EntryPointName>
|
|
||||||
</FxCompile>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Text Include="..\readme.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\AntTweakBar\src\AntTweakBar_2022.vcxproj">
|
|
||||||
<Project>{b99e1fa1-c30a-45f2-9d57-9e9c21b2df42}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\DirectXTK\DirectXTK_Desktop_2022.vcxproj">
|
|
||||||
<Project>{e0b52ae7-e160-4d32-bf3f-910b785e5a8e}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\DXUT11\Core\DXUT_DirectXTK_2022.vcxproj">
|
|
||||||
<Project>{85344b7f-5aa0-4e12-a065-d1333d11f6ca}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\DXUT11\Optional\DXUTOpt_DirectXTK_2022.vcxproj">
|
|
||||||
<Project>{61b333c2-c4f7-4cc1-a9bf-83f6d95588eb}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\Effects11\Effects11_2022.vcxproj">
|
|
||||||
<Project>{df460eab-570d-4b50-9089-2e2fc801bf38}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<FxCompile Include="effect.fx" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="MassSpringSystemSimulator.cpp" />
|
|
||||||
<ClCompile Include="TemplateSimulator.cpp" />
|
|
||||||
<ClCompile Include="util\FFmpeg.cpp" />
|
|
||||||
<ClCompile Include="util\util.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="DrawingUtilitiesClass.h" />
|
|
||||||
<ClInclude Include="MassSpringSystemSimulator.h" />
|
|
||||||
<ClInclude Include="Simulator.h" />
|
|
||||||
<ClInclude Include="TemplateSimulator.h" />
|
|
||||||
<ClInclude Include="util\FFmpeg.h" />
|
|
||||||
<ClInclude Include="util\matrixbase.h" />
|
|
||||||
<ClInclude Include="util\quaternion.h" />
|
|
||||||
<ClInclude Include="util\timer.h" />
|
|
||||||
<ClInclude Include="util\util.h" />
|
|
||||||
<ClInclude Include="util\vectorbase.h" />
|
|
||||||
<ClInclude Include="MassPoint.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Text Include="..\readme.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
#include "util/vectorbase.h"
|
|
||||||
|
|
||||||
struct MassPoint {
|
|
||||||
GamePhysics::Vec3 position;
|
|
||||||
GamePhysics::Vec3 velocity;
|
|
||||||
bool isFixed;
|
|
||||||
};
|
|
||||||
@@ -1,318 +0,0 @@
|
|||||||
#include "MassSpringSystemSimulator.h"
|
|
||||||
|
|
||||||
MassSpringSystemSimulator::MassSpringSystemSimulator()
|
|
||||||
{
|
|
||||||
m_iTestCase = 0;
|
|
||||||
m_fMass = 10;
|
|
||||||
m_fStiffness = 40;
|
|
||||||
int m_iIntegrater = 0;
|
|
||||||
|
|
||||||
auto first = addMassPoint(Vec3(0, 0, 0), Vec3(-1, 0, 0), true);
|
|
||||||
auto second = addMassPoint(Vec3(0, 2, 0), Vec3(1, 0, 0), true);
|
|
||||||
addSpring(first, second, 1.0);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
const char* MassSpringSystemSimulator::getTestCasesStr()
|
|
||||||
{
|
|
||||||
//hier to change the choices
|
|
||||||
return "Euler,LeapFrog,Midpoint";
|
|
||||||
}
|
|
||||||
|
|
||||||
void MassSpringSystemSimulator::initUI(DrawingUtilitiesClass* DUC)
|
|
||||||
{
|
|
||||||
this->DUC = DUC;
|
|
||||||
switch (m_iTestCase)
|
|
||||||
{
|
|
||||||
case 0:break;
|
|
||||||
case 1:
|
|
||||||
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
break;
|
|
||||||
default:break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void MassSpringSystemSimulator::reset()
|
|
||||||
{
|
|
||||||
m_mouse.x = m_mouse.y = 0;
|
|
||||||
m_trackmouse.x = m_trackmouse.y = 0;
|
|
||||||
m_oldtrackmouse.x = m_oldtrackmouse.y = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void MassSpringSystemSimulator::drawFrame(ID3D11DeviceContext* pd3dImmediateContext)
|
|
||||||
{
|
|
||||||
|
|
||||||
for (size_t i = 0; i < springs.size(); i++) {
|
|
||||||
auto sp = springs.at(i);
|
|
||||||
if (!sp.isValid())
|
|
||||||
{
|
|
||||||
springs.erase(springs.begin() + i);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
auto mp1 = sp.mp1.lock();
|
|
||||||
auto mp2 = sp.mp2.lock();
|
|
||||||
DUC->setUpLighting(Vec3(), 0.4 * Vec3(1, 1, 1), 100, 0.6 * Vec3(0.97, 0.86, 1));
|
|
||||||
|
|
||||||
DUC->drawSphere(mp1->position, Vec3(0.01));
|
|
||||||
DUC->drawSphere(mp2->position, Vec3(0.01));
|
|
||||||
|
|
||||||
DUC->beginLine();
|
|
||||||
DUC->drawLine(mp1->position, Vec3(1,0,0), mp2->position, Vec3(0,1,0));
|
|
||||||
DUC->endLine();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void MassSpringSystemSimulator::notifyCaseChanged(int testCase)
|
|
||||||
{
|
|
||||||
m_iTestCase = testCase;
|
|
||||||
switch (m_iTestCase)
|
|
||||||
{
|
|
||||||
case 0:
|
|
||||||
cout << "Euler !\n";
|
|
||||||
|
|
||||||
//simulateTimestep(1);
|
|
||||||
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
cout << "Midpoint \n";
|
|
||||||
//m_iNumSpheres = 100;
|
|
||||||
//m_fSphereSize = 0.05f;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
//cout << "Demo4 !\n";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void MassSpringSystemSimulator::externalForcesCalculations(float timeElapsed)
|
|
||||||
{
|
|
||||||
Point2D mouseDiff;
|
|
||||||
mouseDiff.x = m_trackmouse.x - m_oldtrackmouse.x;
|
|
||||||
mouseDiff.y = m_trackmouse.y - m_oldtrackmouse.y;
|
|
||||||
if (mouseDiff.x != 0 || mouseDiff.y != 0)
|
|
||||||
{
|
|
||||||
Mat4 worldViewInv = Mat4(DUC->g_camera.GetWorldMatrix() * DUC->g_camera.GetViewMatrix());
|
|
||||||
worldViewInv = worldViewInv.inverse();
|
|
||||||
Vec3 inputView = Vec3((float)mouseDiff.x, (float)-mouseDiff.y, 0);
|
|
||||||
Vec3 inputWorld = worldViewInv.transformVectorNormal(inputView);
|
|
||||||
// find a proper scale!
|
|
||||||
float inputScale = 0.001f;
|
|
||||||
inputWorld = inputWorld * inputScale;
|
|
||||||
|
|
||||||
//m_vfMovableObjectPos = m_vfMovableObjectFinalPos + inputWorld;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
//m_vfMovableObjectFinalPos = m_vfMovableObjectPos;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void MassSpringSystemSimulator::simulateTimestep(float timeStep)
|
|
||||||
{
|
|
||||||
//update current setup for each frame
|
|
||||||
switch (m_iTestCase) {
|
|
||||||
case 0:
|
|
||||||
//update the masspoint
|
|
||||||
cout << "Euler \n";
|
|
||||||
Euler(0, 1, 0, timeStep);
|
|
||||||
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 2:cout << "midpoint \n";
|
|
||||||
Midpoint(0, 1, timeStep);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default: break;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Euler(0, 1, 0, timeStep);
|
|
||||||
}
|
|
||||||
|
|
||||||
void MassSpringSystemSimulator::onClick(int x, int y)
|
|
||||||
{
|
|
||||||
m_trackmouse.x = x;
|
|
||||||
m_trackmouse.y = y;
|
|
||||||
}
|
|
||||||
|
|
||||||
void MassSpringSystemSimulator::onMouse(int x, int y)
|
|
||||||
{
|
|
||||||
m_oldtrackmouse.x = x;
|
|
||||||
m_oldtrackmouse.y = y;
|
|
||||||
m_trackmouse.x = x;
|
|
||||||
m_trackmouse.y = y;
|
|
||||||
}
|
|
||||||
|
|
||||||
void MassSpringSystemSimulator::setMass(float mass)
|
|
||||||
{
|
|
||||||
m_fMass = mass;
|
|
||||||
}
|
|
||||||
|
|
||||||
void MassSpringSystemSimulator::setStiffness(float stiffness)
|
|
||||||
{
|
|
||||||
m_fStiffness = stiffness;
|
|
||||||
}
|
|
||||||
|
|
||||||
void MassSpringSystemSimulator::setDampingFactor(float damping)
|
|
||||||
{
|
|
||||||
m_fDamping = damping;
|
|
||||||
}
|
|
||||||
|
|
||||||
int MassSpringSystemSimulator::addMassPoint(Vec3 position, Vec3 Velocity, bool isFixed)
|
|
||||||
{
|
|
||||||
MassPoint masspoint;
|
|
||||||
masspoint.position = position;
|
|
||||||
masspoint.velocity = Velocity;
|
|
||||||
masspoint.isFixed = isFixed;
|
|
||||||
masspoints.push_back(std::make_shared<MassPoint>(masspoint));
|
|
||||||
|
|
||||||
return masspoints.size() - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void MassSpringSystemSimulator::addSpring(int masspoint1, int masspoint2, float initialLength)
|
|
||||||
{
|
|
||||||
auto mp1 = masspoints.at(masspoint1);
|
|
||||||
auto mp2 = masspoints.at(masspoint2);
|
|
||||||
|
|
||||||
Spring spring;
|
|
||||||
spring.mp1 = mp1;
|
|
||||||
spring.mp2 = mp2;
|
|
||||||
spring.initialLength = initialLength;
|
|
||||||
|
|
||||||
springs.push_back(spring);
|
|
||||||
}
|
|
||||||
|
|
||||||
int MassSpringSystemSimulator::getNumberOfMassPoints()
|
|
||||||
{
|
|
||||||
return masspoints.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
int MassSpringSystemSimulator::getNumberOfSprings()
|
|
||||||
{
|
|
||||||
return springs.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
Vec3 MassSpringSystemSimulator::getPositionOfMassPoint(int index)
|
|
||||||
{
|
|
||||||
auto mp = masspoints.at(index);
|
|
||||||
return mp->position;
|
|
||||||
}
|
|
||||||
|
|
||||||
Vec3 MassSpringSystemSimulator::getVelocityOfMassPoint(int index)
|
|
||||||
{
|
|
||||||
auto mp = masspoints.at(index);
|
|
||||||
return mp->velocity;
|
|
||||||
}
|
|
||||||
|
|
||||||
void MassSpringSystemSimulator::applyExternalForce(Vec3 force)
|
|
||||||
{
|
|
||||||
//eine Vorstellung: for all Masspoints, update force
|
|
||||||
}
|
|
||||||
|
|
||||||
int MassSpringSystemSimulator::LengthCalculator(Vec3 position1, Vec3 position2) {
|
|
||||||
|
|
||||||
Vec3 PosVector = position1 - position2;
|
|
||||||
//wurzel aus Vektor
|
|
||||||
int length = sqrt(pow(PosVector.x, 2) + pow(PosVector.y, 2) + pow(PosVector.z, 2));
|
|
||||||
|
|
||||||
return length;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Vec3 MassSpringSystemSimulator::calculatePositionTimestepEuler(Vec3 oldPosition, float timestep, Vec3 velocity)
|
|
||||||
{
|
|
||||||
return oldPosition + timestep * velocity;
|
|
||||||
}
|
|
||||||
|
|
||||||
Vec3 MassSpringSystemSimulator::calculateVelocityTimestepEuler(Vec3 oldVelocity, float timestep, Vec3 acceleration)
|
|
||||||
{
|
|
||||||
return oldVelocity + acceleration * timestep;
|
|
||||||
}
|
|
||||||
|
|
||||||
Vec3 MassSpringSystemSimulator::calculateAcceleration(Vec3 force, float mass)
|
|
||||||
{
|
|
||||||
return force / mass;
|
|
||||||
}
|
|
||||||
|
|
||||||
void MassSpringSystemSimulator::Midpoint(int index1, int index2, float timestep) {
|
|
||||||
//here some implementation about Midpoint
|
|
||||||
auto massPoint1 = masspoints.at(index1);
|
|
||||||
auto massPoint2 = masspoints.at(index2);
|
|
||||||
//old position
|
|
||||||
auto mp = massPoint1->position;
|
|
||||||
auto mp2 = massPoint2 ->position;
|
|
||||||
//old Velocity
|
|
||||||
auto mOld_v = massPoint1->velocity;
|
|
||||||
auto m2Old_v = massPoint1->velocity;
|
|
||||||
|
|
||||||
Vec3 PosVector = mp - mp2;
|
|
||||||
//Abstand ausrechnen
|
|
||||||
int d = LengthCalculator(mp, mp2);
|
|
||||||
//normalize
|
|
||||||
Vec3 PosNorm1 = PosVector / d;
|
|
||||||
Vec3 PosNorm2 = -1 * PosNorm1;
|
|
||||||
|
|
||||||
Vec3 Force = -m_fStiffness * (d - springs.at(0).initialLength) * PosNorm1;
|
|
||||||
Vec3 Force2 = -1 * Force;
|
|
||||||
|
|
||||||
Vec3 oldAcc = calculateAcceleration(Force,m_fMass);
|
|
||||||
Vec3 oldAcc2 = calculateAcceleration(Force2, m_fMass);
|
|
||||||
|
|
||||||
//Midpoint calculator
|
|
||||||
//Pos of Midstep
|
|
||||||
Vec3 PosOfMidstep = mp + 0.5 * timestep * mOld_v;
|
|
||||||
Vec3 PosOfMidstep2 = mp2 + 0.5 * timestep * m2Old_v;
|
|
||||||
//Vel at Midstep
|
|
||||||
Vec3 VelAtMidstep = mOld_v + 0.5 * timestep * oldAcc;
|
|
||||||
Vec3 VelAtMidstep2 = m2Old_v + 0.5 * timestep * oldAcc2;
|
|
||||||
|
|
||||||
Vec3 NewPos = mp + timestep * VelAtMidstep;
|
|
||||||
Vec3 NewPos2 = mp2 + timestep * VelAtMidstep2;
|
|
||||||
|
|
||||||
Vec3 NewVel = mOld_v + timestep * oldAcc;
|
|
||||||
Vec3 NewVel2 = m2Old_v + timestep * oldAcc2;
|
|
||||||
|
|
||||||
cout << NewPos;
|
|
||||||
cout << NewVel;
|
|
||||||
massPoint1->position = NewPos;
|
|
||||||
massPoint1->velocity = NewVel;
|
|
||||||
massPoint2->position = NewPos2;
|
|
||||||
massPoint2->velocity = NewVel2;
|
|
||||||
}
|
|
||||||
|
|
||||||
void MassSpringSystemSimulator::Euler(int index1, int index2, int indexSpring, float timestep)
|
|
||||||
{
|
|
||||||
//take old position and send to calculatePositionTimestepEuler
|
|
||||||
auto mp = masspoints.at(index1);
|
|
||||||
auto mp2 = masspoints.at(index2);
|
|
||||||
Vec3 PosVector = mp->position - mp2->position;
|
|
||||||
auto lengthVector = sqrt(PosVector.x * PosVector.x + PosVector.y * PosVector.y + PosVector.z * PosVector.z);
|
|
||||||
auto normalized = PosVector / lengthVector;
|
|
||||||
|
|
||||||
// Actual Calculation
|
|
||||||
// Force of spring is -k * (l - L) * normalizedVector [for P2 we can take -F1)
|
|
||||||
auto force = -m_fStiffness * (lengthVector - springs.at(0).initialLength) * normalized;
|
|
||||||
auto foreP2 = -1 * force;
|
|
||||||
auto veloc = calculateVelocityTimestepEuler(mp->velocity, timestep, calculateAcceleration(force, 10.));
|
|
||||||
auto pos = calculatePositionTimestepEuler(mp->position, timestep, veloc);
|
|
||||||
|
|
||||||
auto veloc2 = calculateVelocityTimestepEuler(mp2->velocity, timestep, calculateAcceleration(foreP2, 10.));
|
|
||||||
auto pos2 = calculatePositionTimestepEuler(mp2->position, timestep, veloc2);
|
|
||||||
|
|
||||||
// Update Positions and Velocity
|
|
||||||
mp->position = pos;
|
|
||||||
mp->velocity = veloc;
|
|
||||||
mp2->position = pos2;
|
|
||||||
mp2->velocity = veloc2;
|
|
||||||
}
|
|
||||||
@@ -1,8 +1,6 @@
|
|||||||
#ifndef MASSSPRINGSYSTEMSIMULATOR_h
|
#ifndef MASSSPRINGSYSTEMSIMULATOR_h
|
||||||
#define MASSSPRINGSYSTEMSIMULATOR_h
|
#define MASSSPRINGSYSTEMSIMULATOR_h
|
||||||
#include "Simulator.h"
|
#include "Simulator.h"
|
||||||
#include "MassPoint.h"
|
|
||||||
#include "Spring.h"
|
|
||||||
|
|
||||||
// Do Not Change
|
// Do Not Change
|
||||||
#define EULER 0
|
#define EULER 0
|
||||||
@@ -39,16 +37,6 @@ public:
|
|||||||
Vec3 getVelocityOfMassPoint(int index);
|
Vec3 getVelocityOfMassPoint(int index);
|
||||||
void applyExternalForce(Vec3 force);
|
void applyExternalForce(Vec3 force);
|
||||||
|
|
||||||
void Midpoint(Spring& spring, float timestep);
|
|
||||||
int LengthCalculator(Vec3 position1, Vec3 position2);
|
|
||||||
|
|
||||||
Vec3 calculatePositionTimestepEuler(Vec3 oldPosition, float timestep, Vec3 veloctiy);
|
|
||||||
Vec3 calculateVelocityTimestepEuler(Vec3 oldVelocity, float timestep, Vec3 acceleration);
|
|
||||||
Vec3 calculateAcceleration(Vec3 acceleration, float mass);
|
|
||||||
void Euler(Spring& spring, float timestep);
|
|
||||||
|
|
||||||
void printSpring(const Spring& spring);
|
|
||||||
|
|
||||||
// Do Not Change
|
// Do Not Change
|
||||||
void setIntegrator(int integrator) {
|
void setIntegrator(int integrator) {
|
||||||
m_iIntegrator = integrator;
|
m_iIntegrator = integrator;
|
||||||
@@ -66,9 +54,5 @@ private:
|
|||||||
Point2D m_mouse;
|
Point2D m_mouse;
|
||||||
Point2D m_trackmouse;
|
Point2D m_trackmouse;
|
||||||
Point2D m_oldtrackmouse;
|
Point2D m_oldtrackmouse;
|
||||||
|
|
||||||
//Mass points and springs
|
|
||||||
std::vector<std::shared_ptr<MassPoint>> masspoints;
|
|
||||||
std::vector<Spring> springs;
|
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
46
Simulations/RigidBodySystemSimulator.h
Normal file
46
Simulations/RigidBodySystemSimulator.h
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
#ifndef RIGIDBODYSYSTEMSIMULATOR_h
|
||||||
|
#define RIGIDBODYSYSTEMSIMULATOR_h
|
||||||
|
#include "Simulator.h"
|
||||||
|
//add your header for your rigid body system, for e.g.,
|
||||||
|
//#include "rigidBodySystem.h"
|
||||||
|
|
||||||
|
#define TESTCASEUSEDTORUNTEST 2
|
||||||
|
|
||||||
|
class RigidBodySystemSimulator:public Simulator{
|
||||||
|
public:
|
||||||
|
// Construtors
|
||||||
|
RigidBodySystemSimulator();
|
||||||
|
|
||||||
|
// Functions
|
||||||
|
const char * getTestCasesStr();
|
||||||
|
void initUI(DrawingUtilitiesClass * DUC);
|
||||||
|
void reset();
|
||||||
|
void drawFrame(ID3D11DeviceContext* pd3dImmediateContext);
|
||||||
|
void notifyCaseChanged(int testCase);
|
||||||
|
void externalForcesCalculations(float timeElapsed);
|
||||||
|
void simulateTimestep(float timeStep);
|
||||||
|
void onClick(int x, int y);
|
||||||
|
void onMouse(int x, int y);
|
||||||
|
|
||||||
|
// ExtraFunctions
|
||||||
|
int getNumberOfRigidBodies();
|
||||||
|
Vec3 getPositionOfRigidBody(int i);
|
||||||
|
Vec3 getLinearVelocityOfRigidBody(int i);
|
||||||
|
Vec3 getAngularVelocityOfRigidBody(int i);
|
||||||
|
void applyForceOnBody(int i, Vec3 loc, Vec3 force);
|
||||||
|
void addRigidBody(Vec3 position, Vec3 size, int mass);
|
||||||
|
void setOrientationOf(int i,Quat orientation);
|
||||||
|
void setVelocityOf(int i, Vec3 velocity);
|
||||||
|
|
||||||
|
private:
|
||||||
|
// Attributes
|
||||||
|
// add your RigidBodySystem data members, for e.g.,
|
||||||
|
// RigidBodySystem * m_pRigidBodySystem;
|
||||||
|
Vec3 m_externalForce;
|
||||||
|
|
||||||
|
// UI Attributes
|
||||||
|
Point2D m_mouse;
|
||||||
|
Point2D m_trackmouse;
|
||||||
|
Point2D m_oldtrackmouse;
|
||||||
|
};
|
||||||
|
#endif
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
struct Spring
|
|
||||||
{
|
|
||||||
std::weak_ptr<MassPoint> mp1;
|
|
||||||
std::weak_ptr<MassPoint> mp2;
|
|
||||||
float initialLength;
|
|
||||||
|
|
||||||
bool isValid() { return !mp1.expired() && !mp2.expired(); }
|
|
||||||
};
|
|
||||||
|
|
||||||
477
Simulations/collisionDetect.h
Normal file
477
Simulations/collisionDetect.h
Normal file
@@ -0,0 +1,477 @@
|
|||||||
|
// header file:
|
||||||
|
#include <DirectXMath.h>
|
||||||
|
#include <Vector>
|
||||||
|
using namespace DirectX;
|
||||||
|
|
||||||
|
// the return structure, with these values, you should be able to calculate the impulse
|
||||||
|
// the depth shouldn't be used in your impulse calculation, it is a redundant value
|
||||||
|
// if the normalWorld == XMVectorZero(), no collision
|
||||||
|
struct CollisionInfo{
|
||||||
|
bool isValid; // whether there is a collision point, true for yes
|
||||||
|
GamePhysics::Vec3 collisionPointWorld; // the position of the collision point in world space
|
||||||
|
GamePhysics::Vec3 normalWorld; // the direction of the impulse to A, negative of the collision face of A
|
||||||
|
float depth; // the distance of the collision point to the surface, not necessary.
|
||||||
|
};
|
||||||
|
|
||||||
|
// tool data structures/functions called by the collision detection method, you can ignore the details here
|
||||||
|
namespace collisionTools{
|
||||||
|
struct Projection{
|
||||||
|
float min, max;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
inline std::vector<XMVECTOR> discritizeObject(const XMMATRIX& obj2World)
|
||||||
|
{
|
||||||
|
const XMVECTOR centerWorld = XMVector3Transform(XMVectorZero(), obj2World);
|
||||||
|
XMVECTOR edges[3];
|
||||||
|
std::vector<XMVECTOR> results;
|
||||||
|
for (int precession = 0.1; precession <= 0.5; precession += 0.1)
|
||||||
|
{
|
||||||
|
for (size_t i = 0; i < 3; ++i)
|
||||||
|
edges[i] = XMVector3TransformNormal(XMVectorSetByIndex(XMVectorZero(), precession, i), obj2World);
|
||||||
|
results.push_back(centerWorld - edges[0] - edges[1] - edges[2]);
|
||||||
|
results.push_back(centerWorld + edges[0] - edges[1] - edges[2]);
|
||||||
|
results.push_back(centerWorld - edges[0] + edges[1] - edges[2]);
|
||||||
|
results.push_back(centerWorld + edges[0] + edges[1] - edges[2]);
|
||||||
|
results.push_back(centerWorld - edges[0] - edges[1] + edges[2]);
|
||||||
|
results.push_back(centerWorld + edges[0] - edges[1] + edges[2]);
|
||||||
|
results.push_back(centerWorld - edges[0] + edges[1] + edges[2]);
|
||||||
|
results.push_back(centerWorld + edges[0] + edges[1] + edges[2]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline XMVECTOR getVectorConnnectingCenters(const XMMATRIX& obj2World_A, const XMMATRIX& obj2World_B)
|
||||||
|
{
|
||||||
|
const XMVECTOR centerWorld_A = XMVector3Transform(XMVectorZero(), obj2World_A);
|
||||||
|
const XMVECTOR centerWorld_B = XMVector3Transform(XMVectorZero(), obj2World_B);
|
||||||
|
return centerWorld_B - centerWorld_A;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get Corners
|
||||||
|
inline std::vector<XMVECTOR> getCorners(const XMMATRIX& obj2World)
|
||||||
|
{
|
||||||
|
const XMVECTOR centerWorld = XMVector3Transform(XMVectorZero(), obj2World);
|
||||||
|
XMVECTOR edges[3];
|
||||||
|
for (size_t i = 0; i < 3; ++i)
|
||||||
|
edges[i] = XMVector3TransformNormal(XMVectorSetByIndex(XMVectorZero(), 0.5f, i), obj2World);
|
||||||
|
std::vector<XMVECTOR> results;
|
||||||
|
results.push_back(centerWorld - edges[0] - edges[1] - edges[2]);
|
||||||
|
results.push_back(centerWorld + edges[0] - edges[1] - edges[2]);
|
||||||
|
results.push_back(centerWorld - edges[0] + edges[1] - edges[2]);
|
||||||
|
results.push_back(centerWorld + edges[0] + edges[1] - edges[2]); // this +,+,-
|
||||||
|
results.push_back(centerWorld - edges[0] - edges[1] + edges[2]);
|
||||||
|
results.push_back(centerWorld + edges[0] - edges[1] + edges[2]); //this +,-,+
|
||||||
|
results.push_back(centerWorld - edges[0] + edges[1] + edges[2]); //this -,+,+
|
||||||
|
results.push_back(centerWorld + edges[0] + edges[1] + edges[2]);//this +,+,+
|
||||||
|
return results;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get Rigid Box Size
|
||||||
|
inline XMVECTOR getBoxSize(const XMMATRIX& obj2World)
|
||||||
|
{
|
||||||
|
XMVECTOR size = XMVectorZero();
|
||||||
|
XMVECTOR edges[3];
|
||||||
|
for (size_t i = 0; i < 3; ++i){
|
||||||
|
edges[i] = XMVector3TransformNormal(XMVectorSetByIndex(XMVectorZero(), 0.5f, i), obj2World);
|
||||||
|
XMVECTOR length = XMVector3Length(edges[i]);
|
||||||
|
|
||||||
|
size = XMVectorSetByIndex(size, 2.0f*XMVectorGetByIndex(length, 0), i);
|
||||||
|
}
|
||||||
|
return size;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get important Edges
|
||||||
|
inline std::vector<XMVECTOR> getImportantEdges(const XMMATRIX& obj2World)
|
||||||
|
{
|
||||||
|
XMVECTOR xaxis = XMVectorSet(1, 0, 0, 1);
|
||||||
|
XMVECTOR yaxis = XMVectorSet(0, 1, 0, 1);
|
||||||
|
XMVECTOR zaxis = XMVectorSet(0, 0, 1, 1);
|
||||||
|
XMVECTOR edge1 = XMVector3TransformNormal(xaxis, obj2World);
|
||||||
|
XMVECTOR edge2 = XMVector3TransformNormal(yaxis, obj2World);
|
||||||
|
XMVECTOR edge3 = XMVector3TransformNormal(zaxis, obj2World);
|
||||||
|
std::vector<XMVECTOR> results;
|
||||||
|
results.push_back(edge1);
|
||||||
|
results.push_back(edge2);
|
||||||
|
results.push_back(edge3);
|
||||||
|
return results;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the Normal to the faces
|
||||||
|
inline std::vector<XMVECTOR> getAxisNormalToFaces(const XMMATRIX& obj2World)
|
||||||
|
{
|
||||||
|
std::vector<XMVECTOR> edges;
|
||||||
|
XMVECTOR xaxis = XMVectorSet(1, 0, 0, 1);
|
||||||
|
XMVECTOR yaxis = XMVectorSet(0, 1, 0, 1);
|
||||||
|
XMVECTOR zaxis = XMVectorSet(0, 0, 1, 1);
|
||||||
|
XMVECTOR edge1 = XMVector3Normalize(XMVector3TransformNormal(xaxis, obj2World));
|
||||||
|
XMVECTOR edge2 = XMVector3Normalize(XMVector3TransformNormal(yaxis, obj2World));
|
||||||
|
XMVECTOR edge3 = XMVector3Normalize(XMVector3TransformNormal(zaxis, obj2World));
|
||||||
|
std::vector<XMVECTOR> results;
|
||||||
|
edges.push_back(edge1);
|
||||||
|
edges.push_back(edge2);
|
||||||
|
edges.push_back(edge3);
|
||||||
|
return edges;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Get the pair of edges
|
||||||
|
inline std::vector<XMVECTOR> getPairOfEdges(const XMMATRIX& obj2World_A, const XMMATRIX& obj2World_B)
|
||||||
|
{
|
||||||
|
std::vector<XMVECTOR> edges1 = getAxisNormalToFaces(obj2World_A);
|
||||||
|
std::vector<XMVECTOR> edges2 = getAxisNormalToFaces(obj2World_B);
|
||||||
|
|
||||||
|
std::vector<XMVECTOR> results;
|
||||||
|
for (int i = 0; i < edges1.size(); i++)
|
||||||
|
{
|
||||||
|
for (int j = 0; j<edges2.size(); j++)
|
||||||
|
{
|
||||||
|
XMVECTOR vector = XMVector3Cross(edges1[i], edges2[j]);
|
||||||
|
if (XMVectorGetX(XMVector3Length(vector)) > 0)
|
||||||
|
results.push_back(XMVector3Normalize(vector));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return results;
|
||||||
|
}
|
||||||
|
|
||||||
|
// project a shape on an axis
|
||||||
|
inline Projection project(const XMMATRIX& obj2World, XMVECTOR axis)
|
||||||
|
{
|
||||||
|
// Get corners
|
||||||
|
std::vector<XMVECTOR> cornersWorld = getCorners(obj2World);
|
||||||
|
float min = XMVectorGetX(XMVector3Dot(cornersWorld[0], axis));
|
||||||
|
float max = min;
|
||||||
|
for (int i = 1; i < cornersWorld.size(); i++)
|
||||||
|
{
|
||||||
|
float p = XMVectorGetX(XMVector3Dot(cornersWorld[i], axis));
|
||||||
|
if (p < min) {
|
||||||
|
min = p;
|
||||||
|
}
|
||||||
|
else if (p > max) {
|
||||||
|
max = p;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Projection projection;
|
||||||
|
projection.max = max;
|
||||||
|
projection.min = min;
|
||||||
|
return projection;
|
||||||
|
}
|
||||||
|
|
||||||
|
inline bool overlap(Projection p1, Projection p2)
|
||||||
|
{
|
||||||
|
return !((p1.max > p2.max && p1.min > p2.max) || (p2.max > p1.max && p2.min > p1.max));
|
||||||
|
}
|
||||||
|
|
||||||
|
inline float getOverlap(Projection p1, Projection p2)
|
||||||
|
{
|
||||||
|
return XMMin(p1.max, p2.max) - XMMax(p1.min, p2.min);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline XMVECTOR contactPoint(
|
||||||
|
const XMVECTOR &pOne,
|
||||||
|
const XMVECTOR &dOne,
|
||||||
|
float oneSize,
|
||||||
|
const XMVECTOR &pTwo,
|
||||||
|
const XMVECTOR &dTwo,
|
||||||
|
float twoSize,
|
||||||
|
|
||||||
|
// If this is true, and the contact point is outside
|
||||||
|
// the edge (in the case of an edge-face contact) then
|
||||||
|
// we use one's midpoint, otherwise we use two's.
|
||||||
|
bool useOne)
|
||||||
|
{
|
||||||
|
XMVECTOR toSt, cOne, cTwo;
|
||||||
|
float dpStaOne, dpStaTwo, dpOneTwo, smOne, smTwo;
|
||||||
|
float denom, mua, mub;
|
||||||
|
|
||||||
|
smOne = XMVectorGetX(XMVector3LengthSq(dOne));
|
||||||
|
smTwo = XMVectorGetX(XMVector3LengthSq(dTwo));
|
||||||
|
dpOneTwo = XMVectorGetX(XMVector3Dot(dTwo, dOne));
|
||||||
|
|
||||||
|
toSt = pOne - pTwo;
|
||||||
|
dpStaOne = XMVectorGetX(XMVector3Dot(dOne, toSt));
|
||||||
|
dpStaTwo = XMVectorGetX(XMVector3Dot(dTwo, toSt));
|
||||||
|
|
||||||
|
denom = smOne * smTwo - dpOneTwo * dpOneTwo;
|
||||||
|
|
||||||
|
// Zero denominator indicates parrallel lines
|
||||||
|
if (abs(denom) < 0.0001f) {
|
||||||
|
return useOne ? pOne : pTwo;
|
||||||
|
}
|
||||||
|
|
||||||
|
mua = (dpOneTwo * dpStaTwo - smTwo * dpStaOne) / denom;
|
||||||
|
mub = (smOne * dpStaTwo - dpOneTwo * dpStaOne) / denom;
|
||||||
|
|
||||||
|
// If either of the edges has the nearest point out
|
||||||
|
// of bounds, then the edges aren't crossed, we have
|
||||||
|
// an edge-face contact. Our point is on the edge, which
|
||||||
|
// we know from the useOne parameter.
|
||||||
|
if (mua > oneSize ||
|
||||||
|
mua < -oneSize ||
|
||||||
|
mub > twoSize ||
|
||||||
|
mub < -twoSize)
|
||||||
|
{
|
||||||
|
return useOne ? pOne : pTwo;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
cOne = pOne + dOne * mua;
|
||||||
|
cTwo = pTwo + dTwo * mub;
|
||||||
|
|
||||||
|
return cOne * 0.5 + cTwo * 0.5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline XMVECTOR handleVertexToface(const XMMATRIX& obj2World, const XMVECTOR& toCenter)
|
||||||
|
{
|
||||||
|
std::vector<XMVECTOR> corners = getCorners(obj2World);
|
||||||
|
float min = 1000;
|
||||||
|
XMVECTOR vertex;
|
||||||
|
for (int i = 0; i < corners.size(); i++)
|
||||||
|
{
|
||||||
|
float value = XMVectorGetX(XMVector3Dot(corners[i], toCenter));
|
||||||
|
if (value < min)
|
||||||
|
{
|
||||||
|
vertex = corners[i];
|
||||||
|
min = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return vertex;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
inline CollisionInfo checkCollisionSATHelper(const XMMATRIX& obj2World_A, const XMMATRIX& obj2World_B, XMVECTOR size_A, XMVECTOR size_B)
|
||||||
|
{
|
||||||
|
CollisionInfo info;
|
||||||
|
info.isValid = false;
|
||||||
|
XMVECTOR collisionPoint = XMVectorZero();
|
||||||
|
float smallOverlap = 10000.0f;
|
||||||
|
XMVECTOR axis;
|
||||||
|
int index;
|
||||||
|
int fromWhere = -1;
|
||||||
|
bool bestSingleAxis = false;
|
||||||
|
XMVECTOR toCenter = getVectorConnnectingCenters(obj2World_A, obj2World_B);
|
||||||
|
std::vector<XMVECTOR> axes1 = getAxisNormalToFaces(obj2World_A);
|
||||||
|
std::vector<XMVECTOR> axes2 = getAxisNormalToFaces(obj2World_B);
|
||||||
|
std::vector<XMVECTOR> axes3 = getPairOfEdges(obj2World_A, obj2World_B);
|
||||||
|
// loop over the axes1
|
||||||
|
for (int i = 0; i < axes1.size(); i++) {
|
||||||
|
// project both shapes onto the axis
|
||||||
|
Projection p1 = project(obj2World_A, axes1[i]);
|
||||||
|
Projection p2 = project(obj2World_B, axes1[i]);
|
||||||
|
// do the projections overlap?
|
||||||
|
if (!overlap(p1, p2)) {
|
||||||
|
// then we can guarantee that the shapes do not overlap
|
||||||
|
return info;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
// get the overlap
|
||||||
|
float o = getOverlap(p1, p2);
|
||||||
|
// check for minimum
|
||||||
|
if (o < smallOverlap) {
|
||||||
|
// then set this one as the smallest
|
||||||
|
smallOverlap = o;
|
||||||
|
axis = axes1[i];
|
||||||
|
index = i;
|
||||||
|
fromWhere = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// loop over the axes2
|
||||||
|
for (int i = 0; i < axes2.size(); i++) {
|
||||||
|
// project both shapes onto the axis
|
||||||
|
Projection p1 = project(obj2World_A, axes2[i]);
|
||||||
|
Projection p2 = project(obj2World_B, axes2[i]);
|
||||||
|
// do the projections overlap?
|
||||||
|
if (!overlap(p1, p2)) {
|
||||||
|
// then we can guarantee that the shapes do not overlap
|
||||||
|
return info;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
// get the overlap
|
||||||
|
float o = getOverlap(p1, p2);
|
||||||
|
// check for minimum
|
||||||
|
if (o < smallOverlap) {
|
||||||
|
// then set this one as the smallest
|
||||||
|
smallOverlap = o;
|
||||||
|
axis = axes2[i];
|
||||||
|
index = i;
|
||||||
|
fromWhere = 1;
|
||||||
|
bestSingleAxis = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
int whichEdges = 0;
|
||||||
|
// loop over the axes3
|
||||||
|
for (int i = 0; i < axes3.size(); i++) {
|
||||||
|
// project both shapes onto the axis
|
||||||
|
Projection p1 = project(obj2World_A, axes3[i]);
|
||||||
|
Projection p2 = project(obj2World_B, axes3[i]);
|
||||||
|
// do the projections overlap?
|
||||||
|
if (!overlap(p1, p2)) {
|
||||||
|
// then we can guarantee that the shapes do not overlap
|
||||||
|
return info;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
// get the overlap
|
||||||
|
float o = getOverlap(p1, p2);
|
||||||
|
// check for minimum
|
||||||
|
if (o < smallOverlap) {
|
||||||
|
// then set this one as the smallest
|
||||||
|
smallOverlap = o;
|
||||||
|
axis = axes3[i];
|
||||||
|
index = i;
|
||||||
|
whichEdges = i;
|
||||||
|
fromWhere = 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// if we get here then we know that every axis had overlap on it
|
||||||
|
// so we can guarantee an intersection
|
||||||
|
XMVECTOR normal;
|
||||||
|
switch (fromWhere){
|
||||||
|
case 0:{
|
||||||
|
normal = axis;
|
||||||
|
if (XMVectorGetX(XMVector3Dot(axis, toCenter)) <= 0)
|
||||||
|
{
|
||||||
|
normal = normal * -1.0f;
|
||||||
|
}
|
||||||
|
collisionPoint = handleVertexToface(obj2World_B, toCenter);
|
||||||
|
}break;
|
||||||
|
case 1:{
|
||||||
|
normal = axis;
|
||||||
|
if (XMVectorGetX(XMVector3Dot(axis, toCenter)) <= 0)
|
||||||
|
{
|
||||||
|
normal = normal * -1.0f;
|
||||||
|
}
|
||||||
|
collisionPoint = handleVertexToface(obj2World_A, toCenter*-1);
|
||||||
|
}break;
|
||||||
|
case 2:{
|
||||||
|
XMVECTOR axis = XMVector3Normalize(XMVector3Cross(axes1[whichEdges / 3], axes2[whichEdges % 3]));
|
||||||
|
normal = axis;
|
||||||
|
if (XMVectorGetX(XMVector3Dot(axis, toCenter)) <= 0)
|
||||||
|
{
|
||||||
|
normal = normal * -1.0f;
|
||||||
|
}
|
||||||
|
XMVECTOR ptOnOneEdge = XMVectorSet(0.5, 0.5, 0.5, 1);
|
||||||
|
XMVECTOR ptOnTwoEdge = XMVectorSet(0.5, 0.5, 0.5, 1);
|
||||||
|
|
||||||
|
for (int i = 0; i < 3; i++)
|
||||||
|
{
|
||||||
|
if (i == whichEdges / 3) ptOnOneEdge = XMVectorSetByIndex(ptOnOneEdge, 0, i);
|
||||||
|
else if (XMVectorGetX(XMVector3Dot(axes1[i], normal)) < 0) ptOnOneEdge = XMVectorSetByIndex(ptOnOneEdge, -XMVectorGetByIndex(ptOnOneEdge, i), i);
|
||||||
|
|
||||||
|
if (i == whichEdges % 3) ptOnTwoEdge = XMVectorSetByIndex(ptOnTwoEdge, 0, i);
|
||||||
|
else if (XMVectorGetX(XMVector3Dot(axes2[i], normal)) > 0) ptOnTwoEdge = XMVectorSetByIndex(ptOnTwoEdge, -XMVectorGetByIndex(ptOnTwoEdge, i), i);
|
||||||
|
}
|
||||||
|
ptOnOneEdge = XMVector3Transform(ptOnOneEdge, obj2World_A);
|
||||||
|
ptOnTwoEdge = XMVector3Transform(ptOnTwoEdge, obj2World_B);
|
||||||
|
collisionPoint = contactPoint(ptOnOneEdge,
|
||||||
|
axes1[whichEdges / 3],
|
||||||
|
(float)XMVectorGetByIndex(size_A, (whichEdges / 3)),
|
||||||
|
ptOnTwoEdge,
|
||||||
|
axes2[whichEdges % 3],
|
||||||
|
XMVectorGetByIndex(size_B, (whichEdges % 3)),
|
||||||
|
bestSingleAxis);
|
||||||
|
}break;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
info.isValid = true;
|
||||||
|
info.collisionPointWorld = collisionPoint;
|
||||||
|
info.depth = smallOverlap;
|
||||||
|
info.normalWorld = normal*-1;
|
||||||
|
return info;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* params:
|
||||||
|
obj2World_A, the transfer matrix from object space of A to the world space
|
||||||
|
obj2World_B, the transfer matrix from object space of B to the world space
|
||||||
|
*/
|
||||||
|
inline CollisionInfo checkCollisionSAT(GamePhysics::Mat4& obj2World_A, GamePhysics::Mat4& obj2World_B) {
|
||||||
|
using namespace collisionTools;
|
||||||
|
XMMATRIX MatA = obj2World_A.toDirectXMatrix(), MatB = obj2World_B.toDirectXMatrix();
|
||||||
|
XMVECTOR calSizeA = getBoxSize(MatA);
|
||||||
|
XMVECTOR calSizeB = getBoxSize(MatB);
|
||||||
|
|
||||||
|
return checkCollisionSATHelper(MatA, MatB, calSizeA, calSizeB);
|
||||||
|
}
|
||||||
|
|
||||||
|
// example of using the checkCollisionSAT function
|
||||||
|
inline void testCheckCollision(int caseid){
|
||||||
|
|
||||||
|
if (caseid == 1){// simple examples, suppose that boxes A and B are cubes and have no rotation
|
||||||
|
GamePhysics::Mat4 AM; AM.initTranslation(1.0, 1.0, 1.0);// box A at (1.0,1.0,1.0)
|
||||||
|
GamePhysics::Mat4 BM; BM.initTranslation(2.0, 2.0, 2.0); //box B at (2.0,2.0,2.0)
|
||||||
|
|
||||||
|
// check for collision
|
||||||
|
CollisionInfo simpletest = checkCollisionSAT(AM, BM);// should find out a collision here
|
||||||
|
if (!simpletest.isValid)
|
||||||
|
std::printf("No Collision\n");
|
||||||
|
else {
|
||||||
|
std::printf("collision detected at normal: %f, %f, %f\n", simpletest.normalWorld.x, simpletest.normalWorld.y, simpletest.normalWorld.z);
|
||||||
|
std::printf("collision point : %f, %f, %f\n", (simpletest.collisionPointWorld).x, (simpletest.collisionPointWorld).y, simpletest.collisionPointWorld.z);
|
||||||
|
}
|
||||||
|
// case 1 result:
|
||||||
|
// collision detected at normal: -1.000000, -0.000000, -0.000000
|
||||||
|
// collision point : 1.500000, 1.500000, 1.500000
|
||||||
|
// Box A should be pushed to the left
|
||||||
|
}
|
||||||
|
else if (caseid == 2){// case 2, collide at a corner of Box B:
|
||||||
|
GamePhysics::Mat4 AM, BM;
|
||||||
|
AM.initTranslation(0.2f, 5.0f, 1.0f); // box A moves(0.2f, 5.0f, 1.0f) from origin
|
||||||
|
BM.initRotationZ(45); // box B rotates 45 degree around axis z
|
||||||
|
// box A size(9,2,3), box B size(5.656854f, 5.656854f, 2.0f)
|
||||||
|
GamePhysics::Mat4 SizeMat;
|
||||||
|
SizeMat.initScaling(9.0f, 2.0f, 3.0f);
|
||||||
|
AM = SizeMat * AM;
|
||||||
|
SizeMat.initScaling(5.656854f, 5.656854f, 2.0f);
|
||||||
|
BM = SizeMat * BM;
|
||||||
|
// check for collision
|
||||||
|
CollisionInfo simpletest = checkCollisionSAT(AM, BM);// should find out a collision here
|
||||||
|
|
||||||
|
if (!simpletest.isValid)
|
||||||
|
std::printf("No Collision\n");
|
||||||
|
else {
|
||||||
|
std::printf("collision detected at normal: %f, %f, %f\n", simpletest.normalWorld.x, simpletest.normalWorld.y, simpletest.normalWorld.z);
|
||||||
|
std::printf("collision point : %f, %f, %f\n", (simpletest.collisionPointWorld).x, (simpletest.collisionPointWorld).y, simpletest.collisionPointWorld.z);
|
||||||
|
}
|
||||||
|
// case 2 result:
|
||||||
|
// collision detected at normal : 0.000000, 1.000000, 0.000000
|
||||||
|
// collision point : 0.000000, 4.000000, 1.000000
|
||||||
|
}
|
||||||
|
else if (caseid == 3){// case 3, collide at a corner of Box A:
|
||||||
|
// box A first rotates 45 degree around axis z
|
||||||
|
// box A moves(-2.0f, 0.0f, 1.0f) from origin,(-2.0f,0.0f,1.0f) is the centre position of A in world space
|
||||||
|
// box A size(2.829f, 2.829f, 2.0f)
|
||||||
|
GamePhysics::Mat4 AM_rot; AM_rot.initRotationZ(45);
|
||||||
|
GamePhysics::Mat4 AM_tra; AM_tra.initTranslation(-2.0f, 0.0f, 1.0f);
|
||||||
|
GamePhysics::Mat4 AM_sca; AM_sca.initScaling(2.829f, 2.829f, 2.0f);
|
||||||
|
// get the object 2 world matrix of A
|
||||||
|
GamePhysics::Mat4 AM = AM_sca * AM_rot * AM_tra; // pay attention to the order!
|
||||||
|
// order, since we are working with the DirectX, we use left-handed matrixes!
|
||||||
|
|
||||||
|
// box B first rotates 90 degree around axis z
|
||||||
|
// box B then moves (1.0f,0.5f,0.0f) from origin, (1.0f,0.5f,0.0f) is also the centre position of B in world space
|
||||||
|
// box B size(9.0f, 2.0f, 4.0f)
|
||||||
|
GamePhysics::Mat4 BM_rot; BM_rot.initRotationZ(90);
|
||||||
|
GamePhysics::Mat4 BM_tra; BM_tra.initTranslation(1.0f, 0.5f, 0.0f);
|
||||||
|
GamePhysics::Mat4 BM_sca; BM_sca.initScaling(9.0f, 2.0f, 4.0f);
|
||||||
|
GamePhysics::Mat4 BM = BM_sca * BM_rot * BM_tra; // pay attention to the order!
|
||||||
|
|
||||||
|
// check for collision
|
||||||
|
CollisionInfo simpletest = checkCollisionSAT(AM, BM);// should find out a collision here
|
||||||
|
|
||||||
|
if (!simpletest.isValid)
|
||||||
|
std::printf("No Collision\n");
|
||||||
|
else {
|
||||||
|
std::printf("collision detected at normal: %f, %f, %f\n", simpletest.normalWorld.x, simpletest.normalWorld.y, simpletest.normalWorld.z);
|
||||||
|
std::printf("collision point : %f, %f, %f\n", (simpletest.collisionPointWorld).x, (simpletest.collisionPointWorld).y, simpletest.collisionPointWorld.z);
|
||||||
|
}
|
||||||
|
// case 3 result:
|
||||||
|
// collision detected at normal: -1.000000, 0.000000, -0.000000
|
||||||
|
// collision point : 0.000405, 0.000000, 0.000000
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,8 +20,8 @@ using namespace GamePhysics;
|
|||||||
|
|
||||||
//#define ADAPTIVESTEP
|
//#define ADAPTIVESTEP
|
||||||
|
|
||||||
//#define TEMPLATE_DEMO
|
#define TEMPLATE_DEMO
|
||||||
#define MASS_SPRING_SYSTEM
|
//#define MASS_SPRING_SYSTEM
|
||||||
//#define RIGID_BODY_SYSTEM
|
//#define RIGID_BODY_SYSTEM
|
||||||
//#define SPH_SYSTEM
|
//#define SPH_SYSTEM
|
||||||
|
|
||||||
@@ -53,14 +53,9 @@ bool firstTime = true;
|
|||||||
FFmpeg* g_pFFmpegVideoRecorder = nullptr;
|
FFmpeg* g_pFFmpegVideoRecorder = nullptr;
|
||||||
|
|
||||||
|
|
||||||
// Input Stuff
|
|
||||||
float lastX;
|
|
||||||
float lastY;
|
|
||||||
|
|
||||||
|
|
||||||
void initTweakBar(){
|
void initTweakBar(){
|
||||||
g_pDUC->g_pTweakBar = TwNewBar("TweakBar");
|
g_pDUC->g_pTweakBar = TwNewBar("TweakBar");
|
||||||
TwDefine(" TweakBar color='128 128 128' alpha=128 ");
|
TwDefine(" TweakBar color='0 128 128' alpha=128 ");
|
||||||
TwType TW_TYPE_TESTCASE = TwDefineEnumFromString("Test Scene", g_pSimulator->getTestCasesStr());
|
TwType TW_TYPE_TESTCASE = TwDefineEnumFromString("Test Scene", g_pSimulator->getTestCasesStr());
|
||||||
TwAddVarRW(g_pDUC->g_pTweakBar, "Test Scene", TW_TYPE_TESTCASE, &g_iTestCase, "");
|
TwAddVarRW(g_pDUC->g_pTweakBar, "Test Scene", TW_TYPE_TESTCASE, &g_iTestCase, "");
|
||||||
// HINT: For buttons you can directly pass the callback function as a lambda expression.
|
// HINT: For buttons you can directly pass the callback function as a lambda expression.
|
||||||
@@ -207,23 +202,10 @@ void CALLBACK OnMouse( bool bLeftButtonDown, bool bRightButtonDown, bool bMiddle
|
|||||||
if (bLeftButtonDown)
|
if (bLeftButtonDown)
|
||||||
{
|
{
|
||||||
g_pSimulator->onClick(xPos,yPos);
|
g_pSimulator->onClick(xPos,yPos);
|
||||||
|
|
||||||
int x = xPos;
|
|
||||||
int y = yPos;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
g_pSimulator->onMouse(xPos, yPos);
|
g_pSimulator->onMouse(xPos, yPos);
|
||||||
|
|
||||||
float deltaX = lastX - xPos;
|
|
||||||
float deltaY = lastY - yPos;
|
|
||||||
|
|
||||||
lastX = xPos;
|
|
||||||
lastY = yPos;
|
|
||||||
|
|
||||||
/*printf("X Delta: %f \n", deltaX);
|
|
||||||
printf("Y Delta: %f \n", deltaY);*/
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -646,8 +646,8 @@ matrix4x4<Scalar>::initRotationX(Scalar rot)
|
|||||||
|
|
||||||
this->initId();
|
this->initId();
|
||||||
value[1][1] = (Scalar) cos(drot);
|
value[1][1] = (Scalar) cos(drot);
|
||||||
value[2][1] = (Scalar) sin(drot);
|
value[1][2] = (Scalar) sin(drot);
|
||||||
value[1][2] = (Scalar)(-sin(drot));
|
value[2][1] = (Scalar)(-sin(drot));
|
||||||
value[2][2] = (Scalar) cos(drot);
|
value[2][2] = (Scalar) cos(drot);
|
||||||
}
|
}
|
||||||
template<class Scalar>
|
template<class Scalar>
|
||||||
@@ -659,8 +659,8 @@ matrix4x4<Scalar>::initRotationY(Scalar rot)
|
|||||||
|
|
||||||
this->initId();
|
this->initId();
|
||||||
value[0][0] = (Scalar) cos(drot);
|
value[0][0] = (Scalar) cos(drot);
|
||||||
value[2][0] = (Scalar)(-sin(drot));
|
value[0][2] = (Scalar)(-sin(drot));
|
||||||
value[0][2] = (Scalar) sin(drot);
|
value[2][0] = (Scalar) sin(drot);
|
||||||
value[2][2] = (Scalar) cos(drot);
|
value[2][2] = (Scalar) cos(drot);
|
||||||
}
|
}
|
||||||
template<class Scalar>
|
template<class Scalar>
|
||||||
@@ -672,8 +672,8 @@ matrix4x4<Scalar>::initRotationZ(Scalar rot)
|
|||||||
|
|
||||||
this->initId();
|
this->initId();
|
||||||
value[0][0] = (Scalar) cos(drot);
|
value[0][0] = (Scalar) cos(drot);
|
||||||
value[1][0] = (Scalar) sin(drot);
|
value[0][1] = (Scalar) sin(drot);
|
||||||
value[0][1] = (Scalar)(-sin(drot));
|
value[1][0] = (Scalar)(-sin(drot));
|
||||||
value[1][1] = (Scalar) cos(drot);
|
value[1][1] = (Scalar) cos(drot);
|
||||||
}
|
}
|
||||||
template<class Scalar>
|
template<class Scalar>
|
||||||
|
|||||||
@@ -1,239 +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>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{0B7BAA5B-0753-4015-A8F3-8FA540FC8660}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>SimulationsRunner</RootNamespace>
|
|
||||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</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)'=='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|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|Win32'" 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|x64'">
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<PreprocessorDefinitions>WIN32;NOMINMAX;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)DirectXTK/Inc;$(SolutionDir)DXUT11/Core;$(SolutionDir)DXUT11/Optional;$(SolutionDir)Effects11/inc;$(SolutionDir)AntTweakBar/include</AdditionalIncludeDirectories>
|
|
||||||
<PrecompiledHeaderFile />
|
|
||||||
<PrecompiledHeaderOutputFile />
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<AdditionalDependencies>D3DCompiler.lib;Mf.lib;mfuuid.lib;Mfplat.lib;Mfreadwrite.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
<FxCompile>
|
|
||||||
<EntryPointName />
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderType>Effect</ShaderType>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderModel>5.0</ShaderModel>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ObjectFileOutput>$(OutDir)%(Filename).fxo</ObjectFileOutput>
|
|
||||||
</FxCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<PreprocessorDefinitions>WIN32;NOMINMAX;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)Simulations;$(SolutionDir)DirectXTK/Inc;$(SolutionDir)DXUT11/Core;$(SolutionDir)DXUT11/Optional;$(SolutionDir)Effects11/inc;$(SolutionDir)AntTweakBar/include</AdditionalIncludeDirectories>
|
|
||||||
<PrecompiledHeaderFile>
|
|
||||||
</PrecompiledHeaderFile>
|
|
||||||
<PrecompiledHeaderOutputFile>
|
|
||||||
</PrecompiledHeaderOutputFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<AdditionalDependencies>D3DCompiler.lib;Mf.lib;mfuuid.lib;Mfplat.lib;Mfreadwrite.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
<FxCompile>
|
|
||||||
<EntryPointName>
|
|
||||||
</EntryPointName>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderType>Effect</ShaderType>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderModel>5.0</ShaderModel>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ObjectFileOutput>$(OutDir)%(Filename).fxo</ObjectFileOutput>
|
|
||||||
</FxCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)DirectXTK/Inc;$(SolutionDir)DXUT11/Core;$(SolutionDir)DXUT11/Optional;$(SolutionDir)Effects11/inc;$(SolutionDir)AntTweakBar/include</AdditionalIncludeDirectories>
|
|
||||||
<PrecompiledHeaderFile />
|
|
||||||
<PrecompiledHeaderOutputFile />
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
<FxCompile>
|
|
||||||
<EntryPointName />
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderType>Effect</ShaderType>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderModel>5.0</ShaderModel>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ObjectFileOutput>$(OutDir)%(Filename).fxo</ObjectFileOutput>
|
|
||||||
</FxCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)DirectXTK/Inc;$(SolutionDir)DXUT11/Core;$(SolutionDir)DXUT11/Optional;$(SolutionDir)Effects11/inc;$(SolutionDir)AntTweakBar/include</AdditionalIncludeDirectories>
|
|
||||||
<PrecompiledHeaderFile>
|
|
||||||
</PrecompiledHeaderFile>
|
|
||||||
<PrecompiledHeaderOutputFile>
|
|
||||||
</PrecompiledHeaderOutputFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
<FxCompile>
|
|
||||||
<EntryPointName>
|
|
||||||
</EntryPointName>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderType>Effect</ShaderType>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ShaderModel>5.0</ShaderModel>
|
|
||||||
</FxCompile>
|
|
||||||
<FxCompile>
|
|
||||||
<ObjectFileOutput>$(OutDir)%(Filename).fxo</ObjectFileOutput>
|
|
||||||
</FxCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="..\Simulations\main.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\AntTweakBar\src\AntTweakBar_2022.vcxproj">
|
|
||||||
<Project>{b99e1fa1-c30a-45f2-9d57-9e9c21b2df42}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\DirectXTK\DirectXTK_Desktop_2022.vcxproj">
|
|
||||||
<Project>{e0b52ae7-e160-4d32-bf3f-910b785e5a8e}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\DXUT11\Core\DXUT_DirectXTK_2022.vcxproj">
|
|
||||||
<Project>{85344b7f-5aa0-4e12-a065-d1333d11f6ca}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\DXUT11\Optional\DXUTOpt_DirectXTK_2022.vcxproj">
|
|
||||||
<Project>{61b333c2-c4f7-4cc1-a9bf-83f6d95588eb}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\Effects11\Effects11_2022.vcxproj">
|
|
||||||
<Project>{df460eab-570d-4b50-9089-2e2fc801bf38}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\Simulations\Demo_2022.vcxproj">
|
|
||||||
<Project>{3cabed2c-12f1-4408-aaae-e2185a426f35}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="..\SimulatorTester\SimulatorTester.vcxproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
105
SimulatorTester/PublicRigidBodiesTests.cpp
Normal file
105
SimulatorTester/PublicRigidBodiesTests.cpp
Normal file
@@ -0,0 +1,105 @@
|
|||||||
|
#include "CppUnitTest.h"
|
||||||
|
#include "RigidBodySystemSimulator.h"
|
||||||
|
|
||||||
|
using namespace Microsoft::VisualStudio::CppUnitTestFramework;
|
||||||
|
|
||||||
|
namespace SimulatorTester
|
||||||
|
{
|
||||||
|
TEST_CLASS(PublicRigidBodiesTests)
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
void setupBaseTest(RigidBodySystemSimulator * rbss) {
|
||||||
|
rbss->m_iTestCase = TESTCASEUSEDTORUNTEST;
|
||||||
|
rbss->addRigidBody(Vec3(-0.1f, -0.2f, 0.1f), Vec3(0.4f, 0.2f, 0.2f), 100.0f);
|
||||||
|
|
||||||
|
rbss->addRigidBody(Vec3(0.0f, 0.2f, 0.0f), Vec3(0.4f, 0.2f, 0.2f), 100.0);
|
||||||
|
rbss->setOrientationOf(1, Quat(Vec3(0.0f, 0.0f, 1.0f), (float)(M_PI)*0.25f));
|
||||||
|
rbss->setVelocityOf(1,Vec3(0.0f, -0.1f, 0.05f));
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_METHOD(TestRigidBodiesInitialization)
|
||||||
|
{
|
||||||
|
RigidBodySystemSimulator * rbss = new RigidBodySystemSimulator();
|
||||||
|
setupBaseTest(rbss);
|
||||||
|
Assert::AreEqual(2,(int)rbss->getNumberOfRigidBodies(),0.0001f,L"Number of Rigid bodies is not right",LINE_INFO());
|
||||||
|
Vec3 pos = rbss->getPositionOfRigidBody(0);
|
||||||
|
Assert::AreEqual(-0.1f,(float)pos.x,0.0001f,L"X coordinate of body 0 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(-0.2f,(float)pos.y,0.0001f,L"Y coordinate of body 0 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(0.1f,(float)pos.z,0.0001f,L"Z coordinate of body 0 is not right",LINE_INFO());
|
||||||
|
Vec3 vel = rbss->getLinearVelocityOfRigidBody(0);
|
||||||
|
Assert::AreEqual(0.0f,(float)vel.x,0.0001f,L"X componnent of body 0 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(0.0f,(float)vel.y,0.0001f,L"Y componnent of body 0 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(0.0f,(float)vel.z,0.0001f,L"Z componnent of body 0 is not right",LINE_INFO());
|
||||||
|
Vec3 angvel = rbss->getAngularVelocityOfRigidBody(0);
|
||||||
|
Assert::AreEqual(0.0f,(float)angvel.x,0.0001f,L"X componnent of body 0 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(0.0f,(float)angvel.y,0.0001f,L"Y componnent of body 0 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(0.0f,(float)angvel.z,0.0001f,L"Z componnent of body 0 is not right",LINE_INFO());
|
||||||
|
pos = rbss->getPositionOfRigidBody(1);
|
||||||
|
Assert::AreEqual(0.0f,(float)pos.x,0.0001f,L"X coordinate of body 1 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(0.2f,(float)pos.y,0.0001f,L"Y coordinate of body 1 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(0.0f,(float)pos.z,0.0001f,L"Z coordinate of body 1 is not right",LINE_INFO());
|
||||||
|
vel = rbss->getLinearVelocityOfRigidBody(1);
|
||||||
|
Assert::AreEqual(0.0f,(float)vel.x,0.0001f,L"X componnent of body 1 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(-0.1f,(float)vel.y,0.0001f,L"Y componnent of body 1 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(0.05f,(float)vel.z,0.0001f,L"Z componnent of body 1 is not right",LINE_INFO());
|
||||||
|
angvel = rbss->getAngularVelocityOfRigidBody(1);
|
||||||
|
Assert::AreEqual(0.0f,(float)angvel.x,0.0001f,L"X componnent of body 0 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(0.0f,(float)angvel.y,0.0001f,L"Y componnent of body 0 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(0.0f,(float)angvel.z,0.0001f,L"Z componnent of body 0 is not right",LINE_INFO());
|
||||||
|
delete rbss;
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_METHOD(TestRigidBodiesAfterForceApplication)
|
||||||
|
{
|
||||||
|
RigidBodySystemSimulator * rbss = new RigidBodySystemSimulator();
|
||||||
|
setupBaseTest(rbss);
|
||||||
|
rbss->applyForceOnBody(0,Vec3(0.0,0.0f,0.0),Vec3(0,0,200));
|
||||||
|
for(int i =0; i < 4;i++)
|
||||||
|
rbss->simulateTimestep(0.1);
|
||||||
|
Vec3 pos = rbss->getPositionOfRigidBody(0);
|
||||||
|
Assert::AreEqual(-0.1f,(float)pos.x,0.0001f,L"X coordinate of body 0 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(-0.2f,(float)pos.y,0.0001f,L"Y coordinate of body 0 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(0.16f,(float)pos.z,0.0001f,L"Z coordinate of body 0 is not right",LINE_INFO());
|
||||||
|
Vec3 vel = rbss->getLinearVelocityOfRigidBody(0);
|
||||||
|
Assert::AreEqual(0.0f,(float)vel.x,0.0001f,L"X componnent of body 0 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(0.0f,(float)vel.y,0.0001f,L"Y componnent of body 0 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(0.2f,(float)vel.z,0.0001f,L"Z componnent of body 0 is not right",LINE_INFO());
|
||||||
|
Vec3 angvel = rbss->getAngularVelocityOfRigidBody(0);
|
||||||
|
Assert::AreEqual(5.8590f,(float)angvel.x,0.0001f,L"X componnent of body 0 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(-2.1106f,(float)angvel.y,0.0001f,L"Y componnent of body 0 is not right",LINE_INFO());
|
||||||
|
Assert::AreEqual(-1.1391f,(float)angvel.z,0.0001f,L"Z componnent of body 0 is not right",LINE_INFO());
|
||||||
|
delete rbss;
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_METHOD(TestRigidBodiesOneStepGivenTableTest)
|
||||||
|
{
|
||||||
|
RigidBodySystemSimulator * rbss = new RigidBodySystemSimulator();
|
||||||
|
|
||||||
|
rbss->m_iTestCase = TESTCASEUSEDTORUNTEST;
|
||||||
|
rbss->addRigidBody(Vec3(0.0f, 0.0f, 0.0f), Vec3(1.0f, 0.6f, 0.5f), 2.0f);
|
||||||
|
rbss->setOrientationOf(0, Quat(Vec3(0.0f, 0.0f, 1.0f), (float)(M_PI)* 0.5f));
|
||||||
|
rbss->applyForceOnBody(0, Vec3(0.3f, 0.5f, 0.25f), Vec3(1.0f, 1.0f, 0.0f));
|
||||||
|
rbss->simulateTimestep(2.0);
|
||||||
|
|
||||||
|
Vec3 pos = rbss->getPositionOfRigidBody(0);
|
||||||
|
Assert::AreEqual(0.0000f, (float)pos.x, 0.0001f, L"X coordinate of position of body 0 is not right", LINE_INFO());
|
||||||
|
Assert::AreEqual(0.0000f, (float)pos.y, 0.0001f, L"Y coordinate of position of body 0 is not right", LINE_INFO());
|
||||||
|
Assert::AreEqual(0.0000f, (float)pos.z, 0.0001f, L"Z coordinate of position of body 0 is not right", LINE_INFO());
|
||||||
|
Vec3 vel = rbss->getLinearVelocityOfRigidBody(0);
|
||||||
|
Assert::AreEqual(1.0000f, (float)vel.x, 0.0001f, L"X componnent of velocity of body 0 is not right", LINE_INFO());
|
||||||
|
Assert::AreEqual(1.0000f, (float)vel.y, 0.0001f, L"Y componnent of velocity of body 0 is not right", LINE_INFO());
|
||||||
|
Assert::AreEqual(0.0000f, (float)vel.z, 0.0001f, L"Z componnent of velocity of body 0 is not right", LINE_INFO());
|
||||||
|
Vec3 angvel = rbss->getAngularVelocityOfRigidBody(0);
|
||||||
|
Assert::AreEqual(-2.4000f, (float)angvel.x, 0.0001f, L"X componnent of angular velocity of body 0 is not right", LINE_INFO());
|
||||||
|
Assert::AreEqual(4.9180f, (float)angvel.y, 0.0001f, L"Y componnent of angular velocity of body 0 is not right", LINE_INFO());
|
||||||
|
Assert::AreEqual(-1.7647f, (float)angvel.z, 0.0001f, L"Z componnent of angular velocity of body 0 is not right", LINE_INFO());
|
||||||
|
|
||||||
|
Vec3 xa_world = Vec3(-0.3f, -0.5f, -0.25f) - pos;
|
||||||
|
Vec3 velocityA = vel + cross(angvel, xa_world);
|
||||||
|
Assert::AreEqual(-1.11186f, (float)velocityA.x, 0.0001f, L"X componnent of the velocity at the given point is not right", LINE_INFO());
|
||||||
|
Assert::AreEqual(0.929412f, (float)velocityA.y, 0.0001f, L"Y componnent of the velocity at the given point is not right", LINE_INFO());
|
||||||
|
Assert::AreEqual(2.67541f, (float)velocityA.z, 0.0001f, L"Z componnent of the velocity at the given point is not right", LINE_INFO());
|
||||||
|
delete rbss;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -163,6 +163,7 @@
|
|||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="PublicMassSpringSystemTests.cpp" />
|
<ClCompile Include="PublicMassSpringSystemTests.cpp" />
|
||||||
|
<ClCompile Include="PublicRigidBodiesTests.cpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\AntTweakBar\src\AntTweakBar_2013.vcxproj">
|
<ProjectReference Include="..\AntTweakBar\src\AntTweakBar_2013.vcxproj">
|
||||||
|
|||||||
@@ -163,6 +163,7 @@
|
|||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="PublicMassSpringSystemTests.cpp" />
|
<ClCompile Include="PublicMassSpringSystemTests.cpp" />
|
||||||
|
<ClCompile Include="PublicRigidBodiesTests.cpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\AntTweakBar\src\AntTweakBar_2015.vcxproj">
|
<ProjectReference Include="..\AntTweakBar\src\AntTweakBar_2015.vcxproj">
|
||||||
|
|||||||
@@ -164,6 +164,7 @@
|
|||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="PublicMassSpringSystemTests.cpp" />
|
<ClCompile Include="PublicMassSpringSystemTests.cpp" />
|
||||||
|
<ClCompile Include="PublicRigidBodiesTests.cpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\AntTweakBar\src\AntTweakBar_2017.vcxproj">
|
<ProjectReference Include="..\AntTweakBar\src\AntTweakBar_2017.vcxproj">
|
||||||
|
|||||||
@@ -1,191 +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>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{13342092-1CC5-4994-A03C-3963197E8016}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>SimulationsTester</RootNamespace>
|
|
||||||
<ProjectName>SimulationsTester</ProjectName>
|
|
||||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<UseOfMfc>false</UseOfMfc>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<UseOfMfc>false</UseOfMfc>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<UseOfMfc>false</UseOfMfc>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<PlatformToolset>v143</PlatformToolset>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<UseOfMfc>false</UseOfMfc>
|
|
||||||
</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 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 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 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>
|
|
||||||
<IncludePath>$(IncludePath)</IncludePath>
|
|
||||||
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
<IncludePath>$(IncludePath)</IncludePath>
|
|
||||||
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;$(SolutionDir)Simulations;$(SolutionDir)DirectXTK/Inc;$(SolutionDir)DXUT11/Core;$(SolutionDir)DXUT11/Optional;$(SolutionDir)Effects11/inc;$(SolutionDir)AntTweakBar/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN32;NOMINMAX;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<UseFullPaths>true</UseFullPaths>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
||||||
<AdditionalDependencies>D3DCompiler.lib;Mf.lib;mfuuid.lib;Mfplat.lib;Mfreadwrite.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;$(SolutionDir)Simulations;$(SolutionDir)DirectXTK/Inc;$(SolutionDir)DXUT11/Core;$(SolutionDir)DXUT11/Optional;$(SolutionDir)Effects11/inc;$(SolutionDir)AntTweakBar/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN32;NOMINMAX;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<UseFullPaths>true</UseFullPaths>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
||||||
<AdditionalDependencies>D3DCompiler.lib;Mf.lib;mfuuid.lib;Mfplat.lib;Mfreadwrite.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;$(SolutionDir)Simulations;$(SolutionDir)DirectXTK/Inc;$(SolutionDir)DXUT11/Core;$(SolutionDir)DXUT11/Optional;$(SolutionDir)Effects11/inc;$(SolutionDir)AntTweakBar/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<UseFullPaths>true</UseFullPaths>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
||||||
<AdditionalDependencies>D3DCompiler.lib;Mf.lib;mfuuid.lib;Mfplat.lib;Mfreadwrite.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;$(SolutionDir)Simulations;$(SolutionDir)DirectXTK/Inc;$(SolutionDir)DXUT11/Core;$(SolutionDir)DXUT11/Optional;$(SolutionDir)Effects11/inc;$(SolutionDir)AntTweakBar/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<UseFullPaths>true</UseFullPaths>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Windows</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
||||||
<AdditionalDependencies>D3DCompiler.lib;Mf.lib;mfuuid.lib;Mfplat.lib;Mfreadwrite.lib;comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="PublicMassSpringSystemTests.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\AntTweakBar\src\AntTweakBar_2022.vcxproj">
|
|
||||||
<Project>{b99e1fa1-c30a-45f2-9d57-9e9c21b2df42}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\DirectXTK\DirectXTK_Desktop_2022.vcxproj">
|
|
||||||
<Project>{e0b52ae7-e160-4d32-bf3f-910b785e5a8e}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\DXUT11\Core\DXUT_DirectXTK_2022.vcxproj">
|
|
||||||
<Project>{85344b7f-5aa0-4e12-a065-d1333d11f6ca}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\DXUT11\Optional\DXUTOpt_DirectXTK_2022.vcxproj">
|
|
||||||
<Project>{61b333c2-c4f7-4cc1-a9bf-83f6d95588eb}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\Effects11\Effects11_2022.vcxproj">
|
|
||||||
<Project>{df460eab-570d-4b50-9089-2e2fc801bf38}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\Simulations\Demo_2022.vcxproj">
|
|
||||||
<Project>{3cabed2c-12f1-4408-aaae-e2185a426f35}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
|
||||||
# Visual Studio Version 17
|
|
||||||
VisualStudioVersion = 17.7.34031.279
|
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimulationsRunner_2022", "SimulationsRunner\SimulationsRunner_2022.vcxproj", "{0B7BAA5B-0753-4015-A8F3-8FA540FC8660}"
|
|
||||||
EndProject
|
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Simulations", "Simulations\Demo_2022.vcxproj", "{3CABED2C-12F1-4408-AAAE-E2185A426F35}"
|
|
||||||
EndProject
|
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11\Effects11_2022.vcxproj", "{DF460EAB-570D-4B50-9089-2E2FC801BF38}"
|
|
||||||
EndProject
|
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DXUT", "DXUT11\Core\DXUT_DirectXTK_2022.vcxproj", "{85344B7F-5AA0-4E12-A065-D1333D11F6CA}"
|
|
||||||
EndProject
|
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DXUTOpt", "DXUT11\Optional\DXUTOpt_DirectXTK_2022.vcxproj", "{61B333C2-C4F7-4CC1-A9BF-83F6D95588EB}"
|
|
||||||
EndProject
|
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AntTweakBar", "AntTweakBar\src\AntTweakBar_2022.vcxproj", "{B99E1FA1-C30A-45F2-9D57-9E9C21B2DF42}"
|
|
||||||
EndProject
|
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK_Desktop_2022", "DirectXTK\DirectXTK_Desktop_2022.vcxproj", "{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}"
|
|
||||||
EndProject
|
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimulationsTester", "SimulatorTester\SimulatorTester_2022.vcxproj", "{13342092-1CC5-4994-A03C-3963197E8016}"
|
|
||||||
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
|
|
||||||
{0B7BAA5B-0753-4015-A8F3-8FA540FC8660}.Debug|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{0B7BAA5B-0753-4015-A8F3-8FA540FC8660}.Debug|Win32.Build.0 = Debug|Win32
|
|
||||||
{0B7BAA5B-0753-4015-A8F3-8FA540FC8660}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{0B7BAA5B-0753-4015-A8F3-8FA540FC8660}.Debug|x64.Build.0 = Debug|x64
|
|
||||||
{0B7BAA5B-0753-4015-A8F3-8FA540FC8660}.Release|Win32.ActiveCfg = Release|Win32
|
|
||||||
{0B7BAA5B-0753-4015-A8F3-8FA540FC8660}.Release|Win32.Build.0 = Release|Win32
|
|
||||||
{0B7BAA5B-0753-4015-A8F3-8FA540FC8660}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{0B7BAA5B-0753-4015-A8F3-8FA540FC8660}.Release|x64.Build.0 = Release|x64
|
|
||||||
{3CABED2C-12F1-4408-AAAE-E2185A426F35}.Debug|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{3CABED2C-12F1-4408-AAAE-E2185A426F35}.Debug|Win32.Build.0 = Debug|Win32
|
|
||||||
{3CABED2C-12F1-4408-AAAE-E2185A426F35}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{3CABED2C-12F1-4408-AAAE-E2185A426F35}.Debug|x64.Build.0 = Debug|x64
|
|
||||||
{3CABED2C-12F1-4408-AAAE-E2185A426F35}.Release|Win32.ActiveCfg = Release|Win32
|
|
||||||
{3CABED2C-12F1-4408-AAAE-E2185A426F35}.Release|Win32.Build.0 = Release|Win32
|
|
||||||
{3CABED2C-12F1-4408-AAAE-E2185A426F35}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{3CABED2C-12F1-4408-AAAE-E2185A426F35}.Release|x64.Build.0 = Release|x64
|
|
||||||
{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.Build.0 = Debug|Win32
|
|
||||||
{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.Build.0 = Debug|x64
|
|
||||||
{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.ActiveCfg = Release|Win32
|
|
||||||
{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.Build.0 = Release|Win32
|
|
||||||
{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.Build.0 = Release|x64
|
|
||||||
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Debug|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Debug|Win32.Build.0 = Debug|Win32
|
|
||||||
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Debug|x64.Build.0 = Debug|x64
|
|
||||||
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Release|Win32.ActiveCfg = Release|Win32
|
|
||||||
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Release|Win32.Build.0 = Release|Win32
|
|
||||||
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{85344B7F-5AA0-4E12-A065-D1333D11F6CA}.Release|x64.Build.0 = Release|x64
|
|
||||||
{61B333C2-C4F7-4CC1-A9BF-83F6D95588EB}.Debug|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{61B333C2-C4F7-4CC1-A9BF-83F6D95588EB}.Debug|Win32.Build.0 = Debug|Win32
|
|
||||||
{61B333C2-C4F7-4CC1-A9BF-83F6D95588EB}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{61B333C2-C4F7-4CC1-A9BF-83F6D95588EB}.Debug|x64.Build.0 = Debug|x64
|
|
||||||
{61B333C2-C4F7-4CC1-A9BF-83F6D95588EB}.Release|Win32.ActiveCfg = Release|Win32
|
|
||||||
{61B333C2-C4F7-4CC1-A9BF-83F6D95588EB}.Release|Win32.Build.0 = Release|Win32
|
|
||||||
{61B333C2-C4F7-4CC1-A9BF-83F6D95588EB}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{61B333C2-C4F7-4CC1-A9BF-83F6D95588EB}.Release|x64.Build.0 = Release|x64
|
|
||||||
{B99E1FA1-C30A-45F2-9D57-9E9C21B2DF42}.Debug|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{B99E1FA1-C30A-45F2-9D57-9E9C21B2DF42}.Debug|Win32.Build.0 = Debug|Win32
|
|
||||||
{B99E1FA1-C30A-45F2-9D57-9E9C21B2DF42}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{B99E1FA1-C30A-45F2-9D57-9E9C21B2DF42}.Debug|x64.Build.0 = Debug|x64
|
|
||||||
{B99E1FA1-C30A-45F2-9D57-9E9C21B2DF42}.Release|Win32.ActiveCfg = Release|Win32
|
|
||||||
{B99E1FA1-C30A-45F2-9D57-9E9C21B2DF42}.Release|Win32.Build.0 = Release|Win32
|
|
||||||
{B99E1FA1-C30A-45F2-9D57-9E9C21B2DF42}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{B99E1FA1-C30A-45F2-9D57-9E9C21B2DF42}.Release|x64.Build.0 = Release|x64
|
|
||||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Win32.Build.0 = Debug|Win32
|
|
||||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.Build.0 = Debug|x64
|
|
||||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Win32.ActiveCfg = Release|Win32
|
|
||||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Win32.Build.0 = Release|Win32
|
|
||||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.Build.0 = Release|x64
|
|
||||||
{13342092-1CC5-4994-A03C-3963197E8016}.Debug|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{13342092-1CC5-4994-A03C-3963197E8016}.Debug|Win32.Build.0 = Debug|Win32
|
|
||||||
{13342092-1CC5-4994-A03C-3963197E8016}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{13342092-1CC5-4994-A03C-3963197E8016}.Debug|x64.Build.0 = Debug|x64
|
|
||||||
{13342092-1CC5-4994-A03C-3963197E8016}.Release|Win32.ActiveCfg = Release|Win32
|
|
||||||
{13342092-1CC5-4994-A03C-3963197E8016}.Release|Win32.Build.0 = Release|Win32
|
|
||||||
{13342092-1CC5-4994-A03C-3963197E8016}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{13342092-1CC5-4994-A03C-3963197E8016}.Release|x64.Build.0 = Release|x64
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
|
||||||
HideSolutionNode = FALSE
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
|
||||||
@@ -1,18 +1,12 @@
|
|||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
--- Visual Studio 2013/15/17/22 Template Project for C++/DirectX11 Application
|
--- Visual Studio 2013/15/17 Template Project for C++/DirectX11 Application ---
|
||||||
--- Marc Treib, Florian Ferstl, Sept 2013 -------------------------------------
|
--- Marc Treib, Florian Ferstl, Sept 2013 -------------------------------------
|
||||||
--- Updated: Florian Ferstl, Sept 2014 ----------------------------------------
|
--- Updated: Florian Ferstl, Sept 2014 ----------------------------------------
|
||||||
--- Updated: Mina Saad Aziz, May 2016 -----------------------------------------
|
--- Updated: Mina Saad Aziz, May 2016 -----------------------------------------
|
||||||
--- Updated: Mengyu Chu, Nov 2017 ------------------------------------------
|
--- Updated: Mengyu Chu, Nov 2017 ------------------------------------------
|
||||||
--- Updated: You Xie, Nov 2019 ---------------------------------------------
|
--- Updated: You Xie, Nov 2019 ---------------------------------------------
|
||||||
--- Updated: Rene Winchenbach, Felix Koehler, Oct 2023 ---------------------
|
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
|
||||||
!Important:
|
|
||||||
|
|
||||||
We recommend using the `Template_2022.sln` solution file together with Visual
|
|
||||||
Studio 2022 Community Edition.
|
|
||||||
|
|
||||||
This solution contains the following components:
|
This solution contains the following components:
|
||||||
|
|
||||||
- AntTweakBar 1.16
|
- AntTweakBar 1.16
|
||||||
|
|||||||
Reference in New Issue
Block a user