microsoft
/
Xbox-ATG-Samples
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Updated for DirectX Tool Kit July 2017 releases

This commit is contained in:
Chuck Walbourn 2017-08-08 13:07:19 -07:00
Родитель b9630e1463
Коммит dbdad0a0b3
70 изменённых файлов: 4344 добавлений и 596 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
.gitignore поставляемый
Просмотреть файл

@ -26,6 +26,8 @@ Debug
Profile
Release
x64
Kits/DirectXTK/Src/Shaders/Compiled/XboxOne*.*
Kits/DirectXTK12/Src/Shaders/Compiled/XboxOne*.*
Samples/Graphics/SimplePBR12/Compiled/
Samples/Tools/errorlookup/errorlookup/project.lock.json
/wiki

2
Kits/DirectXTK/Audio/AudioEngine.cpp
Просмотреть файл

@ -23,8 +23,6 @@ using Microsoft::WRL::ComPtr;
//#define VERBOSE_TRACE
#pragma warning(disable : 4351)
namespace
{
struct EngineCallback : public IXAudio2EngineCallback

185
Kits/DirectXTK/Audio/DirectXTKAudio_Desktop_2015_Win8.vcxproj Normal file
Просмотреть файл

@ -0,0 +1,185 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Inc\Audio.h" />
<ClInclude Include="SoundCommon.h" />
<ClInclude Include="WaveBankReader.h" />
<ClInclude Include="WAVFileReader.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="AudioEngine.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="DynamicSoundEffectInstance.cpp" />
<ClCompile Include="SoundCommon.cpp" />
<ClCompile Include="SoundEffect.cpp" />
<ClCompile Include="SoundEffectInstance.cpp" />
<ClCompile Include="WaveBank.cpp" />
<ClCompile Include="WaveBankReader.cpp" />
<ClCompile Include="WAVFileReader.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{4F150A30-CECB-49D1-8283-6A3F57438CF5}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>DirectXTKAudio</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</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'">
<OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
<IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
<TargetName>DirectXTKAudioWin8</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
<IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
<TargetName>DirectXTKAudioWin8</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
<IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
<TargetName>DirectXTKAudioWin8</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
<IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
<TargetName>DirectXTKAudioWin8</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>EnableAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_WIN32_WINNT=0x0602;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\Inc;..\Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Fast</FloatingPointModel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>EnableAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_WIN32_WINNT=0x0602;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\Inc;..\Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</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=0x0602;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\Inc;..\Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Fast</FloatingPointModel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</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=0x0602;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\Inc;..\Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</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>
</Project>

53
Kits/DirectXTK/Audio/DirectXTKAudio_Desktop_2015_Win8.vcxproj.filters Normal file
Просмотреть файл

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Inc">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Src">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="WaveBankReader.h">
<Filter>Inc</Filter>
</ClInclude>
<ClInclude Include="WAVFileReader.h">
<Filter>Inc</Filter>
</ClInclude>
<ClInclude Include="..\Inc\Audio.h">
<Filter>Inc</Filter>
</ClInclude>
<ClInclude Include="SoundCommon.h">
<Filter>Inc</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="AudioEngine.cpp">
<Filter>Src</Filter>
</ClCompile>
<ClCompile Include="WaveBankReader.cpp">
<Filter>Src</Filter>
</ClCompile>
<ClCompile Include="WAVFileReader.cpp">
<Filter>Src</Filter>
</ClCompile>
<ClCompile Include="SoundEffect.cpp">
<Filter>Src</Filter>
</ClCompile>
<ClCompile Include="WaveBank.cpp">
<Filter>Src</Filter>
</ClCompile>
<ClCompile Include="SoundEffectInstance.cpp">
<Filter>Src</Filter>
</ClCompile>
<ClCompile Include="SoundCommon.cpp">
<Filter>Src</Filter>
</ClCompile>
<ClCompile Include="DynamicSoundEffectInstance.cpp">
<Filter>Src</Filter>
</ClCompile>
</ItemGroup>
</Project>

2
Kits/DirectXTK/Audio/SoundCommon.cpp
Просмотреть файл

@ -11,8 +11,6 @@
// http://go.microsoft.com/fwlink/?LinkId=248929
//--------------------------------------------------------------------------------------
#pragma once
#include "pch.h"
#include "SoundCommon.h"

590
Kits/DirectXTK/DirectXTK_Desktop_2015.vcxproj Normal file
Просмотреть файл

@ -0,0 +1,590 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="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>
<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>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</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_2015\$(Platform)\$(Configuration)\</OutDir>
<IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
<TargetName>DirectXTK</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
<IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
<TargetName>DirectXTK</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
<IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
<TargetName>DirectXTK</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
<IntDir>Bin\Desktop_2015\$(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>
</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>
</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>
</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>
</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>

1170
Kits/DirectXTK/DirectXTK_Desktop_2015.vcxproj.filters Normal file
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

30
Kits/DirectXTK/DirectXTK_Windows10.vcxproj
Просмотреть файл

@ -580,7 +580,7 @@
<FloatingPointModel>Fast</FloatingPointModel>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<WarningLevel>EnableAllWarnings</WarningLevel>
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -589,9 +589,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<Lib>
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@ -602,7 +599,7 @@
<FloatingPointModel>Fast</FloatingPointModel>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<WarningLevel>EnableAllWarnings</WarningLevel>
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -611,9 +608,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<Lib>
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
<ClCompile>
@ -623,7 +617,7 @@
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<WarningLevel>EnableAllWarnings</WarningLevel>
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -632,9 +626,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<Lib>
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
<ClCompile>
@ -644,7 +635,7 @@
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<WarningLevel>EnableAllWarnings</WarningLevel>
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -653,9 +644,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<Lib>
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@ -665,7 +653,7 @@
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<WarningLevel>EnableAllWarnings</WarningLevel>
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -674,9 +662,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<Lib>
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@ -686,7 +671,7 @@
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<WarningLevel>EnableAllWarnings</WarningLevel>
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -695,9 +680,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<Lib>
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

2
Kits/DirectXTK/Inc/SimpleMath.inl
Просмотреть файл

@ -2384,7 +2384,7 @@ inline Matrix Matrix::CreateConstrainedBillboard( const Vector3& object, const V
{
using namespace DirectX;
static const XMVECTORF32 s_minAngle = { 0.99825467075f, 0.99825467075f, 0.99825467075f, 0.99825467075f }; // 1.0 - XMConvertToRadians( 0.1f );
static const XMVECTORF32 s_minAngle = { { { 0.99825467075f, 0.99825467075f, 0.99825467075f, 0.99825467075f } } }; // 1.0 - XMConvertToRadians( 0.1f );
XMVECTOR O = XMLoadFloat3( &object );
XMVECTOR C = XMLoadFloat3( &cameraPosition );

6
Kits/DirectXTK/Readme.txt
Просмотреть файл

@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 11
Copyright (c) Microsoft Corporation. All rights reserved.
June 21, 2017
July 28, 2017
This package contains the "DirectX Tool Kit", a collection of helper classes for
writing Direct3D 11 C++ code for Universal Windows Platform (UWP) apps for Windows 10,
@ -82,6 +82,10 @@ https://opensource.microsoft.com/codeofconduct/
RELEASE HISTORY
---------------
July 28, 2017
Fix for WIC writer when codec target format requires a palette
Code cleanup
June 21, 2017
Post-processing support
SDKMESH loader fix when loading legacy files with all zero materials

13
Kits/DirectXTK/Src/AlphaTestEffect.cpp
Просмотреть файл

@ -87,6 +87,7 @@ namespace
}
template<>
const ShaderBytecode EffectBase<AlphaTestEffectTraits>::VertexShaderBytecode[] =
{
{ AlphaTestEffect_VSAlphaTest, sizeof(AlphaTestEffect_VSAlphaTest) },
@ -96,6 +97,7 @@ const ShaderBytecode EffectBase<AlphaTestEffectTraits>::VertexShaderBytecode[] =
};
template<>
const int EffectBase<AlphaTestEffectTraits>::VertexShaderIndices[] =
{
0, // lt/gt
@ -110,6 +112,7 @@ const int EffectBase<AlphaTestEffectTraits>::VertexShaderIndices[] =
};
template<>
const ShaderBytecode EffectBase<AlphaTestEffectTraits>::PixelShaderBytecode[] =
{
{ AlphaTestEffect_PSAlphaTestLtGt, sizeof(AlphaTestEffect_PSAlphaTestLtGt) },
@ -119,6 +122,7 @@ const ShaderBytecode EffectBase<AlphaTestEffectTraits>::PixelShaderBytecode[] =
};
template<>
const int EffectBase<AlphaTestEffectTraits>::PixelShaderIndices[] =
{
0, // lt/gt
@ -134,6 +138,7 @@ const int EffectBase<AlphaTestEffectTraits>::PixelShaderIndices[] =
// Global pool of per-device AlphaTestEffect resources.
template<>
SharedResourcePool<ID3D11Device*, EffectBase<AlphaTestEffectTraits>::DeviceResources> EffectBase<AlphaTestEffectTraits>::deviceResourcesPool;
@ -198,10 +203,10 @@ void AlphaTestEffect::Impl::Apply(_In_ ID3D11DeviceContext* deviceContext)
const float threshold = 0.5f / 255.0f;
// What to do if the alpha comparison passes or fails. Positive accepts the pixel, negative clips it.
static const XMVECTORF32 selectIfTrue = { 1, -1 };
static const XMVECTORF32 selectIfFalse = { -1, 1 };
static const XMVECTORF32 selectNever = { -1, -1 };
static const XMVECTORF32 selectAlways = { 1, 1 };
static const XMVECTORF32 selectIfTrue = { { { 1, -1 } } };
static const XMVECTORF32 selectIfFalse = { { { -1, 1 } } };
static const XMVECTORF32 selectNever = { { { -1, -1 } } };
static const XMVECTORF32 selectAlways = { { { 1, 1 } } };
float compareTo;
XMVECTOR resultSelector;

4
Kits/DirectXTK/Src/BasicEffect.cpp
Просмотреть файл

@ -183,6 +183,7 @@ namespace
}
template<>
const ShaderBytecode EffectBase<BasicEffectTraits>::VertexShaderBytecode[] =
{
{ BasicEffect_VSBasic, sizeof(BasicEffect_VSBasic) },
@ -226,6 +227,7 @@ const ShaderBytecode EffectBase<BasicEffectTraits>::VertexShaderBytecode[] =
};
template<>
const int EffectBase<BasicEffectTraits>::VertexShaderIndices[] =
{
0, // basic
@ -293,6 +295,7 @@ const int EffectBase<BasicEffectTraits>::VertexShaderIndices[] =
};
template<>
const ShaderBytecode EffectBase<BasicEffectTraits>::PixelShaderBytecode[] =
{
{ BasicEffect_PSBasic, sizeof(BasicEffect_PSBasic) },
@ -310,6 +313,7 @@ const ShaderBytecode EffectBase<BasicEffectTraits>::PixelShaderBytecode[] =
};
template<>
const int EffectBase<BasicEffectTraits>::PixelShaderIndices[] =
{
0, // basic

13
Kits/DirectXTK/Src/BasicPostProcess.cpp
Просмотреть файл

@ -103,8 +103,8 @@ namespace
{
public:
DeviceResources(_In_ ID3D11Device* device)
: mDevice(device),
stateObjects(device)
: stateObjects(device),
mDevice(device)
{ }
// Gets or lazily creates the vertex shader.
@ -194,9 +194,7 @@ SharedResourcePool<ID3D11Device*, DeviceResources> BasicPostProcess::Impl::devic
// Constructor.
BasicPostProcess::Impl::Impl(_In_ ID3D11Device* device)
: mConstantBuffer(device),
mDeviceResources(deviceResourcesPool.DemandCreate(device)),
fx(BasicPostProcess::Copy),
: fx(BasicPostProcess::Copy),
texWidth(0),
texHeight(0),
guassianMultiplier(1.f),
@ -206,6 +204,8 @@ BasicPostProcess::Impl::Impl(_In_ ID3D11Device* device)
bloomHorizontal(true),
mUseConstants(false),
mDirtyFlags(INT_MAX),
mConstantBuffer(device),
mDeviceResources(deviceResourcesPool.DemandCreate(device)),
constants{}
{
if (device->GetFeatureLevel() < D3D_FEATURE_LEVEL_10_0)
@ -266,6 +266,9 @@ void BasicPostProcess::Impl::Process(_In_ ID3D11DeviceContext* deviceContext, st
case BloomBlur:
Bloom(bloomHorizontal, bloomSize, bloomBrightness);
break;
default:
break;
}
}

8
Kits/DirectXTK/Src/DDSTextureLoader.cpp
Просмотреть файл

@ -30,10 +30,10 @@
using namespace DirectX;
using namespace DirectX::LoaderHelpers;
static_assert(DDS_DIMENSION_TEXTURE1D == D3D11_RESOURCE_DIMENSION_TEXTURE1D, "dds mismatch");
static_assert(DDS_DIMENSION_TEXTURE2D == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "dds mismatch");
static_assert(DDS_DIMENSION_TEXTURE3D == D3D11_RESOURCE_DIMENSION_TEXTURE3D, "dds mismatch");
static_assert(DDS_RESOURCE_MISC_TEXTURECUBE == D3D11_RESOURCE_MISC_TEXTURECUBE, "dds mismatch");
static_assert(static_cast<int>(DDS_DIMENSION_TEXTURE1D) == static_cast<int>(D3D11_RESOURCE_DIMENSION_TEXTURE1D), "dds mismatch");
static_assert(static_cast<int>(DDS_DIMENSION_TEXTURE2D) == static_cast<int>(D3D11_RESOURCE_DIMENSION_TEXTURE2D), "dds mismatch");
static_assert(static_cast<int>(DDS_DIMENSION_TEXTURE3D) == static_cast<int>(D3D11_RESOURCE_DIMENSION_TEXTURE3D), "dds mismatch");
static_assert(static_cast<int>(DDS_RESOURCE_MISC_TEXTURECUBE) == static_cast<int>(D3D11_RESOURCE_MISC_TEXTURECUBE), "dds mismatch");
namespace
{

4
Kits/DirectXTK/Src/DGSLEffect.cpp
Просмотреть файл

@ -228,11 +228,11 @@ public:
specularEnabled(false),
alphaDiscardEnabled(false),
weightsPerVertex( enableSkinning ? 4 : 0 ),
mPixelShader( pixelShader ),
mCBMaterial( device ),
mCBLight( device ),
mCBObject( device ),
mCBMisc( device ),
mPixelShader( pixelShader ),
mDeviceResources( deviceResourcesPool.DemandCreate(device) )
{
static_assert( _countof(DGSLEffectTraits::VertexShaderBytecode) == DGSLEffectTraits::VertexShaderCount, "array/max mismatch" );
@ -930,8 +930,6 @@ void DGSLEffect::ResetBoneTransforms()
auto boneConstant = pImpl->constants.bones.Bones;
XMMATRIX id = XMMatrixIdentity();
for(size_t i = 0; i < MaxBones; ++i)
{
boneConstant[i][0] = g_XMIdentityR0;

2
Kits/DirectXTK/Src/DGSLEffectFactory.cpp
Просмотреть файл

@ -30,8 +30,6 @@ using Microsoft::WRL::ComPtr;
static_assert(DGSLEffect::MaxTextures == DGSLEffectFactory::DGSLEffectInfo::BaseTextureOffset + _countof(DGSLEffectFactory::DGSLEffectInfo::textures), "DGSL supports 8 textures");
#endif
#pragma warning(disable : 4351)
// Internal DGSLEffectFactory implementation class. Only one of these helpers is allocated
// per D3D device, even if there are multiple public facing DGSLEffectFactory instances.
class DGSLEffectFactory::Impl

13
Kits/DirectXTK/Src/DualPostProcess.cpp
Просмотреть файл

@ -79,8 +79,8 @@ namespace
{
public:
DeviceResources(_In_ ID3D11Device* device)
: mDevice(device),
stateObjects(device)
: stateObjects(device),
mDevice(device)
{ }
// Gets or lazily creates the vertex shader.
@ -163,9 +163,7 @@ SharedResourcePool<ID3D11Device*, DeviceResources> DualPostProcess::Impl::device
// Constructor.
DualPostProcess::Impl::Impl(_In_ ID3D11Device* device)
: mConstantBuffer(device),
mDeviceResources(deviceResourcesPool.DemandCreate(device)),
fx(DualPostProcess::Merge),
: fx(DualPostProcess::Merge),
mergeWeight1(0.5f),
mergeWeight2(0.5f),
bloomIntensity(1.25f),
@ -173,6 +171,8 @@ DualPostProcess::Impl::Impl(_In_ ID3D11Device* device)
bloomSaturation(1.f),
bloomBaseSaturation(1.f),
mDirtyFlags(INT_MAX),
mConstantBuffer(device),
mDeviceResources(deviceResourcesPool.DemandCreate(device)),
constants{}
{
if (device->GetFeatureLevel() < D3D_FEATURE_LEVEL_10_0)
@ -222,6 +222,9 @@ void DualPostProcess::Impl::Process(_In_ ID3D11DeviceContext* deviceContext, std
constants.sampleWeights[1] = XMVectorReplicate(bloomBaseIntensity);
constants.sampleWeights[2] = XMVectorReplicate(bloomIntensity);
break;
default:
break;
}
}

5
Kits/DirectXTK/Src/DualTextureEffect.cpp
Просмотреть файл

@ -82,6 +82,7 @@ namespace
}
template<>
const ShaderBytecode EffectBase<DualTextureEffectTraits>::VertexShaderBytecode[] =
{
{ DualTextureEffect_VSDualTexture, sizeof(DualTextureEffect_VSDualTexture) },
@ -92,6 +93,7 @@ const ShaderBytecode EffectBase<DualTextureEffectTraits>::VertexShaderBytecode[]
};
template<>
const int EffectBase<DualTextureEffectTraits>::VertexShaderIndices[] =
{
0, // basic
@ -101,6 +103,7 @@ const int EffectBase<DualTextureEffectTraits>::VertexShaderIndices[] =
};
template<>
const ShaderBytecode EffectBase<DualTextureEffectTraits>::PixelShaderBytecode[] =
{
{ DualTextureEffect_PSDualTexture, sizeof(DualTextureEffect_PSDualTexture) },
@ -109,6 +112,7 @@ const ShaderBytecode EffectBase<DualTextureEffectTraits>::PixelShaderBytecode[]
};
template<>
const int EffectBase<DualTextureEffectTraits>::PixelShaderIndices[] =
{
0, // basic
@ -119,6 +123,7 @@ const int EffectBase<DualTextureEffectTraits>::PixelShaderIndices[] =
// Global pool of per-device DualTextureEffect resources.
template<>
SharedResourcePool<ID3D11Device*, EffectBase<DualTextureEffectTraits>::DeviceResources> EffectBase<DualTextureEffectTraits>::deviceResourcesPool;

34
Kits/DirectXTK/Src/EffectCommon.cpp
Просмотреть файл

@ -73,7 +73,7 @@ void XM_CALLCONV EffectFog::SetConstants(int& dirtyFlags, FXMMATRIX worldView, X
if (start == end)
{
// Degenerate case: force everything to 100% fogged if start and end are the same.
static const XMVECTORF32 fullyFogged = { 0, 0, 0, 1 };
static const XMVECTORF32 fullyFogged = { { { 0, 0, 0, 1 } } };
fogVectorConstant = fullyFogged;
}
@ -151,14 +151,16 @@ EffectLights::EffectLights()
}
#ifdef _PREFAST_
#pragma prefast(push)
#pragma prefast(disable:22103, "PREFAST doesn't understand buffer is bounded by a static const value even with SAL" )
#endif
// Initializes constant buffer fields to match the current lighting state.
_Use_decl_annotations_ void EffectLights::InitializeConstants(XMVECTOR& specularColorAndPowerConstant, XMVECTOR* lightDirectionConstant, XMVECTOR* lightDiffuseConstant, XMVECTOR* lightSpecularConstant) const
{
static const XMVECTORF32 defaultSpecular = { 1, 1, 1, 16 };
static const XMVECTORF32 defaultLightDirection = { 0, -1, 0, 0 };
static const XMVECTORF32 defaultSpecular = { { { 1, 1, 1, 16 } } };
static const XMVECTORF32 defaultLightDirection = { { { 0, -1, 0, 0 } } };
specularColorAndPowerConstant = defaultSpecular;
@ -171,7 +173,9 @@ _Use_decl_annotations_ void EffectLights::InitializeConstants(XMVECTOR& specular
}
}
#ifdef _PREFAST_
#pragma prefast(pop)
#endif
// Lazily recomputes derived parameter values used by shader lighting calculations.
@ -252,8 +256,10 @@ _Use_decl_annotations_ void EffectLights::SetConstants(int& dirtyFlags, EffectMa
}
#ifdef _PREFAST_
#pragma prefast(push)
#pragma prefast(disable:26015, "PREFAST doesn't understand that ValidateLightIndex bounds whichLight" )
#endif
// Helper for turning one of the directional lights on or off.
_Use_decl_annotations_ int EffectLights::SetLightEnabled(int whichLight, bool value, XMVECTOR* lightDiffuseConstant, XMVECTOR* lightSpecularConstant)
@ -323,7 +329,9 @@ int XM_CALLCONV EffectLights::SetLightSpecularColor(int whichLight, FXMVECTOR va
return 0;
}
#ifdef _PREFAST_
#pragma prefast(pop)
#endif
// Parameter validation helper.
@ -341,26 +349,26 @@ void EffectLights::EnableDefaultLighting(_In_ IEffectLights* effect)
{
static const XMVECTORF32 defaultDirections[MaxDirectionalLights] =
{
{ -0.5265408f, -0.5735765f, -0.6275069f },
{ 0.7198464f, 0.3420201f, 0.6040227f },
{ 0.4545195f, -0.7660444f, 0.4545195f },
{ { { -0.5265408f, -0.5735765f, -0.6275069f, 0 } } },
{ { { 0.7198464f, 0.3420201f, 0.6040227f, 0 } } },
{ { { 0.4545195f, -0.7660444f, 0.4545195f, 0 } } },
};
static const XMVECTORF32 defaultDiffuse[MaxDirectionalLights] =
{
{ 1.0000000f, 0.9607844f, 0.8078432f },
{ 0.9647059f, 0.7607844f, 0.4078432f },
{ 0.3231373f, 0.3607844f, 0.3937255f },
{ { { 1.0000000f, 0.9607844f, 0.8078432f, 0 } } },
{ { { 0.9647059f, 0.7607844f, 0.4078432f, 0 } } },
{ { { 0.3231373f, 0.3607844f, 0.3937255f, 0 } } },
};
static const XMVECTORF32 defaultSpecular[MaxDirectionalLights] =
{
{ 1.0000000f, 0.9607844f, 0.8078432f },
{ 0.0000000f, 0.0000000f, 0.0000000f },
{ 0.3231373f, 0.3607844f, 0.3937255f },
{ { { 1.0000000f, 0.9607844f, 0.8078432f, 0 } } },
{ { { 0.0000000f, 0.0000000f, 0.0000000f, 0 } } },
{ { { 0.3231373f, 0.3607844f, 0.3937255f, 0 } } },
};
static const XMVECTORF32 defaultAmbient = { 0.05333332f, 0.09882354f, 0.1819608f };
static const XMVECTORF32 defaultAmbient = { { { 0.05333332f, 0.09882354f, 0.1819608f, 0 } } };
effect->SetLightingEnabled(true);
effect->SetAmbientLightColor(defaultAmbient);

2
Kits/DirectXTK/Src/EffectFactory.cpp
Просмотреть файл

@ -22,8 +22,6 @@
using namespace DirectX;
using Microsoft::WRL::ComPtr;
#pragma warning(disable : 4351)
// Internal EffectFactory implementation class. Only one of these helpers is allocated
// per D3D device, even if there are multiple public facing EffectFactory instances.
class EffectFactory::Impl

4
Kits/DirectXTK/Src/EnvironmentMapEffect.cpp
Просмотреть файл

@ -126,6 +126,7 @@ namespace
}
template<>
const ShaderBytecode EffectBase<EnvironmentMapEffectTraits>::VertexShaderBytecode[] =
{
{ EnvironmentMapEffect_VSEnvMap, sizeof(EnvironmentMapEffect_VSEnvMap) },
@ -142,6 +143,7 @@ const ShaderBytecode EffectBase<EnvironmentMapEffectTraits>::VertexShaderBytecod
};
template<>
const int EffectBase<EnvironmentMapEffectTraits>::VertexShaderIndices[] =
{
0, // basic
@ -192,6 +194,7 @@ const int EffectBase<EnvironmentMapEffectTraits>::VertexShaderIndices[] =
};
template<>
const ShaderBytecode EffectBase<EnvironmentMapEffectTraits>::PixelShaderBytecode[] =
{
{ EnvironmentMapEffect_PSEnvMap, sizeof(EnvironmentMapEffect_PSEnvMap) },
@ -205,6 +208,7 @@ const ShaderBytecode EffectBase<EnvironmentMapEffectTraits>::PixelShaderBytecode
};
template<>
const int EffectBase<EnvironmentMapEffectTraits>::PixelShaderIndices[] =
{
0, // basic

2
Kits/DirectXTK/Src/GeometricPrimitive.cpp
Просмотреть файл

@ -33,7 +33,7 @@ namespace
D3D11_BUFFER_DESC bufferDesc = {};
bufferDesc.ByteWidth = (UINT)data.size() * sizeof(T::value_type);
bufferDesc.ByteWidth = (UINT)data.size() * sizeof(typename T::value_type);
bufferDesc.BindFlags = bindFlags;
bufferDesc.Usage = D3D11_USAGE_DEFAULT;

118
Kits/DirectXTK/Src/Geometry.cpp
Просмотреть файл

@ -81,20 +81,20 @@ void DirectX::ComputeBox(VertexCollection& vertices, IndexCollection& indices, c
static const XMVECTORF32 faceNormals[FaceCount] =
{
{ 0, 0, 1 },
{ 0, 0, -1 },
{ 1, 0, 0 },
{ -1, 0, 0 },
{ 0, 1, 0 },
{ 0, -1, 0 },
{ { { 0, 0, 1, 0 } } },
{ { { 0, 0, -1, 0 } } },
{ { { 1, 0, 0, 0 } } },
{ { { -1, 0, 0, 0 } } },
{ { { 0, 1, 0, 0 } } },
{ { { 0, -1, 0, 0 } } },
};
static const XMVECTORF32 textureCoordinates[4] =
{
{ 1, 0 },
{ 1, 1 },
{ 0, 1 },
{ 0, 0 },
{ { { 1, 0, 0, 0 } } },
{ { { 1, 1, 0, 0 } } },
{ { { 0, 1, 0, 0 } } },
{ { { 0, 0, 0, 0 } } },
};
XMVECTOR tsize = XMLoadFloat3(&size);
@ -546,7 +546,7 @@ namespace
XMScalarSinCos(&dx, &dz, angle);
XMVECTORF32 v = { dx, 0, dz, 0 };
XMVECTORF32 v = { { { dx, 0, dz, 0 } } };
return v;
}
@ -557,7 +557,7 @@ namespace
XMScalarSinCos(&dx, &dz, angle);
XMVECTORF32 v = { dx, 0, dz, 0 };
XMVECTORF32 v = { { { dx, 0, dz, 0 } } };
return v;
}
@ -778,10 +778,10 @@ void DirectX::ComputeTetrahedron(VertexCollection& vertices, IndexCollection& in
static const XMVECTORF32 verts[4] =
{
{ 0.f, 0.f, 1.f },
{ 2.f*SQRT2 / 3.f, 0.f, -1.f / 3.f },
{ -SQRT2 / 3.f, SQRT6 / 3.f, -1.f / 3.f },
{ -SQRT2 / 3.f, -SQRT6 / 3.f, -1.f / 3.f }
{ { { 0.f, 0.f, 1.f, 0 } } },
{ { { 2.f*SQRT2 / 3.f, 0.f, -1.f / 3.f, 0 } } },
{ { { -SQRT2 / 3.f, SQRT6 / 3.f, -1.f / 3.f, 0 } } },
{ { { -SQRT2 / 3.f, -SQRT6 / 3.f, -1.f / 3.f, 0 } } }
};
static const uint32_t faces[4 * 3] =
@ -837,12 +837,12 @@ void DirectX::ComputeOctahedron(VertexCollection& vertices, IndexCollection& ind
static const XMVECTORF32 verts[6] =
{
{ 1, 0, 0 },
{ -1, 0, 0 },
{ 0, 1, 0 },
{ 0, -1, 0 },
{ 0, 0, 1 },
{ 0, 0, -1 }
{ { { 1, 0, 0, 0 } } },
{ { { -1, 0, 0, 0 } } },
{ { { 0, 1, 0, 0 } } },
{ { { 0, -1, 0, 0 } } },
{ { { 0, 0, 1, 0 } } },
{ { { 0, 0, -1, 0 } } }
};
static const uint32_t faces[8 * 3] =
@ -906,26 +906,26 @@ void DirectX::ComputeDodecahedron(VertexCollection& vertices, IndexCollection& i
static const XMVECTORF32 verts[20] =
{
{ a, a, a },
{ a, a, -a },
{ a, -a, a },
{ a, -a, -a },
{ -a, a, a },
{ -a, a, -a },
{ -a, -a, a },
{ -a, -a, -a },
{ b, c, 0 },
{ -b, c, 0 },
{ b, -c, 0 },
{ -b, -c, 0 },
{ c, 0, b },
{ c, 0, -b },
{ -c, 0, b },
{ -c, 0, -b },
{ 0, b, c },
{ 0, -b, c },
{ 0, b, -c },
{ 0, -b, -c }
{ { { a, a, a, 0 } } },
{ { { a, a, -a, 0 } } },
{ { { a, -a, a, 0 } } },
{ { { a, -a, -a, 0 } } },
{ { { -a, a, a, 0 } } },
{ { { -a, a, -a, 0 } } },
{ { { -a, -a, a, 0 } } },
{ { { -a, -a, -a, 0 } } },
{ { { b, c, 0, 0 } } },
{ { { -b, c, 0, 0 } } },
{ { { b, -c, 0, 0 } } },
{ { { -b, -c, 0, 0 } } },
{ { { c, 0, b, 0 } } },
{ { { c, 0, -b, 0 } } },
{ { { -c, 0, b, 0 } } },
{ { { -c, 0, -b, 0 } } },
{ { { 0, b, c, 0 } } },
{ { { 0, -b, c, 0 } } },
{ { { 0, b, -c, 0 } } },
{ { { 0, -b, -c, 0 } } }
};
static const uint32_t faces[12 * 5] =
@ -946,11 +946,11 @@ void DirectX::ComputeDodecahedron(VertexCollection& vertices, IndexCollection& i
static const XMVECTORF32 textureCoordinates[5] =
{
{ 0.654508f, 0.0244717f },
{ 0.0954915f, 0.206107f },
{ 0.0954915f, 0.793893f },
{ 0.654508f, 0.975528f },
{ 1.f, 0.5f }
{ { { 0.654508f, 0.0244717f, 0, 0 } } },
{ { { 0.0954915f, 0.206107f, 0, 0 } } },
{ { { 0.0954915f, 0.793893f, 0, 0 } } },
{ { { 0.654508f, 0.975528f, 0, 0 } } },
{ { { 1.f, 0.5f, 0, 0 } } }
};
static const uint32_t textureIndex[12][5] =
@ -1035,18 +1035,18 @@ void DirectX::ComputeIcosahedron(VertexCollection& vertices, IndexCollection& in
static const XMVECTORF32 verts[12] =
{
{ t / t2, 1.f / t2, 0 },
{ -t / t2, 1.f / t2, 0 },
{ t / t2, -1.f / t2, 0 },
{ -t / t2, -1.f / t2, 0 },
{ 1.f / t2, 0, t / t2 },
{ 1.f / t2, 0, -t / t2 },
{ -1.f / t2, 0, t / t2 },
{ -1.f / t2, 0, -t / t2 },
{ 0, t / t2, 1.f / t2 },
{ 0, -t / t2, 1.f / t2 },
{ 0, t / t2, -1.f / t2 },
{ 0, -t / t2, -1.f / t2 }
{ { { t / t2, 1.f / t2, 0, 0 } } },
{ { { -t / t2, 1.f / t2, 0, 0 } } },
{ { { t / t2, -1.f / t2, 0, 0 } } },
{ { { -t / t2, -1.f / t2, 0, 0 } } },
{ { { 1.f / t2, 0, t / t2, 0 } } },
{ { { 1.f / t2, 0, -t / t2, 0 } } },
{ { { -1.f / t2, 0, t / t2, 0 } } },
{ { { -1.f / t2, 0, -t / t2, 0 } } },
{ { { 0, t / t2, 1.f / t2, 0 } } },
{ { { 0, -t / t2, 1.f / t2, 0 } } },
{ { { 0, t / t2, -1.f / t2, 0 } } },
{ { { 0, -t / t2, -1.f / t2, 0 } } }
};
static const uint32_t faces[20 * 3] =

8
Kits/DirectXTK/Src/LoaderHelpers.h
Просмотреть файл

@ -485,6 +485,9 @@ namespace DirectX
break;
#endif
default:
break;
}
if (bc)
@ -803,6 +806,9 @@ namespace DirectX
case DDS_ALPHA_MODE_OPAQUE:
case DDS_ALPHA_MODE_CUSTOM:
return mode;
default:
break;
}
}
else if ((MAKEFOURCC('D', 'X', 'T', '2') == header->ddspf.fourCC)
@ -843,7 +849,7 @@ namespace DirectX
class auto_delete_file_wic
{
public:
auto_delete_file_wic(Microsoft::WRL::ComPtr<IWICStream>& hFile, LPCWSTR szFile) : m_handle(hFile), m_filename(szFile) {}
auto_delete_file_wic(Microsoft::WRL::ComPtr<IWICStream>& hFile, LPCWSTR szFile) : m_filename(szFile), m_handle(hFile) {}
auto_delete_file_wic(const auto_delete_file_wic&) = delete;
auto_delete_file_wic& operator=(const auto_delete_file_wic&) = delete;

8
Kits/DirectXTK/Src/NormalMapEffect.cpp
Просмотреть файл

@ -101,6 +101,7 @@ namespace
}
template<>
const ShaderBytecode EffectBase<NormalMapEffectTraits>::VertexShaderBytecode[] =
{
{ NormalMapEffect_VSNormalPixelLightingTx, sizeof(NormalMapEffect_VSNormalPixelLightingTx) },
@ -111,6 +112,7 @@ const ShaderBytecode EffectBase<NormalMapEffectTraits>::VertexShaderBytecode[] =
};
template<>
const int EffectBase<NormalMapEffectTraits>::VertexShaderIndices[] =
{
0, // pixel lighting + texture
@ -135,6 +137,7 @@ const int EffectBase<NormalMapEffectTraits>::VertexShaderIndices[] =
};
template<>
const ShaderBytecode EffectBase<NormalMapEffectTraits>::PixelShaderBytecode[] =
{
{ NormalMapEffect_PSNormalPixelLightingTx, sizeof(NormalMapEffect_PSNormalPixelLightingTx) },
@ -144,6 +147,7 @@ const ShaderBytecode EffectBase<NormalMapEffectTraits>::PixelShaderBytecode[] =
};
template<>
const int EffectBase<NormalMapEffectTraits>::PixelShaderIndices[] =
{
0, // pixel lighting + texture
@ -169,6 +173,7 @@ const int EffectBase<NormalMapEffectTraits>::PixelShaderIndices[] =
// Global pool of per-device NormalMapEffect resources.
template<>
SharedResourcePool<ID3D11Device*, EffectBase<NormalMapEffectTraits>::DeviceResources> EffectBase<NormalMapEffectTraits>::deviceResourcesPool;
@ -387,10 +392,9 @@ void NormalMapEffect::SetLightingEnabled(bool value)
}
void NormalMapEffect::SetPerPixelLighting(bool value)
void NormalMapEffect::SetPerPixelLighting(bool)
{
// Unsupported interface method.
(value);
}

4
Kits/DirectXTK/Src/PlatformHelpers.h
Просмотреть файл

@ -30,7 +30,7 @@ namespace DirectX
virtual const char* what() const override
{
static char s_str[64] = {};
sprintf_s(s_str, "Failure with HRESULT of %08X", result);
sprintf_s(s_str, "Failure with HRESULT of %08X", static_cast<unsigned int>(result));
return s_str;
}
@ -74,7 +74,7 @@ namespace DirectX
struct handle_closer { void operator()(HANDLE h) { if (h) CloseHandle(h); } };
typedef public std::unique_ptr<void, handle_closer> ScopedHandle;
typedef std::unique_ptr<void, handle_closer> ScopedHandle;
inline HANDLE safe_handle( HANDLE h ) { return (h == INVALID_HANDLE_VALUE) ? 0 : h; }
}

11
Kits/DirectXTK/Src/Shaders/CompileShaders.cmd
Просмотреть файл

@ -15,6 +15,13 @@ echo usage: CompileShaders [xbox]
exit /b
:continuexbox
set XBOXOPTS=/D__XBOX_DISABLE_SHADER_NAME_EMPLACEMENT
if NOT %2.==noprecompile. goto skipnoprecompile
set XBOXOPTS=%XBOXOPTS% /D__XBOX_DISABLE_PRECOMPILE=1
:skipnoprecompile
set XBOXFXC="%XboxOneXDKLatest%\xdk\FXC\amd64\FXC.exe"
if exist %XBOXFXC% goto continue
set XBOXFXC="%XboxOneXDKLatest%xdk\FXC\amd64\FXC.exe"
if exist %XBOXFXC% goto continue
set XBOXFXC="%XboxOneXDKBuild%xdk\FXC\amd64\FXC.exe"
@ -242,14 +249,14 @@ exit /b
:CompileShaderxbox
:CompileShaderSM4xbox
set fxc=%XBOXFXC% /nologo %1.fx /T%2_5_0 /Zpc /Zi /Qstrip_reflect /Qstrip_debug /D__XBOX_DISABLE_SHADER_NAME_EMPLACEMENT /E%3 /FhCompiled\XboxOne%1_%3.inc /FdCompiled\XboxOne%1_%3.pdb /Vn%1_%3
set fxc=%XBOXFXC% /nologo %1.fx /T%2_5_0 /Zpc /Zi /Qstrip_reflect /Qstrip_debug %XBOXOPTS% /E%3 /FhCompiled\XboxOne%1_%3.inc /FdCompiled\XboxOne%1_%3.pdb /Vn%1_%3
echo.
echo %fxc%
%fxc% || set error=1
exit /b
:CompileShaderHLSLxbox
set fxc=%XBOXFXC% /nologo %1.hlsl /T%2_5_0 /Zpc /Zi /Qstrip_reflect /Qstrip_debug /D__XBOX_DISABLE_SHADER_NAME_EMPLACEMENT /E%3 /FhCompiled\XboxOne%1_%3.inc /FdCompiled\XboxOne%1_%3.pdb /Vn%1_%3
set fxc=%XBOXFXC% /nologo %1.hlsl /T%2_5_0 /Zpc /Zi /Qstrip_reflect /Qstrip_debug %XBOXOPTS% /E%3 /FhCompiled\XboxOne%1_%3.inc /FdCompiled\XboxOne%1_%3.pdb /Vn%1_%3
echo.
echo %fxc%
%fxc% || set error=1

6
Kits/DirectXTK/Src/SharedResourcePool.h
Просмотреть файл

@ -78,9 +78,9 @@ namespace DirectX
struct WrappedData : public TData
{
WrappedData(TKey key, std::shared_ptr<ResourceMap> const& resourceMap, TConstructorArgs... args)
: mKey(key),
mResourceMap(resourceMap),
TData(key, args...)
: TData(key, args...),
mKey(key),
mResourceMap(resourceMap)
{ }
~WrappedData()

7
Kits/DirectXTK/Src/SkinnedEffect.cpp
Просмотреть файл

@ -135,6 +135,7 @@ namespace
}
template<>
const ShaderBytecode EffectBase<SkinnedEffectTraits>::VertexShaderBytecode[] =
{
{ SkinnedEffect_VSSkinnedVertexLightingOneBone, sizeof(SkinnedEffect_VSSkinnedVertexLightingOneBone) },
@ -164,6 +165,7 @@ const ShaderBytecode EffectBase<SkinnedEffectTraits>::VertexShaderBytecode[] =
};
template<>
const int EffectBase<SkinnedEffectTraits>::VertexShaderIndices[] =
{
0, // vertex lighting, one bone
@ -210,6 +212,7 @@ const int EffectBase<SkinnedEffectTraits>::VertexShaderIndices[] =
};
template<>
const ShaderBytecode EffectBase<SkinnedEffectTraits>::PixelShaderBytecode[] =
{
{ SkinnedEffect_PSSkinnedVertexLighting, sizeof(SkinnedEffect_PSSkinnedVertexLighting) },
@ -218,6 +221,7 @@ const ShaderBytecode EffectBase<SkinnedEffectTraits>::PixelShaderBytecode[] =
};
template<>
const int EffectBase<SkinnedEffectTraits>::PixelShaderIndices[] =
{
0, // vertex lighting, one bone
@ -265,6 +269,7 @@ const int EffectBase<SkinnedEffectTraits>::PixelShaderIndices[] =
// Global pool of per-device SkinnedEffect resources.
template<>
SharedResourcePool<ID3D11Device*, EffectBase<SkinnedEffectTraits>::DeviceResources> EffectBase<SkinnedEffectTraits>::deviceResourcesPool;
@ -629,8 +634,6 @@ void SkinnedEffect::ResetBoneTransforms()
{
auto boneConstant = pImpl->constants.bones;
XMMATRIX id = XMMatrixIdentity();
for(size_t i = 0; i < MaxBones; ++i)
{
boneConstant[i][0] = g_XMIdentityR0;

13
Kits/DirectXTK/Src/SpriteBatch.cpp
Просмотреть файл

@ -493,7 +493,7 @@ void XM_CALLCONV SpriteBatch::Impl::Draw(ID3D11ShaderResourceView* texture,
else
{
// No explicit source region, so use the entire texture.
static const XMVECTORF32 wholeTexture = { 0, 0, 1, 1 };
static const XMVECTORF32 wholeTexture = { { { 0, 0, 1, 1 } } };
XMStoreFloat4A(&sprite->source, wholeTexture);
}
@ -699,6 +699,9 @@ void SpriteBatch::Impl::SortSprites()
return x->originRotationDepth.w < y->originRotationDepth.w;
});
break;
default:
break;
}
}
@ -871,10 +874,10 @@ void XM_CALLCONV SpriteBatch::Impl::RenderSprite(SpriteInfo const* sprite,
// The four corner vertices are computed by transforming these unit-square positions.
static XMVECTORF32 cornerOffsets[VerticesPerSprite] =
{
{ 0, 0 },
{ 1, 0 },
{ 0, 1 },
{ 1, 1 },
{ { { 0, 0, 0, 0 } } },
{ { { 1, 0, 0, 0 } } },
{ { { 0, 1, 0, 0 } } },
{ { { 1, 1, 0, 0 } } },
};
// Tricksy alert! Texture coordinates are computed from the same cornerOffsets

16
Kits/DirectXTK/Src/SpriteFont.cpp
Просмотреть файл

@ -300,19 +300,19 @@ void XM_CALLCONV SpriteFont::DrawString(_In_ SpriteBatch* spriteBatch, _In_z_ wc
// Lookup table indicates which way to move along each axis per SpriteEffects enum value.
static XMVECTORF32 axisDirectionTable[4] =
{
{ -1, -1 },
{ 1, -1 },
{ -1, 1 },
{ 1, 1 },
{ { { -1, -1, 0, 0 } } },
{ { { 1, -1, 0, 0 } } },
{ { { -1, 1, 0, 0 } } },
{ { { 1, 1, 0, 0 } } },
};
// Lookup table indicates which axes are mirrored for each SpriteEffects enum value.
static XMVECTORF32 axisIsMirroredTable[4] =
{
{ 0, 0 },
{ 1, 0 },
{ 0, 1 },
{ 1, 1 },
{ { { 0, 0, 0, 0 } } },
{ { { 1, 0, 0, 0 } } },
{ { { 0, 1, 0, 0 } } },
{ { { 1, 1, 0, 0 } } },
};
XMVECTOR baseOffset = origin;

254
Kits/DirectXTK/Src/TeapotData.inc
Просмотреть файл

@ -55,131 +55,131 @@ const TeapotPatch TeapotPatches[] =
// Static array defines the control point positions that make up the teapot.
const DirectX::XMVECTORF32 TeapotControlPoints[] =
{
{ 0, 0.345f, -0.05f },
{ -0.028f, 0.345f, -0.05f },
{ -0.05f, 0.345f, -0.028f },
{ -0.05f, 0.345f, -0 },
{ 0, 0.3028125f, -0.334375f },
{ -0.18725f, 0.3028125f, -0.334375f },
{ -0.334375f, 0.3028125f, -0.18725f },
{ -0.334375f, 0.3028125f, -0 },
{ 0, 0.3028125f, -0.359375f },
{ -0.20125f, 0.3028125f, -0.359375f },
{ -0.359375f, 0.3028125f, -0.20125f },
{ -0.359375f, 0.3028125f, -0 },
{ 0, 0.27f, -0.375f },
{ -0.21f, 0.27f, -0.375f },
{ -0.375f, 0.27f, -0.21f },
{ -0.375f, 0.27f, -0 },
{ 0, 0.13875f, -0.4375f },
{ -0.245f, 0.13875f, -0.4375f },
{ -0.4375f, 0.13875f, -0.245f },
{ -0.4375f, 0.13875f, -0 },
{ 0, 0.007499993f, -0.5f },
{ -0.28f, 0.007499993f, -0.5f },
{ -0.5f, 0.007499993f, -0.28f },
{ -0.5f, 0.007499993f, -0 },
{ 0, -0.105f, -0.5f },
{ -0.28f, -0.105f, -0.5f },
{ -0.5f, -0.105f, -0.28f },
{ -0.5f, -0.105f, -0 },
{ 0, -0.105f, 0.5f },
{ 0, -0.2175f, -0.5f },
{ -0.28f, -0.2175f, -0.5f },
{ -0.5f, -0.2175f, -0.28f },
{ -0.5f, -0.2175f, -0 },
{ 0, -0.27375f, -0.375f },
{ -0.21f, -0.27375f, -0.375f },
{ -0.375f, -0.27375f, -0.21f },
{ -0.375f, -0.27375f, -0 },
{ 0, -0.2925f, -0.375f },
{ -0.21f, -0.2925f, -0.375f },
{ -0.375f, -0.2925f, -0.21f },
{ -0.375f, -0.2925f, -0 },
{ 0, 0.17625f, 0.4f },
{ -0.075f, 0.17625f, 0.4f },
{ -0.075f, 0.2325f, 0.375f },
{ 0, 0.2325f, 0.375f },
{ 0, 0.17625f, 0.575f },
{ -0.075f, 0.17625f, 0.575f },
{ -0.075f, 0.2325f, 0.625f },
{ 0, 0.2325f, 0.625f },
{ 0, 0.17625f, 0.675f },
{ -0.075f, 0.17625f, 0.675f },
{ -0.075f, 0.2325f, 0.75f },
{ 0, 0.2325f, 0.75f },
{ 0, 0.12f, 0.675f },
{ -0.075f, 0.12f, 0.675f },
{ -0.075f, 0.12f, 0.75f },
{ 0, 0.12f, 0.75f },
{ 0, 0.06375f, 0.675f },
{ -0.075f, 0.06375f, 0.675f },
{ -0.075f, 0.007499993f, 0.75f },
{ 0, 0.007499993f, 0.75f },
{ 0, -0.04875001f, 0.625f },
{ -0.075f, -0.04875001f, 0.625f },
{ -0.075f, -0.09562501f, 0.6625f },
{ 0, -0.09562501f, 0.6625f },
{ -0.075f, -0.105f, 0.5f },
{ -0.075f, -0.18f, 0.475f },
{ 0, -0.18f, 0.475f },
{ 0, 0.02624997f, -0.425f },
{ -0.165f, 0.02624997f, -0.425f },
{ -0.165f, -0.18f, -0.425f },
{ 0, -0.18f, -0.425f },
{ 0, 0.02624997f, -0.65f },
{ -0.165f, 0.02624997f, -0.65f },
{ -0.165f, -0.12375f, -0.775f },
{ 0, -0.12375f, -0.775f },
{ 0, 0.195f, -0.575f },
{ -0.0625f, 0.195f, -0.575f },
{ -0.0625f, 0.17625f, -0.6f },
{ 0, 0.17625f, -0.6f },
{ 0, 0.27f, -0.675f },
{ -0.0625f, 0.27f, -0.675f },
{ -0.0625f, 0.27f, -0.825f },
{ 0, 0.27f, -0.825f },
{ 0, 0.28875f, -0.7f },
{ -0.0625f, 0.28875f, -0.7f },
{ -0.0625f, 0.2934375f, -0.88125f },
{ 0, 0.2934375f, -0.88125f },
{ 0, 0.28875f, -0.725f },
{ -0.0375f, 0.28875f, -0.725f },
{ -0.0375f, 0.298125f, -0.8625f },
{ 0, 0.298125f, -0.8625f },
{ 0, 0.27f, -0.7f },
{ -0.0375f, 0.27f, -0.7f },
{ -0.0375f, 0.27f, -0.8f },
{ 0, 0.27f, -0.8f },
{ 0, 0.4575f, -0 },
{ 0, 0.4575f, -0.2f },
{ -0.1125f, 0.4575f, -0.2f },
{ -0.2f, 0.4575f, -0.1125f },
{ -0.2f, 0.4575f, -0 },
{ 0, 0.3825f, -0 },
{ 0, 0.27f, -0.35f },
{ -0.196f, 0.27f, -0.35f },
{ -0.35f, 0.27f, -0.196f },
{ -0.35f, 0.27f, -0 },
{ 0, 0.3075f, -0.1f },
{ -0.056f, 0.3075f, -0.1f },
{ -0.1f, 0.3075f, -0.056f },
{ -0.1f, 0.3075f, -0 },
{ 0, 0.3075f, -0.325f },
{ -0.182f, 0.3075f, -0.325f },
{ -0.325f, 0.3075f, -0.182f },
{ -0.325f, 0.3075f, -0 },
{ 0, 0.27f, -0.325f },
{ -0.182f, 0.27f, -0.325f },
{ -0.325f, 0.27f, -0.182f },
{ -0.325f, 0.27f, -0 },
{ 0, -0.33f, -0 },
{ -0.1995f, -0.33f, -0.35625f },
{ 0, -0.31125f, -0.375f },
{ 0, -0.33f, -0.35625f },
{ -0.35625f, -0.33f, -0.1995f },
{ -0.375f, -0.31125f, -0 },
{ -0.35625f, -0.33f, -0 },
{ -0.21f, -0.31125f, -0.375f },
{ -0.375f, -0.31125f, -0.21f },
{ { { 0, 0.345f, -0.05f, 0 } } },
{ { { -0.028f, 0.345f, -0.05f, 0 } } },
{ { { -0.05f, 0.345f, -0.028f, 0 } } },
{ { { -0.05f, 0.345f, -0, 0 } } },
{ { { 0, 0.3028125f, -0.334375f, 0 } } },
{ { { -0.18725f, 0.3028125f, -0.334375f, 0 } } },
{ { { -0.334375f, 0.3028125f, -0.18725f, 0 } } },
{ { { -0.334375f, 0.3028125f, -0, 0 } } },
{ { { 0, 0.3028125f, -0.359375f, 0 } } },
{ { { -0.20125f, 0.3028125f, -0.359375f, 0 } } },
{ { { -0.359375f, 0.3028125f, -0.20125f, 0 } } },
{ { { -0.359375f, 0.3028125f, -0, 0 } } },
{ { { 0, 0.27f, -0.375f, 0 } } },
{ { { -0.21f, 0.27f, -0.375f, 0 } } },
{ { { -0.375f, 0.27f, -0.21f, 0 } } },
{ { { -0.375f, 0.27f, -0, 0 } } },
{ { { 0, 0.13875f, -0.4375f, 0 } } },
{ { { -0.245f, 0.13875f, -0.4375f, 0 } } },
{ { { -0.4375f, 0.13875f, -0.245f, 0 } } },
{ { { -0.4375f, 0.13875f, -0, 0 } } },
{ { { 0, 0.007499993f, -0.5f, 0 } } },
{ { { -0.28f, 0.007499993f, -0.5f, 0 } } },
{ { { -0.5f, 0.007499993f, -0.28f, 0 } } },
{ { { -0.5f, 0.007499993f, -0, 0 } } },
{ { { 0, -0.105f, -0.5f, 0 } } },
{ { { -0.28f, -0.105f, -0.5f, 0 } } },
{ { { -0.5f, -0.105f, -0.28f, 0 } } },
{ { { -0.5f, -0.105f, -0, 0 } } },
{ { { 0, -0.105f, 0.5f, 0 } } },
{ { { 0, -0.2175f, -0.5f, 0 } } },
{ { { -0.28f, -0.2175f, -0.5f, 0 } } },
{ { { -0.5f, -0.2175f, -0.28f, 0 } } },
{ { { -0.5f, -0.2175f, -0, 0 } } },
{ { { 0, -0.27375f, -0.375f, 0 } } },
{ { { -0.21f, -0.27375f, -0.375f, 0 } } },
{ { { -0.375f, -0.27375f, -0.21f, 0 } } },
{ { { -0.375f, -0.27375f, -0, 0 } } },
{ { { 0, -0.2925f, -0.375f, 0 } } },
{ { { -0.21f, -0.2925f, -0.375f, 0 } } },
{ { { -0.375f, -0.2925f, -0.21f, 0 } } },
{ { { -0.375f, -0.2925f, -0, 0 } } },
{ { { 0, 0.17625f, 0.4f, 0 } } },
{ { { -0.075f, 0.17625f, 0.4f, 0 } } },
{ { { -0.075f, 0.2325f, 0.375f, 0 } } },
{ { { 0, 0.2325f, 0.375f, 0 } } },
{ { { 0, 0.17625f, 0.575f, 0 } } },
{ { { -0.075f, 0.17625f, 0.575f, 0 } } },
{ { { -0.075f, 0.2325f, 0.625f, 0 } } },
{ { { 0, 0.2325f, 0.625f, 0 } } },
{ { { 0, 0.17625f, 0.675f, 0 } } },
{ { { -0.075f, 0.17625f, 0.675f, 0 } } },
{ { { -0.075f, 0.2325f, 0.75f, 0 } } },
{ { { 0, 0.2325f, 0.75f, 0 } } },
{ { { 0, 0.12f, 0.675f, 0 } } },
{ { { -0.075f, 0.12f, 0.675f, 0 } } },
{ { { -0.075f, 0.12f, 0.75f, 0 } } },
{ { { 0, 0.12f, 0.75f, 0 } } },
{ { { 0, 0.06375f, 0.675f, 0 } } },
{ { { -0.075f, 0.06375f, 0.675f, 0 } } },
{ { { -0.075f, 0.007499993f, 0.75f, 0 } } },
{ { { 0, 0.007499993f, 0.75f, 0 } } },
{ { { 0, -0.04875001f, 0.625f, 0 } } },
{ { { -0.075f, -0.04875001f, 0.625f, 0 } } },
{ { { -0.075f, -0.09562501f, 0.6625f, 0 } } },
{ { { 0, -0.09562501f, 0.6625f, 0 } } },
{ { { -0.075f, -0.105f, 0.5f, 0 } } },
{ { { -0.075f, -0.18f, 0.475f, 0 } } },
{ { { 0, -0.18f, 0.475f, 0 } } },
{ { { 0, 0.02624997f, -0.425f, 0 } } },
{ { { -0.165f, 0.02624997f, -0.425f, 0 } } },
{ { { -0.165f, -0.18f, -0.425f, 0 } } },
{ { { 0, -0.18f, -0.425f, 0 } } },
{ { { 0, 0.02624997f, -0.65f, 0 } } },
{ { { -0.165f, 0.02624997f, -0.65f, 0 } } },
{ { { -0.165f, -0.12375f, -0.775f, 0 } } },
{ { { 0, -0.12375f, -0.775f, 0 } } },
{ { { 0, 0.195f, -0.575f, 0 } } },
{ { { -0.0625f, 0.195f, -0.575f, 0 } } },
{ { { -0.0625f, 0.17625f, -0.6f, 0 } } },
{ { { 0, 0.17625f, -0.6f, 0 } } },
{ { { 0, 0.27f, -0.675f, 0 } } },
{ { { -0.0625f, 0.27f, -0.675f, 0 } } },
{ { { -0.0625f, 0.27f, -0.825f, 0 } } },
{ { { 0, 0.27f, -0.825f, 0 } } },
{ { { 0, 0.28875f, -0.7f, 0 } } },
{ { { -0.0625f, 0.28875f, -0.7f, 0 } } },
{ { { -0.0625f, 0.2934375f, -0.88125f, 0 } } },
{ { { 0, 0.2934375f, -0.88125f, 0 } } },
{ { { 0, 0.28875f, -0.725f, 0 } } },
{ { { -0.0375f, 0.28875f, -0.725f, 0 } } },
{ { { -0.0375f, 0.298125f, -0.8625f, 0 } } },
{ { { 0, 0.298125f, -0.8625f, 0 } } },
{ { { 0, 0.27f, -0.7f, 0 } } },
{ { { -0.0375f, 0.27f, -0.7f, 0 } } },
{ { { -0.0375f, 0.27f, -0.8f, 0 } } },
{ { { 0, 0.27f, -0.8f, 0 } } },
{ { { 0, 0.4575f, -0, 0 } } },
{ { { 0, 0.4575f, -0.2f, 0 } } },
{ { { -0.1125f, 0.4575f, -0.2f, 0 } } },
{ { { -0.2f, 0.4575f, -0.1125f, 0 } } },
{ { { -0.2f, 0.4575f, -0, 0 } } },
{ { { 0, 0.3825f, -0, 0 } } },
{ { { 0, 0.27f, -0.35f, 0 } } },
{ { { -0.196f, 0.27f, -0.35f, 0 } } },
{ { { -0.35f, 0.27f, -0.196f, 0 } } },
{ { { -0.35f, 0.27f, -0, 0 } } },
{ { { 0, 0.3075f, -0.1f, 0 } } },
{ { { -0.056f, 0.3075f, -0.1f, 0 } } },
{ { { -0.1f, 0.3075f, -0.056f, 0 } } },
{ { { -0.1f, 0.3075f, -0, 0 } } },
{ { { 0, 0.3075f, -0.325f, 0 } } },
{ { { -0.182f, 0.3075f, -0.325f, 0 } } },
{ { { -0.325f, 0.3075f, -0.182f, 0 } } },
{ { { -0.325f, 0.3075f, -0, 0 } } },
{ { { 0, 0.27f, -0.325f, 0 } } },
{ { { -0.182f, 0.27f, -0.325f, 0 } } },
{ { { -0.325f, 0.27f, -0.182f, 0 } } },
{ { { -0.325f, 0.27f, -0, 0 } } },
{ { { 0, -0.33f, -0, 0 } } },
{ { { -0.1995f, -0.33f, -0.35625f, 0 } } },
{ { { 0, -0.31125f, -0.375f, 0 } } },
{ { { 0, -0.33f, -0.35625f, 0 } } },
{ { { -0.35625f, -0.33f, -0.1995f, 0 } } },
{ { { -0.375f, -0.31125f, -0, 0 } } },
{ { { -0.35625f, -0.33f, -0, 0 } } },
{ { { -0.21f, -0.31125f, -0.375f, 0 } } },
{ { { -0.375f, -0.31125f, -0.21f, 0 } } },
};

10
Kits/DirectXTK/Src/ToneMapPostProcess.cpp
Просмотреть файл

@ -166,8 +166,8 @@ namespace
{
public:
DeviceResources(_In_ ID3D11Device* device)
: mDevice(device),
stateObjects(device)
: stateObjects(device),
mDevice(device)
{ }
// Gets or lazily creates the vertex shader.
@ -253,14 +253,14 @@ SharedResourcePool<ID3D11Device*, DeviceResources> ToneMapPostProcess::Impl::dev
// Constructor.
ToneMapPostProcess::Impl::Impl(_In_ ID3D11Device* device)
: mConstantBuffer(device),
mDeviceResources(deviceResourcesPool.DemandCreate(device)),
linearExposure(1.f),
: linearExposure(1.f),
paperWhiteNits(200.f),
op(None),
func(Linear),
mrt(false),
mDirtyFlags(INT_MAX),
mConstantBuffer(device),
mDeviceResources(deviceResourcesPool.DemandCreate(device)),
constants{}
{
if (device->GetFeatureLevel() < D3D_FEATURE_LEVEL_10_0)

35
Kits/DirectXTK/Src/pch.h
Просмотреть файл

@ -13,6 +13,41 @@
#pragma once
// VS 2013 related Off by default warnings
#pragma warning(disable : 4619 4616 4350 4351 4472 4640)
// C4619/4616 #pragma warning warnings
// C4350 behavior change
// C4351 behavior change; warning removed in later versions
// C4472 'X' is a native enum: add an access specifier (private/public) to declare a WinRT enum
// C4640 construction of local static object is not thread-safe
// Off by default warnings
#pragma warning(disable : 4061 4265 4365 4571 4623 4625 4626 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032)
// C4061 enumerator 'X' in switch of enum 'X' is not explicitly handled by a case label
// C4265 class has virtual functions, but destructor is not virtual
// C4365 signed/unsigned mismatch
// C4571 behavior change
// C4623 default constructor was implicitly defined as deleted
// C4625 copy constructor was implicitly defined as deleted
// C4626 assignment operator was implicitly defined as deleted
// C4668 not defined as a preprocessor macro
// C4710 function not inlined
// C4711 selected for automatic inline expansion
// C4746 volatile access of '<expression>' is subject to /volatile:<iso|ms> setting
// C4774 format string expected in argument 3 is not a string literal
// C4820 padding added after data member
// C4987 nonstandard extension used
// C5026 move constructor was implicitly defined as deleted
// C5027 move assignment operator was implicitly defined as deleted
// C5031/5032 push/pop mismatches in windows headers
// Windows 8.1 SDK related Off by default warnings
#pragma warning(disable : 4471 4917 4986 5029)
// C4471 forward declaration of an unscoped enumeration must have an underlying type
// C4917 a GUID can only be associated with a class, interface or namespace
// C4986 exception specification does not match previous declaration
// C5029 nonstandard extension used
#pragma warning(push)
#pragma warning(disable : 4005)
#define WIN32_LEAN_AND_MEAN

2
Kits/DirectXTK12/Audio/AudioEngine.cpp
Просмотреть файл

@ -23,8 +23,6 @@ using Microsoft::WRL::ComPtr;
//#define VERBOSE_TRACE
#pragma warning(disable : 4351)
namespace
{
struct EngineCallback : public IXAudio2EngineCallback

2
Kits/DirectXTK12/Audio/SoundCommon.cpp
Просмотреть файл

@ -11,8 +11,6 @@
// http://go.microsoft.com/fwlink/?LinkId=248929
//--------------------------------------------------------------------------------------
#pragma once
#include "pch.h"
#include "SoundCommon.h"

548
Kits/DirectXTK12/DirectXTK_Desktop_2015_Win10.vcxproj Normal file
Просмотреть файл

@ -0,0 +1,548 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Audio\SoundCommon.h" />
<ClInclude Include="Audio\WaveBankReader.h" />
<ClInclude Include="Audio\WAVFileReader.h" />
<ClInclude Include="Inc\Audio.h" />
<ClInclude Include="Inc\CommonStates.h" />
<ClInclude Include="Inc\DDSTextureLoader.h" />
<ClInclude Include="Inc\DescriptorHeap.h" />
<ClInclude Include="Inc\DirectXHelpers.h" />
<ClInclude Include="Inc\EffectPipelineStateDescription.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\RenderTargetState.h" />
<ClInclude Include="Inc\ResourceUploadBatch.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\BinaryReader.h" />
<ClInclude Include="Src\d3dx12.h" />
<ClInclude Include="Src\DemandCreate.h" />
<ClInclude Include="Src\EffectCommon.h" />
<ClInclude Include="Src\Geometry.h" />
<ClInclude Include="Src\LinearAllocator.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="Audio\AudioEngine.cpp" />
<ClCompile Include="Audio\DynamicSoundEffectInstance.cpp" />
<ClCompile Include="Audio\SoundCommon.cpp" />
<ClCompile Include="Audio\SoundEffect.cpp" />
<ClCompile Include="Audio\SoundEffectInstance.cpp" />
<ClCompile Include="Audio\WaveBank.cpp" />
<ClCompile Include="Audio\WaveBankReader.cpp" />
<ClCompile Include="Audio\WAVFileReader.cpp" />
<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\DescriptorHeap.cpp" />
<ClCompile Include="Src\DirectXHelpers.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\EffectPipelineStateDescription.cpp" />
<ClCompile Include="Src\EffectTextureFactory.cpp" />
<ClCompile Include="Src\EnvironmentMapEffect.cpp" />
<ClCompile Include="Src\GamePad.cpp" />
<ClCompile Include="Src\GeometricPrimitive.cpp" />
<ClCompile Include="Src\Geometry.cpp" />
<ClCompile Include="Src\Keyboard.cpp" />
<ClCompile Include="Src\LinearAllocator.cpp" />
<ClCompile Include="Src\Model.cpp" />
<ClCompile Include="Src\ModelLoadSDKMESH.cpp" />
<ClCompile Include="Src\ModelLoadVBO.cpp" />
<ClCompile Include="Src\Mouse.cpp" />
<ClCompile Include="Src\GraphicsMemory.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\ResourceUploadBatch.cpp" />
<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_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\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_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\GenerateMips_main.inc" />
<None Include="Src\Shaders\Compiled\GenerateMips_main.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_VSNormalPixelLightingTxNoSpec.inc" />
<None Include="Src\Shaders\Compiled\NormalMapEffect_VSNormalPixelLightingTxNoSpec.pdb" />
<None Include="Src\Shaders\Compiled\NormalMapEffect_VSNormalPixelLightingTxNoSpecBn.inc" />
<None Include="Src\Shaders\Compiled\NormalMapEffect_VSNormalPixelLightingTxNoSpecBn.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\NormalMapEffect_VSNormalPixelLightingTxVcNoSpec.inc" />
<None Include="Src\Shaders\Compiled\NormalMapEffect_VSNormalPixelLightingTxVcNoSpec.pdb" />
<None Include="Src\Shaders\Compiled\NormalMapEffect_VSNormalPixelLightingTxVcNoSpecBn.inc" />
<None Include="Src\Shaders\Compiled\NormalMapEffect_VSNormalPixelLightingTxVcNoSpecBn.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\PostProcess_VSQuadDual.inc" />
<None Include="Src\Shaders\Compiled\PostProcess_VSQuadDual.pdb" />
<None Include="Src\Shaders\Compiled\PostProcess_VSQuadNoCB.inc" />
<None Include="Src\Shaders\Compiled\PostProcess_VSQuadNoCB.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_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_SpritePixelShaderHeap.inc" />
<None Include="Src\Shaders\Compiled\SpriteEffect_SpritePixelShaderHeap.pdb" />
<None Include="Src\Shaders\Compiled\SpriteEffect_SpriteVertexShader.inc" />
<None Include="Src\Shaders\Compiled\SpriteEffect_SpriteVertexShader.pdb" />
<None Include="Src\Shaders\Compiled\SpriteEffect_SpriteVertexShaderHeap.inc" />
<None Include="Src\Shaders\Compiled\SpriteEffect_SpriteVertexShaderHeap.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\RootSig.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>
</ItemGroup>
<ItemGroup>
<None Include="Src\Shaders\GenerateMips.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>
<None Include="Src\Shaders\ToneMap.fx">
<FileType>Document</FileType>
</None>
</ItemGroup>
<PropertyGroup Label="Globals" />
<PropertyGroup Label="Globals">
<ProjectGuid>{3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<ProjectName>DirectXTK12</ProjectName>
<RootNamespace>DirectXTK12</RootNamespace>
<WindowsTargetPlatformVersion>10.0.14393.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>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</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_2015_Win10\$(Platform)\$(Configuration)\</OutDir>
<IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir>
<TargetName>DirectXTK12</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir>
<IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir>
<TargetName>DirectXTK12</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir>
<IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir>
<TargetName>DirectXTK12</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir>
<IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir>
<TargetName>DirectXTK12</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>EnableAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_WIN32_WINNT=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
</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=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
</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=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
</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=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
</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>

1053
Kits/DirectXTK12/DirectXTK_Desktop_2015_Win10.vcxproj.filters Normal file
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

30
Kits/DirectXTK12/DirectXTK_Windows10.vcxproj
Просмотреть файл

@ -524,7 +524,7 @@
<FloatingPointModel>Fast</FloatingPointModel>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<WarningLevel>EnableAllWarnings</WarningLevel>
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -533,9 +533,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<Lib>
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@ -546,7 +543,7 @@
<FloatingPointModel>Fast</FloatingPointModel>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<WarningLevel>EnableAllWarnings</WarningLevel>
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -555,9 +552,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<Lib>
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
<ClCompile>
@ -567,7 +561,7 @@
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<WarningLevel>EnableAllWarnings</WarningLevel>
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -576,9 +570,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<Lib>
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
<ClCompile>
@ -588,7 +579,7 @@
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<WarningLevel>EnableAllWarnings</WarningLevel>
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -597,9 +588,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<Lib>
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@ -609,7 +597,7 @@
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<WarningLevel>EnableAllWarnings</WarningLevel>
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -618,9 +606,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<Lib>
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@ -630,7 +615,7 @@
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<WarningLevel>EnableAllWarnings</WarningLevel>
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -639,9 +624,6 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<Lib>
<AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

4
Kits/DirectXTK12/Inc/GraphicsMemory.h
Просмотреть файл

@ -129,13 +129,13 @@ namespace DirectX
{
const size_t alignment = D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT;
const size_t alignedSize = (sizeof(T) + alignment - 1) & ~(alignment - 1);
return std::move(Allocate(alignedSize, alignment));
return Allocate(alignedSize, alignment);
}
template<typename T> GraphicsResource AllocateConstant(const T& setData)
{
GraphicsResource alloc = AllocateConstant<T>();
memcpy(alloc.Memory(), &setData, sizeof(T));
return std::move(alloc);
return alloc;
}
// Submits all the pending one-shot memory to the GPU.

2
Kits/DirectXTK12/Inc/SimpleMath.inl
Просмотреть файл

@ -2384,7 +2384,7 @@ inline Matrix Matrix::CreateConstrainedBillboard( const Vector3& object, const V
{
using namespace DirectX;
static const XMVECTORF32 s_minAngle = { 0.99825467075f, 0.99825467075f, 0.99825467075f, 0.99825467075f }; // 1.0 - XMConvertToRadians( 0.1f );
static const XMVECTORF32 s_minAngle = { { { 0.99825467075f, 0.99825467075f, 0.99825467075f, 0.99825467075f } } }; // 1.0 - XMConvertToRadians( 0.1f );
XMVECTOR O = XMLoadFloat3( &object );
XMVECTOR C = XMLoadFloat3( &cameraPosition );

7
Kits/DirectXTK12/Readme.txt
Просмотреть файл

@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 12
Copyright (c) Microsoft Corporation. All rights reserved.
June 21, 2017
July 28, 2017
This package contains the "DirectX Tool Kit", a collection of helper classes for
writing Direct3D 12 C++ code for Universal Windows Platform (UWP) apps, Win32 desktop
@ -98,6 +98,11 @@ COMPARISONS TO DIRECTX 11 VERSION
RELEASE HISTORY
---------------
July 28, 2017
Fix for WIC writer when codec target format requires a palette
Fix for error detection in ResourceUploadBatch::End method
Code cleanup
June 21, 2017
Post-processing support
Added DescriptorPile utility

13
Kits/DirectXTK12/Src/AlphaTestEffect.cpp
Просмотреть файл

@ -97,6 +97,7 @@ namespace
}
template<>
const D3D12_SHADER_BYTECODE EffectBase<AlphaTestEffectTraits>::VertexShaderBytecode[] =
{
{ AlphaTestEffect_VSAlphaTest, sizeof(AlphaTestEffect_VSAlphaTest) },
@ -106,6 +107,7 @@ const D3D12_SHADER_BYTECODE EffectBase<AlphaTestEffectTraits>::VertexShaderBytec
};
template<>
const int EffectBase<AlphaTestEffectTraits>::VertexShaderIndices[] =
{
0, // lt/gt
@ -120,6 +122,7 @@ const int EffectBase<AlphaTestEffectTraits>::VertexShaderIndices[] =
};
template<>
const D3D12_SHADER_BYTECODE EffectBase<AlphaTestEffectTraits>::PixelShaderBytecode[] =
{
{ AlphaTestEffect_PSAlphaTestLtGt, sizeof(AlphaTestEffect_PSAlphaTestLtGt) },
@ -129,6 +132,7 @@ const D3D12_SHADER_BYTECODE EffectBase<AlphaTestEffectTraits>::PixelShaderByteco
};
template<>
const int EffectBase<AlphaTestEffectTraits>::PixelShaderIndices[] =
{
0, // lt/gt
@ -144,6 +148,7 @@ const int EffectBase<AlphaTestEffectTraits>::PixelShaderIndices[] =
// Global pool of per-device AlphaTestEffect resources.
template<>
SharedResourcePool<ID3D12Device*, EffectBase<AlphaTestEffectTraits>::DeviceResources> EffectBase<AlphaTestEffectTraits>::deviceResourcesPool;
// Constructor.
@ -265,10 +270,10 @@ void AlphaTestEffect::Impl::Apply(_In_ ID3D12GraphicsCommandList* commandList)
const float threshold = 0.5f / 255.0f;
// What to do if the alpha comparison passes or fails. Positive accepts the pixel, negative clips it.
static const XMVECTORF32 selectIfTrue = { 1, -1 };
static const XMVECTORF32 selectIfFalse = { -1, 1 };
static const XMVECTORF32 selectNever = { -1, -1 };
static const XMVECTORF32 selectAlways = { 1, 1 };
static const XMVECTORF32 selectIfTrue = { { { 1, -1 } } };
static const XMVECTORF32 selectIfFalse = { { { -1, 1 } } };
static const XMVECTORF32 selectNever = { { { -1, -1 } } };
static const XMVECTORF32 selectAlways = { { { 1, 1 } } };
float compareTo;
XMVECTOR resultSelector;

5
Kits/DirectXTK12/Src/BasicEffect.cpp
Просмотреть файл

@ -173,6 +173,7 @@ namespace
}
template<>
const D3D12_SHADER_BYTECODE EffectBase<BasicEffectTraits>::VertexShaderBytecode[] =
{
{ BasicEffect_VSBasic, sizeof(BasicEffect_VSBasic) },
@ -206,6 +207,7 @@ const D3D12_SHADER_BYTECODE EffectBase<BasicEffectTraits>::VertexShaderBytecode[
};
template<>
const int EffectBase<BasicEffectTraits>::VertexShaderIndices[] =
{
0, // basic
@ -255,6 +257,7 @@ const int EffectBase<BasicEffectTraits>::VertexShaderIndices[] =
};
template<>
const D3D12_SHADER_BYTECODE EffectBase<BasicEffectTraits>::PixelShaderBytecode[] =
{
{ BasicEffect_PSBasic, sizeof(BasicEffect_PSBasic) },
@ -272,6 +275,7 @@ const D3D12_SHADER_BYTECODE EffectBase<BasicEffectTraits>::PixelShaderBytecode[]
};
template<>
const int EffectBase<BasicEffectTraits>::PixelShaderIndices[] =
{
0, // basic
@ -321,6 +325,7 @@ const int EffectBase<BasicEffectTraits>::PixelShaderIndices[] =
};
// Global pool of per-device BasicEffect resources.
template<>
SharedResourcePool<ID3D12Device*, EffectBase<BasicEffectTraits>::DeviceResources> EffectBase<BasicEffectTraits>::deviceResourcesPool;

11
Kits/DirectXTK12/Src/BasicPostProcess.cpp
Просмотреть файл

@ -193,8 +193,9 @@ SharedResourcePool<ID3D12Device*, DeviceResources> BasicPostProcess::Impl::devic
// Constructor.
BasicPostProcess::Impl::Impl(_In_ ID3D12Device* device, const RenderTargetState& rtState, Effect ifx)
: mDeviceResources(deviceResourcesPool.DemandCreate(device)),
fx(ifx),
: fx(ifx),
constants{},
texture{},
texWidth(0),
texHeight(0),
guassianMultiplier(1.f),
@ -203,8 +204,7 @@ BasicPostProcess::Impl::Impl(_In_ ID3D12Device* device, const RenderTargetState&
bloomThreshold(0.25f),
bloomHorizontal(true),
mDirtyFlags(INT_MAX),
constants{},
texture{}
mDeviceResources(deviceResourcesPool.DemandCreate(device))
{
if (ifx < 0 || ifx >= Effect_Max)
throw std::out_of_range("Effect not defined");
@ -337,6 +337,9 @@ void BasicPostProcess::Impl::Process(_In_ ID3D12GraphicsCommandList* commandList
case BloomBlur:
Bloom(bloomHorizontal, bloomSize, bloomBrightness);
break;
default:
break;
}
}

16
Kits/DirectXTK12/Src/CommonStates.cpp
Просмотреть файл

@ -26,7 +26,7 @@ const D3D12_BLEND_DESC CommonStates::Opaque =
{
FALSE, // AlphaToCoverageEnable
FALSE, // IndependentBlendEnable
{
{ {
FALSE, // BlendEnable
FALSE, // LogicOpEnable
D3D12_BLEND_ONE, // SrcBlend
@ -37,14 +37,14 @@ const D3D12_BLEND_DESC CommonStates::Opaque =
D3D12_BLEND_OP_ADD, // BlendOpAlpha
D3D12_LOGIC_OP_NOOP,
D3D12_COLOR_WRITE_ENABLE_ALL
}
} }
};
const D3D12_BLEND_DESC CommonStates::AlphaBlend =
{
FALSE, // AlphaToCoverageEnable
FALSE, // IndependentBlendEnable
{
{ {
TRUE, // BlendEnable
FALSE, // LogicOpEnable
D3D12_BLEND_ONE, // SrcBlend
@ -55,14 +55,14 @@ const D3D12_BLEND_DESC CommonStates::AlphaBlend =
D3D12_BLEND_OP_ADD, // BlendOpAlpha
D3D12_LOGIC_OP_NOOP,
D3D12_COLOR_WRITE_ENABLE_ALL
}
} }
};
const D3D12_BLEND_DESC CommonStates::Additive =
{
FALSE, // AlphaToCoverageEnable
FALSE, // IndependentBlendEnable
{
{ {
TRUE, // BlendEnable
FALSE, // LogicOpEnable
D3D12_BLEND_SRC_ALPHA, // SrcBlend
@ -73,14 +73,14 @@ const D3D12_BLEND_DESC CommonStates::Additive =
D3D12_BLEND_OP_ADD, // BlendOpAlpha
D3D12_LOGIC_OP_NOOP,
D3D12_COLOR_WRITE_ENABLE_ALL
}
} }
};
const D3D12_BLEND_DESC CommonStates::NonPremultiplied =
{
FALSE, // AlphaToCoverageEnable
FALSE, // IndependentBlendEnable
{
{ {
TRUE, // BlendEnable
FALSE, // LogicOpEnable
D3D12_BLEND_SRC_ALPHA, // SrcBlend
@ -91,7 +91,7 @@ const D3D12_BLEND_DESC CommonStates::NonPremultiplied =
D3D12_BLEND_OP_ADD, // BlendOpAlpha
D3D12_LOGIC_OP_NOOP,
D3D12_COLOR_WRITE_ENABLE_ALL
}
} }
};

9
Kits/DirectXTK12/Src/DDSTextureLoader.cpp
Просмотреть файл

@ -35,9 +35,9 @@ namespace DirectX
using namespace DirectX;
using namespace DirectX::LoaderHelpers;
static_assert(DDS_DIMENSION_TEXTURE1D == D3D12_RESOURCE_DIMENSION_TEXTURE1D, "dds mismatch");
static_assert(DDS_DIMENSION_TEXTURE2D == D3D12_RESOURCE_DIMENSION_TEXTURE2D, "dds mismatch");
static_assert(DDS_DIMENSION_TEXTURE3D == D3D12_RESOURCE_DIMENSION_TEXTURE3D, "dds mismatch");
static_assert(static_cast<int>(DDS_DIMENSION_TEXTURE1D) == static_cast<int>(D3D12_RESOURCE_DIMENSION_TEXTURE1D), "dds mismatch");
static_assert(static_cast<int>(DDS_DIMENSION_TEXTURE2D) == static_cast<int>(D3D12_RESOURCE_DIMENSION_TEXTURE2D), "dds mismatch");
static_assert(static_cast<int>(DDS_DIMENSION_TEXTURE3D) == static_cast<int>(D3D12_RESOURCE_DIMENSION_TEXTURE3D), "dds mismatch");
namespace
{
@ -113,6 +113,9 @@ namespace
res.SlicePitch = res.RowPitch * height;
}
break;
default:
break;
}
}

13
Kits/DirectXTK12/Src/DualPostProcess.cpp
Просмотреть файл

@ -154,8 +154,10 @@ SharedResourcePool<ID3D12Device*, DeviceResources> DualPostProcess::Impl::device
// Constructor.
DualPostProcess::Impl::Impl(_In_ ID3D12Device* device, const RenderTargetState& rtState, Effect ifx)
: mDeviceResources(deviceResourcesPool.DemandCreate(device)),
fx(ifx),
: fx(ifx),
constants{},
texture{},
texture2{},
mergeWeight1(0.5f),
mergeWeight2(0.5f),
bloomIntensity(1.25f),
@ -163,9 +165,7 @@ DualPostProcess::Impl::Impl(_In_ ID3D12Device* device, const RenderTargetState&
bloomSaturation(1.f),
bloomBaseSaturation(1.f),
mDirtyFlags(INT_MAX),
constants{},
texture{},
texture2{}
mDeviceResources(deviceResourcesPool.DemandCreate(device))
{
if (ifx < 0 || ifx >= Effect_Max)
throw std::out_of_range("Effect not defined");
@ -266,6 +266,9 @@ void DualPostProcess::Impl::Process(_In_ ID3D12GraphicsCommandList* commandList)
constants.sampleWeights[1] = XMVectorReplicate(bloomBaseIntensity);
constants.sampleWeights[2] = XMVectorReplicate(bloomIntensity);
break;
default:
break;
}
}

5
Kits/DirectXTK12/Src/DualTextureEffect.cpp
Просмотреть файл

@ -94,6 +94,7 @@ namespace
}
template<>
const D3D12_SHADER_BYTECODE EffectBase<DualTextureEffectTraits>::VertexShaderBytecode[] =
{
{ DualTextureEffect_VSDualTexture, sizeof(DualTextureEffect_VSDualTexture) },
@ -104,6 +105,7 @@ const D3D12_SHADER_BYTECODE EffectBase<DualTextureEffectTraits>::VertexShaderByt
};
template<>
const int EffectBase<DualTextureEffectTraits>::VertexShaderIndices[] =
{
0, // basic
@ -113,6 +115,7 @@ const int EffectBase<DualTextureEffectTraits>::VertexShaderIndices[] =
};
template<>
const D3D12_SHADER_BYTECODE EffectBase<DualTextureEffectTraits>::PixelShaderBytecode[] =
{
{ DualTextureEffect_PSDualTexture, sizeof(DualTextureEffect_PSDualTexture) },
@ -121,6 +124,7 @@ const D3D12_SHADER_BYTECODE EffectBase<DualTextureEffectTraits>::PixelShaderByte
};
template<>
const int EffectBase<DualTextureEffectTraits>::PixelShaderIndices[] =
{
0, // basic
@ -131,6 +135,7 @@ const int EffectBase<DualTextureEffectTraits>::PixelShaderIndices[] =
// Global pool of per-device DualTextureEffect resources.
template<>
SharedResourcePool<ID3D12Device*, EffectBase<DualTextureEffectTraits>::DeviceResources> EffectBase<DualTextureEffectTraits>::deviceResourcesPool;

34
Kits/DirectXTK12/Src/EffectCommon.cpp
Просмотреть файл

@ -74,7 +74,7 @@ void XM_CALLCONV EffectFog::SetConstants(int& dirtyFlags, FXMMATRIX worldView, X
if (start == end)
{
// Degenerate case: force everything to 100% fogged if start and end are the same.
static const XMVECTORF32 fullyFogged = { 0, 0, 0, 1 };
static const XMVECTORF32 fullyFogged = { { { 0, 0, 0, 1 } } };
fogVectorConstant = fullyFogged;
}
@ -152,14 +152,16 @@ EffectLights::EffectLights()
}
#ifdef _PREFAST_
#pragma prefast(push)
#pragma prefast(disable:22103, "PREFAST doesn't understand buffer is bounded by a static const value even with SAL" )
#endif
// Initializes constant buffer fields to match the current lighting state.
_Use_decl_annotations_ void EffectLights::InitializeConstants(XMVECTOR& specularColorAndPowerConstant, XMVECTOR* lightDirectionConstant, XMVECTOR* lightDiffuseConstant, XMVECTOR* lightSpecularConstant) const
{
static const XMVECTORF32 defaultSpecular = { 1, 1, 1, 16 };
static const XMVECTORF32 defaultLightDirection = { 0, -1, 0, 0 };
static const XMVECTORF32 defaultSpecular = { { { 1, 1, 1, 16 } } };
static const XMVECTORF32 defaultLightDirection = { { { 0, -1, 0, 0 } } };
specularColorAndPowerConstant = defaultSpecular;
@ -172,7 +174,9 @@ _Use_decl_annotations_ void EffectLights::InitializeConstants(XMVECTOR& specular
}
}
#ifdef _PREFAST_
#pragma prefast(pop)
#endif
// Lazily recomputes derived parameter values used by shader lighting calculations.
@ -253,8 +257,10 @@ _Use_decl_annotations_ void EffectLights::SetConstants(int& dirtyFlags, EffectMa
}
#ifdef _PREFAST_
#pragma prefast(push)
#pragma prefast(disable:26015, "PREFAST doesn't understand that ValidateLightIndex bounds whichLight" )
#endif
// Helper for turning one of the directional lights on or off.
_Use_decl_annotations_ int EffectLights::SetLightEnabled(int whichLight, bool value, XMVECTOR* lightDiffuseConstant, XMVECTOR* lightSpecularConstant)
@ -324,7 +330,9 @@ int XM_CALLCONV EffectLights::SetLightSpecularColor(int whichLight, FXMVECTOR va
return 0;
}
#ifdef _PREFAST_
#pragma prefast(pop)
#endif
// Parameter validation helper.
@ -342,26 +350,26 @@ void EffectLights::EnableDefaultLighting(_In_ IEffectLights* effect)
{
static const XMVECTORF32 defaultDirections[MaxDirectionalLights] =
{
{ -0.5265408f, -0.5735765f, -0.6275069f },
{ 0.7198464f, 0.3420201f, 0.6040227f },
{ 0.4545195f, -0.7660444f, 0.4545195f },
{ { { -0.5265408f, -0.5735765f, -0.6275069f, 0 } } },
{ { { 0.7198464f, 0.3420201f, 0.6040227f, 0 } } },
{ { { 0.4545195f, -0.7660444f, 0.4545195f, 0 } } },
};
static const XMVECTORF32 defaultDiffuse[MaxDirectionalLights] =
{
{ 1.0000000f, 0.9607844f, 0.8078432f },
{ 0.9647059f, 0.7607844f, 0.4078432f },
{ 0.3231373f, 0.3607844f, 0.3937255f },
{ { { 1.0000000f, 0.9607844f, 0.8078432f, 0 } } },
{ { { 0.9647059f, 0.7607844f, 0.4078432f, 0 } } },
{ { { 0.3231373f, 0.3607844f, 0.3937255f, 0 } } },
};
static const XMVECTORF32 defaultSpecular[MaxDirectionalLights] =
{
{ 1.0000000f, 0.9607844f, 0.8078432f },
{ 0.0000000f, 0.0000000f, 0.0000000f },
{ 0.3231373f, 0.3607844f, 0.3937255f },
{ { { 1.0000000f, 0.9607844f, 0.8078432f, 0 } } },
{ { { 0.0000000f, 0.0000000f, 0.0000000f, 0 } } },
{ { { 0.3231373f, 0.3607844f, 0.3937255f, 0 } } },
};
static const XMVECTORF32 defaultAmbient = { 0.05333332f, 0.09882354f, 0.1819608f };
static const XMVECTORF32 defaultAmbient = { { { 0.05333332f, 0.09882354f, 0.1819608f, 0 } } };
effect->SetAmbientLightColor(defaultAmbient);

8
Kits/DirectXTK12/Src/EffectCommon.h
Просмотреть файл

@ -146,10 +146,10 @@ namespace DirectX
// Constructor.
EffectBase(_In_ ID3D12Device* device)
: dirtyFlags(INT_MAX),
mDeviceResources(deviceResourcesPool.DemandCreate(device)),
constants{},
mRootSignature(nullptr)
: constants{},
dirtyFlags(INT_MAX),
mRootSignature(nullptr),
mDeviceResources(deviceResourcesPool.DemandCreate(device))
{
// Initialize the constant buffer data
mConstantBuffer = GraphicsMemory::Get().AllocateConstant(constants);

4
Kits/DirectXTK12/Src/EffectFactory.cpp
Просмотреть файл

@ -30,12 +30,12 @@ class EffectFactory::Impl
{
public:
Impl(_In_ ID3D12Device* device, _In_ ID3D12DescriptorHeap* textureDescriptors, _In_ ID3D12DescriptorHeap* samplerDescriptors)
: device(device)
, mTextureDescriptors(nullptr)
: mTextureDescriptors(nullptr)
, mSamplerDescriptors(nullptr)
, mUseNormalMapEffect(true)
, mEnablePerPixelLighting(true)
, mEnableFog(false)
, device(device)
, mSharing(true)
{
if (textureDescriptors)

12
Kits/DirectXTK12/Src/EffectTextureFactory.cpp
Просмотреть файл

@ -43,8 +43,8 @@ public:
_Inout_ ResourceUploadBatch& resourceUploadBatch,
_In_ ID3D12DescriptorHeap* descriptorHeap)
: mPath{}
, device(device)
, mTextureDescriptorHeap(descriptorHeap)
, device(device)
, mResourceUploadBatch(resourceUploadBatch)
, mSharing(true)
, mForceSRGB(false)
@ -59,8 +59,8 @@ public:
_In_ size_t numDescriptors,
_In_ D3D12_DESCRIPTOR_HEAP_FLAGS descriptorHeapFlags)
: mPath{}
, device(device)
, mTextureDescriptorHeap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, descriptorHeapFlags, numDescriptors)
, device(device)
, mResourceUploadBatch(resourceUploadBatch)
, mSharing(true)
, mForceSRGB(false)
@ -135,10 +135,10 @@ void EffectTextureFactory::Impl::CreateTexture(_In_z_ const wchar_t* name, int d
if (mAutoGenMips)
loadFlags |= DDS_LOADER_MIP_AUTOGEN;
static_assert(DDS_LOADER_DEFAULT == WIC_LOADER_DEFAULT, "DDS/WIC Load flags mismatch");
static_assert(DDS_LOADER_FORCE_SRGB == WIC_LOADER_FORCE_SRGB, "DDS/WIC Load flags mismatch");
static_assert(DDS_LOADER_MIP_AUTOGEN == WIC_LOADER_MIP_AUTOGEN, "DDS/WIC Load flags mismatch");
static_assert(DDS_LOADER_MIP_RESERVE == WIC_LOADER_MIP_RESERVE, "DDS/WIC Load flags mismatch");
static_assert(static_cast<int>(DDS_LOADER_DEFAULT) == static_cast<int>(WIC_LOADER_DEFAULT), "DDS/WIC Load flags mismatch");
static_assert(static_cast<int>(DDS_LOADER_FORCE_SRGB) == static_cast<int>(WIC_LOADER_FORCE_SRGB), "DDS/WIC Load flags mismatch");
static_assert(static_cast<int>(DDS_LOADER_MIP_AUTOGEN) == static_cast<int>(WIC_LOADER_MIP_AUTOGEN), "DDS/WIC Load flags mismatch");
static_assert(static_cast<int>(DDS_LOADER_MIP_RESERVE) == static_cast<int>(WIC_LOADER_MIP_RESERVE), "DDS/WIC Load flags mismatch");
if ( _wcsicmp( ext, L".dds" ) == 0 )
{

5
Kits/DirectXTK12/Src/EnvironmentMapEffect.cpp
Просмотреть файл

@ -133,6 +133,7 @@ namespace
}
template<>
const D3D12_SHADER_BYTECODE EffectBase<EnvironmentMapEffectTraits>::VertexShaderBytecode[] =
{
{ EnvironmentMapEffect_VSEnvMap, sizeof(EnvironmentMapEffect_VSEnvMap) },
@ -145,6 +146,7 @@ const D3D12_SHADER_BYTECODE EffectBase<EnvironmentMapEffectTraits>::VertexShader
};
template<>
const int EffectBase<EnvironmentMapEffectTraits>::VertexShaderIndices[] =
{
0, // basic
@ -177,6 +179,7 @@ const int EffectBase<EnvironmentMapEffectTraits>::VertexShaderIndices[] =
};
template<>
const D3D12_SHADER_BYTECODE EffectBase<EnvironmentMapEffectTraits>::PixelShaderBytecode[] =
{
{ EnvironmentMapEffect_PSEnvMap, sizeof(EnvironmentMapEffect_PSEnvMap) },
@ -190,6 +193,7 @@ const D3D12_SHADER_BYTECODE EffectBase<EnvironmentMapEffectTraits>::PixelShaderB
};
template<>
const int EffectBase<EnvironmentMapEffectTraits>::PixelShaderIndices[] =
{
0, // basic
@ -223,6 +227,7 @@ const int EffectBase<EnvironmentMapEffectTraits>::PixelShaderIndices[] =
// Global pool of per-device EnvironmentMapEffect resources.
template<>
SharedResourcePool<ID3D12Device*, EffectBase<EnvironmentMapEffectTraits>::DeviceResources> EffectBase<EnvironmentMapEffectTraits>::deviceResourcesPool;

118
Kits/DirectXTK12/Src/Geometry.cpp
Просмотреть файл

@ -81,20 +81,20 @@ void DirectX::ComputeBox(VertexCollection& vertices, IndexCollection& indices, c
static const XMVECTORF32 faceNormals[FaceCount] =
{
{ 0, 0, 1 },
{ 0, 0, -1 },
{ 1, 0, 0 },
{ -1, 0, 0 },
{ 0, 1, 0 },
{ 0, -1, 0 },
{ { { 0, 0, 1, 0 } } },
{ { { 0, 0, -1, 0 } } },
{ { { 1, 0, 0, 0 } } },
{ { { -1, 0, 0, 0 } } },
{ { { 0, 1, 0, 0 } } },
{ { { 0, -1, 0, 0 } } },
};
static const XMVECTORF32 textureCoordinates[4] =
{
{ 1, 0 },
{ 1, 1 },
{ 0, 1 },
{ 0, 0 },
{ { { 1, 0, 0, 0 } } },
{ { { 1, 1, 0, 0 } } },
{ { { 0, 1, 0, 0 } } },
{ { { 0, 0, 0, 0 } } },
};
XMVECTOR tsize = XMLoadFloat3(&size);
@ -546,7 +546,7 @@ namespace
XMScalarSinCos(&dx, &dz, angle);
XMVECTORF32 v = { dx, 0, dz, 0 };
XMVECTORF32 v = { { { dx, 0, dz, 0 } } };
return v;
}
@ -557,7 +557,7 @@ namespace
XMScalarSinCos(&dx, &dz, angle);
XMVECTORF32 v = { dx, 0, dz, 0 };
XMVECTORF32 v = { { { dx, 0, dz, 0 } } };
return v;
}
@ -778,10 +778,10 @@ void DirectX::ComputeTetrahedron(VertexCollection& vertices, IndexCollection& in
static const XMVECTORF32 verts[4] =
{
{ 0.f, 0.f, 1.f },
{ 2.f*SQRT2 / 3.f, 0.f, -1.f / 3.f },
{ -SQRT2 / 3.f, SQRT6 / 3.f, -1.f / 3.f },
{ -SQRT2 / 3.f, -SQRT6 / 3.f, -1.f / 3.f }
{ { { 0.f, 0.f, 1.f, 0 } } },
{ { { 2.f*SQRT2 / 3.f, 0.f, -1.f / 3.f, 0 } } },
{ { { -SQRT2 / 3.f, SQRT6 / 3.f, -1.f / 3.f, 0 } } },
{ { { -SQRT2 / 3.f, -SQRT6 / 3.f, -1.f / 3.f, 0 } } }
};
static const uint32_t faces[4 * 3] =
@ -837,12 +837,12 @@ void DirectX::ComputeOctahedron(VertexCollection& vertices, IndexCollection& ind
static const XMVECTORF32 verts[6] =
{
{ 1, 0, 0 },
{ -1, 0, 0 },
{ 0, 1, 0 },
{ 0, -1, 0 },
{ 0, 0, 1 },
{ 0, 0, -1 }
{ { { 1, 0, 0, 0 } } },
{ { { -1, 0, 0, 0 } } },
{ { { 0, 1, 0, 0 } } },
{ { { 0, -1, 0, 0 } } },
{ { { 0, 0, 1, 0 } } },
{ { { 0, 0, -1, 0 } } }
};
static const uint32_t faces[8 * 3] =
@ -906,26 +906,26 @@ void DirectX::ComputeDodecahedron(VertexCollection& vertices, IndexCollection& i
static const XMVECTORF32 verts[20] =
{
{ a, a, a },
{ a, a, -a },
{ a, -a, a },
{ a, -a, -a },
{ -a, a, a },
{ -a, a, -a },
{ -a, -a, a },
{ -a, -a, -a },
{ b, c, 0 },
{ -b, c, 0 },
{ b, -c, 0 },
{ -b, -c, 0 },
{ c, 0, b },
{ c, 0, -b },
{ -c, 0, b },
{ -c, 0, -b },
{ 0, b, c },
{ 0, -b, c },
{ 0, b, -c },
{ 0, -b, -c }
{ { { a, a, a, 0 } } },
{ { { a, a, -a, 0 } } },
{ { { a, -a, a, 0 } } },
{ { { a, -a, -a, 0 } } },
{ { { -a, a, a, 0 } } },
{ { { -a, a, -a, 0 } } },
{ { { -a, -a, a, 0 } } },
{ { { -a, -a, -a, 0 } } },
{ { { b, c, 0, 0 } } },
{ { { -b, c, 0, 0 } } },
{ { { b, -c, 0, 0 } } },
{ { { -b, -c, 0, 0 } } },
{ { { c, 0, b, 0 } } },
{ { { c, 0, -b, 0 } } },
{ { { -c, 0, b, 0 } } },
{ { { -c, 0, -b, 0 } } },
{ { { 0, b, c, 0 } } },
{ { { 0, -b, c, 0 } } },
{ { { 0, b, -c, 0 } } },
{ { { 0, -b, -c, 0 } } }
};
static const uint32_t faces[12 * 5] =
@ -946,11 +946,11 @@ void DirectX::ComputeDodecahedron(VertexCollection& vertices, IndexCollection& i
static const XMVECTORF32 textureCoordinates[5] =
{
{ 0.654508f, 0.0244717f },
{ 0.0954915f, 0.206107f },
{ 0.0954915f, 0.793893f },
{ 0.654508f, 0.975528f },
{ 1.f, 0.5f }
{ { { 0.654508f, 0.0244717f, 0, 0 } } },
{ { { 0.0954915f, 0.206107f, 0, 0 } } },
{ { { 0.0954915f, 0.793893f, 0, 0 } } },
{ { { 0.654508f, 0.975528f, 0, 0 } } },
{ { { 1.f, 0.5f, 0, 0 } } }
};
static const uint32_t textureIndex[12][5] =
@ -1035,18 +1035,18 @@ void DirectX::ComputeIcosahedron(VertexCollection& vertices, IndexCollection& in
static const XMVECTORF32 verts[12] =
{
{ t / t2, 1.f / t2, 0 },
{ -t / t2, 1.f / t2, 0 },
{ t / t2, -1.f / t2, 0 },
{ -t / t2, -1.f / t2, 0 },
{ 1.f / t2, 0, t / t2 },
{ 1.f / t2, 0, -t / t2 },
{ -1.f / t2, 0, t / t2 },
{ -1.f / t2, 0, -t / t2 },
{ 0, t / t2, 1.f / t2 },
{ 0, -t / t2, 1.f / t2 },
{ 0, t / t2, -1.f / t2 },
{ 0, -t / t2, -1.f / t2 }
{ { { t / t2, 1.f / t2, 0, 0 } } },
{ { { -t / t2, 1.f / t2, 0, 0 } } },
{ { { t / t2, -1.f / t2, 0, 0 } } },
{ { { -t / t2, -1.f / t2, 0, 0 } } },
{ { { 1.f / t2, 0, t / t2, 0 } } },
{ { { 1.f / t2, 0, -t / t2, 0 } } },
{ { { -1.f / t2, 0, t / t2, 0 } } },
{ { { -1.f / t2, 0, -t / t2, 0 } } },
{ { { 0, t / t2, 1.f / t2, 0 } } },
{ { { 0, -t / t2, 1.f / t2, 0 } } },
{ { { 0, t / t2, -1.f / t2, 0 } } },
{ { { 0, -t / t2, -1.f / t2, 0 } } }
};
static const uint32_t faces[20 * 3] =

8
Kits/DirectXTK12/Src/GraphicsMemory.cpp
Просмотреть файл

@ -128,13 +128,13 @@ namespace
size_t offset = page->Suballocate(size, alignment);
// Return the information to the user
return std::move(GraphicsResource(
return GraphicsResource(
page,
page->GpuAddress() + offset,
page->UploadResource(),
reinterpret_cast<BYTE*>(page->BaseMemory()) + offset,
offset,
size));
size);
}
// Submit page fences to the command queue
@ -204,7 +204,7 @@ public:
GraphicsResource Allocate(size_t size, size_t alignment)
{
return std::move(mDeviceAllocator->Alloc(size, alignment));
return mDeviceAllocator->Alloc(size, alignment);
}
void Commit(_In_ ID3D12CommandQueue* commandQueue)
@ -265,7 +265,7 @@ GraphicsMemory::~GraphicsMemory()
GraphicsResource GraphicsMemory::Allocate(size_t size, size_t alignment)
{
assert(alignment >= 4); // Should use at least DWORD alignment
return std::move(pImpl->Allocate(size, alignment));
return pImpl->Allocate(size, alignment);
}

8
Kits/DirectXTK12/Src/LoaderHelpers.h
Просмотреть файл

@ -485,6 +485,9 @@ namespace DirectX
break;
#endif
default:
break;
}
if (bc)
@ -803,6 +806,9 @@ namespace DirectX
case DDS_ALPHA_MODE_OPAQUE:
case DDS_ALPHA_MODE_CUSTOM:
return mode;
default:
break;
}
}
else if ((MAKEFOURCC('D', 'X', 'T', '2') == header->ddspf.fourCC)
@ -843,7 +849,7 @@ namespace DirectX
class auto_delete_file_wic
{
public:
auto_delete_file_wic(Microsoft::WRL::ComPtr<IWICStream>& hFile, LPCWSTR szFile) : m_handle(hFile), m_filename(szFile) {}
auto_delete_file_wic(Microsoft::WRL::ComPtr<IWICStream>& hFile, LPCWSTR szFile) : m_filename(szFile), m_handle(hFile) {}
auto_delete_file_wic(const auto_delete_file_wic&) = delete;
auto_delete_file_wic& operator=(const auto_delete_file_wic&) = delete;

14
Kits/DirectXTK12/Src/Model.cpp
Просмотреть файл

@ -208,7 +208,7 @@ std::unique_ptr<EffectTextureFactory> Model::LoadTextures(
LoadTextures(*texFactory);
return std::move(texFactory);
return texFactory;
}
@ -239,7 +239,7 @@ std::vector<std::shared_ptr<IEffect>> Model::CreateEffects(
}
if (partCount == 0)
return std::move(effects);
return effects;
// Create an array of effects for each part. We need to have an effect per part because the part's vertex layout
// combines with the material spec to create a unique effect. We rely on the EffectFactory to de-duplicate if it
@ -254,30 +254,30 @@ std::vector<std::shared_ptr<IEffect>> Model::CreateEffects(
{
assert(part != nullptr);
if (part->materialIndex == ~0ull)
if (part->materialIndex == uint32_t(-1))
continue;
// If this fires, you have multiple parts with the same unique ID
assert(effects[part->partIndex] == nullptr);
effects[part->partIndex] = std::move(CreateEffectForMeshPart(fxFactory, opaquePipelineState, alphaPipelineState, textureDescriptorOffset, samplerDescriptorOffset, part.get()));
effects[part->partIndex] = CreateEffectForMeshPart(fxFactory, opaquePipelineState, alphaPipelineState, textureDescriptorOffset, samplerDescriptorOffset, part.get());
}
for (const auto& part : mesh->alphaMeshParts)
{
assert(part != nullptr);
if (part->materialIndex == ~0ull)
if (part->materialIndex == uint32_t(-1))
continue;
// If this fires, you have multiple parts with the same unique ID
assert(effects[part->partIndex] == nullptr);
effects[part->partIndex] = std::move(CreateEffectForMeshPart(fxFactory, opaquePipelineState, alphaPipelineState, textureDescriptorOffset, samplerDescriptorOffset, part.get()));
effects[part->partIndex] = CreateEffectForMeshPart(fxFactory, opaquePipelineState, alphaPipelineState, textureDescriptorOffset, samplerDescriptorOffset, part.get());
}
}
return std::move(effects);
return effects;
}
// Creates an effect for a mesh part

5
Kits/DirectXTK12/Src/NormalMapEffect.cpp
Просмотреть файл

@ -122,6 +122,7 @@ namespace
}
template<>
const D3D12_SHADER_BYTECODE EffectBase<NormalMapEffectTraits>::VertexShaderBytecode[] =
{
{ NormalMapEffect_VSNormalPixelLightingTx, sizeof(NormalMapEffect_VSNormalPixelLightingTx) },
@ -138,6 +139,7 @@ const D3D12_SHADER_BYTECODE EffectBase<NormalMapEffectTraits>::VertexShaderBytec
};
template<>
const int EffectBase<NormalMapEffectTraits>::VertexShaderIndices[] =
{
0, // pixel lighting + texture
@ -162,6 +164,7 @@ const int EffectBase<NormalMapEffectTraits>::VertexShaderIndices[] =
};
template<>
const D3D12_SHADER_BYTECODE EffectBase<NormalMapEffectTraits>::PixelShaderBytecode[] =
{
{ NormalMapEffect_PSNormalPixelLightingTx, sizeof(NormalMapEffect_PSNormalPixelLightingTx) },
@ -171,6 +174,7 @@ const D3D12_SHADER_BYTECODE EffectBase<NormalMapEffectTraits>::PixelShaderByteco
};
template<>
const int EffectBase<NormalMapEffectTraits>::PixelShaderIndices[] =
{
0, // pixel lighting + texture
@ -195,6 +199,7 @@ const int EffectBase<NormalMapEffectTraits>::PixelShaderIndices[] =
};
// Global pool of per-device NormalMapEffect resources.
template<>
SharedResourcePool<ID3D12Device*, EffectBase<NormalMapEffectTraits>::DeviceResources> EffectBase<NormalMapEffectTraits>::deviceResourcesPool;

4
Kits/DirectXTK12/Src/PlatformHelpers.h
Просмотреть файл

@ -30,7 +30,7 @@ namespace DirectX
virtual const char* what() const override
{
static char s_str[64] = {};
sprintf_s(s_str, "Failure with HRESULT of %08X", result);
sprintf_s(s_str, "Failure with HRESULT of %08X", static_cast<unsigned int>(result));
return s_str;
}
@ -74,7 +74,7 @@ namespace DirectX
struct handle_closer { void operator()(HANDLE h) { if (h) CloseHandle(h); } };
typedef public std::unique_ptr<void, handle_closer> ScopedHandle;
typedef std::unique_ptr<void, handle_closer> ScopedHandle;
inline HANDLE safe_handle( HANDLE h ) { return (h == INVALID_HANDLE_VALUE) ? 0 : h; }
}

4
Kits/DirectXTK12/Src/PrimitiveBatch.cpp
Просмотреть файл

@ -62,8 +62,8 @@ private:
// Constructor.
PrimitiveBatchBase::Impl::Impl(_In_ ID3D12Device* device, size_t maxIndices, size_t maxVertices, size_t vertexSize)
: mCommandList(nullptr),
mDevice(device),
: mDevice(device),
mCommandList(nullptr),
mMaxIndices(maxIndices),
mMaxVertices(maxVertices),
mVertexSize(vertexSize),

15
Kits/DirectXTK12/Src/ResourceUploadBatch.cpp
Просмотреть файл

@ -409,9 +409,18 @@ public:
std::future<void> future = std::async(std::launch::async, [uploadBatch]()
{
// Wait on the GPU-complete notification
auto wr = WaitForSingleObject(uploadBatch->GpuCompleteEvent, INFINITE);
assert(wr == WAIT_OBJECT_0);
wr;
DWORD wr = WaitForSingleObject(uploadBatch->GpuCompleteEvent, INFINITE);
if (wr != WAIT_OBJECT_0)
{
if (wr == WAIT_FAILED)
{
ThrowIfFailed(HRESULT_FROM_WIN32(GetLastError()));
}
else
{
throw std::exception("WaitForSingleObject");
}
}
// Delete the batch
// Because the vector contains ComPtrs, their destructors will fire and the

11
Kits/DirectXTK12/Src/Shaders/CompileShaders.cmd
Просмотреть файл

@ -15,6 +15,13 @@ echo usage: CompileShaders [xbox]
exit /b
:continuexbox
set XBOXOPTS=/D__XBOX_DISABLE_SHADER_NAME_EMPLACEMENT
if NOT %2.==noprecompile. goto skipnoprecompile
set XBOXOPTS=%XBOXOPTS% /D__XBOX_DISABLE_PRECOMPILE=1
:skipnoprecompile
set XBOXFXC="%XboxOneXDKLatest%\xdk\FXC\amd64\FXC.exe"
if exist %XBOXFXC% goto continue
set XBOXFXC="%XboxOneXDKLatest%xdk\FXC\amd64\FXC.exe"
if exist %XBOXFXC% goto continue
set XBOXFXC="%XboxOneXDKBuild%xdk\FXC\amd64\FXC.exe"
@ -208,14 +215,14 @@ echo %fxc%
exit /b
:CompileShaderxbox
set fxc=%XBOXFXC% /nologo %1.fx /T%2_5_0 /Zi /Zpc /Qstrip_reflect /Qstrip_debug /D__XBOX_DISABLE_SHADER_NAME_EMPLACEMENT /E%3 /FhCompiled\XboxOne%1_%3.inc /FdCompiled\XboxOne%1_%3.pdb /Vn%1_%3
set fxc=%XBOXFXC% /nologo %1.fx /T%2_5_0 /Zi /Zpc /Qstrip_reflect /Qstrip_debug %XBOXOPTS% /E%3 /FhCompiled\XboxOne%1_%3.inc /FdCompiled\XboxOne%1_%3.pdb /Vn%1_%3
echo.
echo %fxc%
%fxc% || set error=1
exit /b
:CompileShaderHLSLxbox
set fxc=%XBOXFXC% /nologo %1.hlsl /T%2_5_0 /Zi /Zpc /Qstrip_reflect /Qstrip_debug /D__XBOX_DISABLE_SHADER_NAME_EMPLACEMENT /E%3 /FhCompiled\XboxOne%1_%3.inc /FdCompiled\XboxOne%1_%3.pdb /Vn%1_%3
set fxc=%XBOXFXC% /nologo %1.hlsl /T%2_5_0 /Zi /Zpc /Qstrip_reflect /Qstrip_debug %XBOXOPTS% /E%3 /FhCompiled\XboxOne%1_%3.inc /FdCompiled\XboxOne%1_%3.pdb /Vn%1_%3
echo.
echo %fxc%
%fxc% || set error=1

6
Kits/DirectXTK12/Src/SharedResourcePool.h
Просмотреть файл

@ -78,9 +78,9 @@ namespace DirectX
struct WrappedData : public TData
{
WrappedData(TKey key, std::shared_ptr<ResourceMap> const& resourceMap, TConstructorArgs... args)
: mKey(key),
mResourceMap(resourceMap),
TData(key, args...)
: TData(key, args...),
mKey(key),
mResourceMap(resourceMap)
{ }
~WrappedData()

7
Kits/DirectXTK12/Src/SkinnedEffect.cpp
Просмотреть файл

@ -130,6 +130,7 @@ namespace
}
template<>
const D3D12_SHADER_BYTECODE EffectBase<SkinnedEffectTraits>::VertexShaderBytecode[] =
{
{ SkinnedEffect_VSSkinnedVertexLightingOneBone, sizeof(SkinnedEffect_VSSkinnedVertexLightingOneBone) },
@ -150,6 +151,7 @@ const D3D12_SHADER_BYTECODE EffectBase<SkinnedEffectTraits>::VertexShaderBytecod
};
template<>
const int EffectBase<SkinnedEffectTraits>::VertexShaderIndices[] =
{
0, // vertex lighting, one bone
@ -182,6 +184,7 @@ const int EffectBase<SkinnedEffectTraits>::VertexShaderIndices[] =
};
template<>
const D3D12_SHADER_BYTECODE EffectBase<SkinnedEffectTraits>::PixelShaderBytecode[] =
{
{ SkinnedEffect_PSSkinnedVertexLighting, sizeof(SkinnedEffect_PSSkinnedVertexLighting) },
@ -190,6 +193,7 @@ const D3D12_SHADER_BYTECODE EffectBase<SkinnedEffectTraits>::PixelShaderBytecode
};
template<>
const int EffectBase<SkinnedEffectTraits>::PixelShaderIndices[] =
{
0, // vertex lighting, one bone
@ -223,6 +227,7 @@ const int EffectBase<SkinnedEffectTraits>::PixelShaderIndices[] =
// Global pool of per-device SkinnedEffect resources.
template<>
SharedResourcePool<ID3D12Device*, EffectBase<SkinnedEffectTraits>::DeviceResources> EffectBase<SkinnedEffectTraits>::deviceResourcesPool;
@ -610,8 +615,6 @@ void SkinnedEffect::ResetBoneTransforms()
{
auto boneConstant = pImpl->constants.bones;
XMMATRIX id = XMMatrixIdentity();
for(size_t i = 0; i < MaxBones; ++i)
{
boneConstant[i][0] = g_XMIdentityR0;

17
Kits/DirectXTK12/Src/SpriteBatch.cpp
Просмотреть файл

@ -230,7 +230,7 @@ const D3D12_BLEND_DESC SpriteBatchPipelineStateDescription::s_DefaultBlendDesc =
{
FALSE, // AlphaToCoverageEnable
FALSE, // IndependentBlendEnable
{
{ {
TRUE, // BlendEnable
FALSE, // LogicOpEnable
D3D12_BLEND_ONE, // SrcBlend
@ -241,7 +241,7 @@ const D3D12_BLEND_DESC SpriteBatchPipelineStateDescription::s_DefaultBlendDesc =
D3D12_BLEND_OP_ADD, // BlendOpAlpha
D3D12_LOGIC_OP_NOOP,
D3D12_COLOR_WRITE_ENABLE_ALL
}
} }
};
// Same to CommonStates::CullCounterClockwise
@ -568,7 +568,7 @@ void XM_CALLCONV SpriteBatch::Impl::Draw(D3D12_GPU_DESCRIPTOR_HANDLE texture,
else
{
// No explicit source region, so use the entire texture.
static const XMVECTORF32 wholeTexture = {0, 0, 1, 1};
static const XMVECTORF32 wholeTexture = { { {0, 0, 1, 1} } };
XMStoreFloat4A(&sprite->source, wholeTexture);
}
@ -730,6 +730,9 @@ void SpriteBatch::Impl::SortSprites()
return x->originRotationDepth.w < y->originRotationDepth.w;
});
break;
default:
break;
}
}
@ -895,10 +898,10 @@ void XM_CALLCONV SpriteBatch::Impl::RenderSprite(SpriteInfo const* sprite, Verte
// The four corner vertices are computed by transforming these unit-square positions.
static XMVECTORF32 cornerOffsets[VerticesPerSprite] =
{
{ 0, 0 },
{ 1, 0 },
{ 0, 1 },
{ 1, 1 },
{ { { 0, 0, 0, 0 } } },
{ { { 1, 0, 0, 0 } } },
{ { { 0, 1, 0, 0 } } },
{ { { 1, 1, 0, 0 } } },
};
// Tricksy alert! Texture coordinates are computed from the same cornerOffsets

16
Kits/DirectXTK12/Src/SpriteFont.cpp
Просмотреть файл

@ -379,19 +379,19 @@ void XM_CALLCONV SpriteFont::DrawString(_In_ SpriteBatch* spriteBatch, _In_z_ wc
// Lookup table indicates which way to move along each axis per SpriteEffects enum value.
static XMVECTORF32 axisDirectionTable[4] =
{
{ -1, -1 },
{ 1, -1 },
{ -1, 1 },
{ 1, 1 },
{ { { -1, -1, 0, 0 } } },
{ { { 1, -1, 0, 0 } } },
{ { { -1, 1, 0, 0 } } },
{ { { 1, 1, 0, 0 } } },
};
// Lookup table indicates which axes are mirrored for each SpriteEffects enum value.
static XMVECTORF32 axisIsMirroredTable[4] =
{
{ 0, 0 },
{ 1, 0 },
{ 0, 1 },
{ 1, 1 },
{ { { 0, 0, 0, 0 } } },
{ { { 1, 0, 0, 0 } } },
{ { { 0, 1, 0, 0 } } },
{ { { 1, 1, 0, 0 } } },
};
XMVECTOR baseOffset = origin;

254
Kits/DirectXTK12/Src/TeapotData.inc
Просмотреть файл

@ -55,131 +55,131 @@ const TeapotPatch TeapotPatches[] =
// Static array defines the control point positions that make up the teapot.
const DirectX::XMVECTORF32 TeapotControlPoints[] =
{
{ 0, 0.345f, -0.05f },
{ -0.028f, 0.345f, -0.05f },
{ -0.05f, 0.345f, -0.028f },
{ -0.05f, 0.345f, -0 },
{ 0, 0.3028125f, -0.334375f },
{ -0.18725f, 0.3028125f, -0.334375f },
{ -0.334375f, 0.3028125f, -0.18725f },
{ -0.334375f, 0.3028125f, -0 },
{ 0, 0.3028125f, -0.359375f },
{ -0.20125f, 0.3028125f, -0.359375f },
{ -0.359375f, 0.3028125f, -0.20125f },
{ -0.359375f, 0.3028125f, -0 },
{ 0, 0.27f, -0.375f },
{ -0.21f, 0.27f, -0.375f },
{ -0.375f, 0.27f, -0.21f },
{ -0.375f, 0.27f, -0 },
{ 0, 0.13875f, -0.4375f },
{ -0.245f, 0.13875f, -0.4375f },
{ -0.4375f, 0.13875f, -0.245f },
{ -0.4375f, 0.13875f, -0 },
{ 0, 0.007499993f, -0.5f },
{ -0.28f, 0.007499993f, -0.5f },
{ -0.5f, 0.007499993f, -0.28f },
{ -0.5f, 0.007499993f, -0 },
{ 0, -0.105f, -0.5f },
{ -0.28f, -0.105f, -0.5f },
{ -0.5f, -0.105f, -0.28f },
{ -0.5f, -0.105f, -0 },
{ 0, -0.105f, 0.5f },
{ 0, -0.2175f, -0.5f },
{ -0.28f, -0.2175f, -0.5f },
{ -0.5f, -0.2175f, -0.28f },
{ -0.5f, -0.2175f, -0 },
{ 0, -0.27375f, -0.375f },
{ -0.21f, -0.27375f, -0.375f },
{ -0.375f, -0.27375f, -0.21f },
{ -0.375f, -0.27375f, -0 },
{ 0, -0.2925f, -0.375f },
{ -0.21f, -0.2925f, -0.375f },
{ -0.375f, -0.2925f, -0.21f },
{ -0.375f, -0.2925f, -0 },
{ 0, 0.17625f, 0.4f },
{ -0.075f, 0.17625f, 0.4f },
{ -0.075f, 0.2325f, 0.375f },
{ 0, 0.2325f, 0.375f },
{ 0, 0.17625f, 0.575f },
{ -0.075f, 0.17625f, 0.575f },
{ -0.075f, 0.2325f, 0.625f },
{ 0, 0.2325f, 0.625f },
{ 0, 0.17625f, 0.675f },
{ -0.075f, 0.17625f, 0.675f },
{ -0.075f, 0.2325f, 0.75f },
{ 0, 0.2325f, 0.75f },
{ 0, 0.12f, 0.675f },
{ -0.075f, 0.12f, 0.675f },
{ -0.075f, 0.12f, 0.75f },
{ 0, 0.12f, 0.75f },
{ 0, 0.06375f, 0.675f },
{ -0.075f, 0.06375f, 0.675f },
{ -0.075f, 0.007499993f, 0.75f },
{ 0, 0.007499993f, 0.75f },
{ 0, -0.04875001f, 0.625f },
{ -0.075f, -0.04875001f, 0.625f },
{ -0.075f, -0.09562501f, 0.6625f },
{ 0, -0.09562501f, 0.6625f },
{ -0.075f, -0.105f, 0.5f },
{ -0.075f, -0.18f, 0.475f },
{ 0, -0.18f, 0.475f },
{ 0, 0.02624997f, -0.425f },
{ -0.165f, 0.02624997f, -0.425f },
{ -0.165f, -0.18f, -0.425f },
{ 0, -0.18f, -0.425f },
{ 0, 0.02624997f, -0.65f },
{ -0.165f, 0.02624997f, -0.65f },
{ -0.165f, -0.12375f, -0.775f },
{ 0, -0.12375f, -0.775f },
{ 0, 0.195f, -0.575f },
{ -0.0625f, 0.195f, -0.575f },
{ -0.0625f, 0.17625f, -0.6f },
{ 0, 0.17625f, -0.6f },
{ 0, 0.27f, -0.675f },
{ -0.0625f, 0.27f, -0.675f },
{ -0.0625f, 0.27f, -0.825f },
{ 0, 0.27f, -0.825f },
{ 0, 0.28875f, -0.7f },
{ -0.0625f, 0.28875f, -0.7f },
{ -0.0625f, 0.2934375f, -0.88125f },
{ 0, 0.2934375f, -0.88125f },
{ 0, 0.28875f, -0.725f },
{ -0.0375f, 0.28875f, -0.725f },
{ -0.0375f, 0.298125f, -0.8625f },
{ 0, 0.298125f, -0.8625f },
{ 0, 0.27f, -0.7f },
{ -0.0375f, 0.27f, -0.7f },
{ -0.0375f, 0.27f, -0.8f },
{ 0, 0.27f, -0.8f },
{ 0, 0.4575f, -0 },
{ 0, 0.4575f, -0.2f },
{ -0.1125f, 0.4575f, -0.2f },
{ -0.2f, 0.4575f, -0.1125f },
{ -0.2f, 0.4575f, -0 },
{ 0, 0.3825f, -0 },
{ 0, 0.27f, -0.35f },
{ -0.196f, 0.27f, -0.35f },
{ -0.35f, 0.27f, -0.196f },
{ -0.35f, 0.27f, -0 },
{ 0, 0.3075f, -0.1f },
{ -0.056f, 0.3075f, -0.1f },
{ -0.1f, 0.3075f, -0.056f },
{ -0.1f, 0.3075f, -0 },
{ 0, 0.3075f, -0.325f },
{ -0.182f, 0.3075f, -0.325f },
{ -0.325f, 0.3075f, -0.182f },
{ -0.325f, 0.3075f, -0 },
{ 0, 0.27f, -0.325f },
{ -0.182f, 0.27f, -0.325f },
{ -0.325f, 0.27f, -0.182f },
{ -0.325f, 0.27f, -0 },
{ 0, -0.33f, -0 },
{ -0.1995f, -0.33f, -0.35625f },
{ 0, -0.31125f, -0.375f },
{ 0, -0.33f, -0.35625f },
{ -0.35625f, -0.33f, -0.1995f },
{ -0.375f, -0.31125f, -0 },
{ -0.35625f, -0.33f, -0 },
{ -0.21f, -0.31125f, -0.375f },
{ -0.375f, -0.31125f, -0.21f },
{ { { 0, 0.345f, -0.05f, 0 } } },
{ { { -0.028f, 0.345f, -0.05f, 0 } } },
{ { { -0.05f, 0.345f, -0.028f, 0 } } },
{ { { -0.05f, 0.345f, -0, 0 } } },
{ { { 0, 0.3028125f, -0.334375f, 0 } } },
{ { { -0.18725f, 0.3028125f, -0.334375f, 0 } } },
{ { { -0.334375f, 0.3028125f, -0.18725f, 0 } } },
{ { { -0.334375f, 0.3028125f, -0, 0 } } },
{ { { 0, 0.3028125f, -0.359375f, 0 } } },
{ { { -0.20125f, 0.3028125f, -0.359375f, 0 } } },
{ { { -0.359375f, 0.3028125f, -0.20125f, 0 } } },
{ { { -0.359375f, 0.3028125f, -0, 0 } } },
{ { { 0, 0.27f, -0.375f, 0 } } },
{ { { -0.21f, 0.27f, -0.375f, 0 } } },
{ { { -0.375f, 0.27f, -0.21f, 0 } } },
{ { { -0.375f, 0.27f, -0, 0 } } },
{ { { 0, 0.13875f, -0.4375f, 0 } } },
{ { { -0.245f, 0.13875f, -0.4375f, 0 } } },
{ { { -0.4375f, 0.13875f, -0.245f, 0 } } },
{ { { -0.4375f, 0.13875f, -0, 0 } } },
{ { { 0, 0.007499993f, -0.5f, 0 } } },
{ { { -0.28f, 0.007499993f, -0.5f, 0 } } },
{ { { -0.5f, 0.007499993f, -0.28f, 0 } } },
{ { { -0.5f, 0.007499993f, -0, 0 } } },
{ { { 0, -0.105f, -0.5f, 0 } } },
{ { { -0.28f, -0.105f, -0.5f, 0 } } },
{ { { -0.5f, -0.105f, -0.28f, 0 } } },
{ { { -0.5f, -0.105f, -0, 0 } } },
{ { { 0, -0.105f, 0.5f, 0 } } },
{ { { 0, -0.2175f, -0.5f, 0 } } },
{ { { -0.28f, -0.2175f, -0.5f, 0 } } },
{ { { -0.5f, -0.2175f, -0.28f, 0 } } },
{ { { -0.5f, -0.2175f, -0, 0 } } },
{ { { 0, -0.27375f, -0.375f, 0 } } },
{ { { -0.21f, -0.27375f, -0.375f, 0 } } },
{ { { -0.375f, -0.27375f, -0.21f, 0 } } },
{ { { -0.375f, -0.27375f, -0, 0 } } },
{ { { 0, -0.2925f, -0.375f, 0 } } },
{ { { -0.21f, -0.2925f, -0.375f, 0 } } },
{ { { -0.375f, -0.2925f, -0.21f, 0 } } },
{ { { -0.375f, -0.2925f, -0, 0 } } },
{ { { 0, 0.17625f, 0.4f, 0 } } },
{ { { -0.075f, 0.17625f, 0.4f, 0 } } },
{ { { -0.075f, 0.2325f, 0.375f, 0 } } },
{ { { 0, 0.2325f, 0.375f, 0 } } },
{ { { 0, 0.17625f, 0.575f, 0 } } },
{ { { -0.075f, 0.17625f, 0.575f, 0 } } },
{ { { -0.075f, 0.2325f, 0.625f, 0 } } },
{ { { 0, 0.2325f, 0.625f, 0 } } },
{ { { 0, 0.17625f, 0.675f, 0 } } },
{ { { -0.075f, 0.17625f, 0.675f, 0 } } },
{ { { -0.075f, 0.2325f, 0.75f, 0 } } },
{ { { 0, 0.2325f, 0.75f, 0 } } },
{ { { 0, 0.12f, 0.675f, 0 } } },
{ { { -0.075f, 0.12f, 0.675f, 0 } } },
{ { { -0.075f, 0.12f, 0.75f, 0 } } },
{ { { 0, 0.12f, 0.75f, 0 } } },
{ { { 0, 0.06375f, 0.675f, 0 } } },
{ { { -0.075f, 0.06375f, 0.675f, 0 } } },
{ { { -0.075f, 0.007499993f, 0.75f, 0 } } },
{ { { 0, 0.007499993f, 0.75f, 0 } } },
{ { { 0, -0.04875001f, 0.625f, 0 } } },
{ { { -0.075f, -0.04875001f, 0.625f, 0 } } },
{ { { -0.075f, -0.09562501f, 0.6625f, 0 } } },
{ { { 0, -0.09562501f, 0.6625f, 0 } } },
{ { { -0.075f, -0.105f, 0.5f, 0 } } },
{ { { -0.075f, -0.18f, 0.475f, 0 } } },
{ { { 0, -0.18f, 0.475f, 0 } } },
{ { { 0, 0.02624997f, -0.425f, 0 } } },
{ { { -0.165f, 0.02624997f, -0.425f, 0 } } },
{ { { -0.165f, -0.18f, -0.425f, 0 } } },
{ { { 0, -0.18f, -0.425f, 0 } } },
{ { { 0, 0.02624997f, -0.65f, 0 } } },
{ { { -0.165f, 0.02624997f, -0.65f, 0 } } },
{ { { -0.165f, -0.12375f, -0.775f, 0 } } },
{ { { 0, -0.12375f, -0.775f, 0 } } },
{ { { 0, 0.195f, -0.575f, 0 } } },
{ { { -0.0625f, 0.195f, -0.575f, 0 } } },
{ { { -0.0625f, 0.17625f, -0.6f, 0 } } },
{ { { 0, 0.17625f, -0.6f, 0 } } },
{ { { 0, 0.27f, -0.675f, 0 } } },
{ { { -0.0625f, 0.27f, -0.675f, 0 } } },
{ { { -0.0625f, 0.27f, -0.825f, 0 } } },
{ { { 0, 0.27f, -0.825f, 0 } } },
{ { { 0, 0.28875f, -0.7f, 0 } } },
{ { { -0.0625f, 0.28875f, -0.7f, 0 } } },
{ { { -0.0625f, 0.2934375f, -0.88125f, 0 } } },
{ { { 0, 0.2934375f, -0.88125f, 0 } } },
{ { { 0, 0.28875f, -0.725f, 0 } } },
{ { { -0.0375f, 0.28875f, -0.725f, 0 } } },
{ { { -0.0375f, 0.298125f, -0.8625f, 0 } } },
{ { { 0, 0.298125f, -0.8625f, 0 } } },
{ { { 0, 0.27f, -0.7f, 0 } } },
{ { { -0.0375f, 0.27f, -0.7f, 0 } } },
{ { { -0.0375f, 0.27f, -0.8f, 0 } } },
{ { { 0, 0.27f, -0.8f, 0 } } },
{ { { 0, 0.4575f, -0, 0 } } },
{ { { 0, 0.4575f, -0.2f, 0 } } },
{ { { -0.1125f, 0.4575f, -0.2f, 0 } } },
{ { { -0.2f, 0.4575f, -0.1125f, 0 } } },
{ { { -0.2f, 0.4575f, -0, 0 } } },
{ { { 0, 0.3825f, -0, 0 } } },
{ { { 0, 0.27f, -0.35f, 0 } } },
{ { { -0.196f, 0.27f, -0.35f, 0 } } },
{ { { -0.35f, 0.27f, -0.196f, 0 } } },
{ { { -0.35f, 0.27f, -0, 0 } } },
{ { { 0, 0.3075f, -0.1f, 0 } } },
{ { { -0.056f, 0.3075f, -0.1f, 0 } } },
{ { { -0.1f, 0.3075f, -0.056f, 0 } } },
{ { { -0.1f, 0.3075f, -0, 0 } } },
{ { { 0, 0.3075f, -0.325f, 0 } } },
{ { { -0.182f, 0.3075f, -0.325f, 0 } } },
{ { { -0.325f, 0.3075f, -0.182f, 0 } } },
{ { { -0.325f, 0.3075f, -0, 0 } } },
{ { { 0, 0.27f, -0.325f, 0 } } },
{ { { -0.182f, 0.27f, -0.325f, 0 } } },
{ { { -0.325f, 0.27f, -0.182f, 0 } } },
{ { { -0.325f, 0.27f, -0, 0 } } },
{ { { 0, -0.33f, -0, 0 } } },
{ { { -0.1995f, -0.33f, -0.35625f, 0 } } },
{ { { 0, -0.31125f, -0.375f, 0 } } },
{ { { 0, -0.33f, -0.35625f, 0 } } },
{ { { -0.35625f, -0.33f, -0.1995f, 0 } } },
{ { { -0.375f, -0.31125f, -0, 0 } } },
{ { { -0.35625f, -0.33f, -0, 0 } } },
{ { { -0.21f, -0.31125f, -0.375f, 0 } } },
{ { { -0.375f, -0.31125f, -0.21f, 0 } } },
};

6
Kits/DirectXTK12/Src/ToneMapPostProcess.cpp
Просмотреть файл

@ -234,12 +234,12 @@ SharedResourcePool<ID3D12Device*, DeviceResources> ToneMapPostProcess::Impl::dev
// Constructor.
ToneMapPostProcess::Impl::Impl(_In_ ID3D12Device* device, const RenderTargetState& rtState, Operator op, TransferFunction func, bool mrt)
: mDeviceResources(deviceResourcesPool.DemandCreate(device)),
: constants{},
texture{},
linearExposure(1.f),
paperWhiteNits(200.f),
mDirtyFlags(INT_MAX),
constants{},
texture{}
mDeviceResources(deviceResourcesPool.DemandCreate(device))
{
if (op < 0 || op >= Operator_Max)
throw std::out_of_range("Tonemap operator not defined");

28
Kits/DirectXTK12/Src/pch.h
Просмотреть файл

@ -13,6 +13,34 @@
#pragma once
// Off by default warnings
#pragma warning(disable : 4061 4265 4355 4365 4571 4623 4625 4626 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032)
// C4061 enumerator 'X' in switch of enum 'X' is not explicitly handled by a case label
// C4265 class has virtual functions, but destructor is not virtual
// C4355 'this': used in base member initializer list
// C4365 signed/unsigned mismatch
// C4571 behavior change
// C4623 default constructor was implicitly defined as deleted
// C4625 copy constructor was implicitly defined as deleted
// C4626 assignment operator was implicitly defined as deleted
// C4668 not defined as a preprocessor macro
// C4710 function not inlined
// C4711 selected for automatic inline expansion
// C4746 volatile access of '<expression>' is subject to /volatile:<iso|ms> setting
// C4774 format string expected in argument 3 is not a string literal
// C4820 padding added after data member
// C4987 nonstandard extension used
// C5026 move constructor was implicitly defined as deleted
// C5027 move assignment operator was implicitly defined as deleted
// C5031/5032 push/pop mismatches in windows headers
// XBox One XDK related Off by default warnings
#pragma warning(disable : 4619 4471 4917 4986)
// C4619 #pragma warning: there is no warning number 'X'
// C4471 forward declaration of an unscoped enumeration must have an underlying type
// C4917 a GUID can only be associated with a class, interface or namespace
// C4986 exception specification does not match previous declaration
#pragma warning(push)
#pragma warning(disable : 4005)
#define WIN32_LEAN_AND_MEAN