Updated for DirectX Tool Kit June 2017 releases (b3df7d18) · Commits · for microsoft in general / xbox / tunip3 / Xbox-ATG-Samples

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ x64
		Samples/Graphics/SimplePBR12/Compiled/
		Samples/Tools/errorlookup/errorlookup/project.lock.json
		/wiki
		AppPackages
		packages
		!Kits/Telemetry/ARM
		!Kits/Telemetry/Win32

Kits/DirectXTK/Audio/DynamicSoundEffectInstance.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ class DynamicSoundEffectInstance::Impl : public IVoiceNotify
		{
		public:
		Impl( _In_ AudioEngine* engine,
		_In_ DynamicSoundEffectInstance* object, _In_opt_ std::function<void(DynamicSoundEffectInstance*)> bufferNeeded,
		_In_ DynamicSoundEffectInstance* object, std::function<void(DynamicSoundEffectInstance*)>& bufferNeeded,
		int sampleRate, int channels, int sampleBits, SOUND_EFFECT_INSTANCE_FLAGS flags ) :
		mBase(),
		mBufferNeeded( nullptr ),

Kits/DirectXTK/Audio/SoundCommon.cpp

+6 −2

Original line number	Diff line number	Diff line
		@@ -727,7 +727,7 @@ void SoundEffectInstanceBase::Apply3D( const AudioListener& listener, const Audi
		dwCalcFlags \|= X3DAUDIO_CALCULATE_LPF_REVERB \| X3DAUDIO_CALCULATE_REVERB;
		}

		float matrix[ XAUDIO2_MAX_AUDIO_CHANNELS * 8 ];
		float matrix[XAUDIO2_MAX_AUDIO_CHANNELS * 8] = {};
		assert( mDSPSettings.SrcChannelCount <= XAUDIO2_MAX_AUDIO_CHANNELS );
		assert( mDSPSettings.DstChannelCount <= 8 );
		mDSPSettings.pMatrixCoefficients = matrix;
		@@ -766,7 +766,11 @@ void SoundEffectInstanceBase::Apply3D( const AudioListener& listener, const Audi

		if ( reverb )
		{
		(void)voice->SetOutputMatrix( reverb, 1, 1, &mDSPSettings.ReverbLevel );
		for ( size_t j = 0; j < mDSPSettings.SrcChannelCount; ++j )
		{
		matrix[j] = mDSPSettings.ReverbLevel;
		}
		(void)voice->SetOutputMatrix( reverb, mDSPSettings.SrcChannelCount, 1, matrix );
		}

		if ( mFlags & SoundEffectInstance_ReverbUseFilters )

Kits/DirectXTK/Audio/WaveBankReader.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,11 @@ namespace DirectX
		public:
		WaveBankReader();

		#if !defined(_MSC_VER) \|\| _MSC_VER >= 1900
		WaveBankReader(WaveBankReader&&) = default;
		WaveBankReader& operator= (WaveBankReader&&) = default;
		#endif

		WaveBankReader(WaveBankReader const&) = delete;
		WaveBankReader& operator= (WaveBankReader const&) = delete;

Kits/DirectXTK/DirectXTK_Windows10.vcxproj

+57 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@
		<ClInclude Include="Inc\Keyboard.h" />
		<ClInclude Include="Inc\Model.h" />
		<ClInclude Include="Inc\Mouse.h" />
		<ClInclude Include="Inc\PostProcess.h" />
		<ClInclude Include="Inc\PrimitiveBatch.h" />
		<ClInclude Include="Inc\ScreenGrab.h" />
		<ClInclude Include="Inc\SimpleMath.h" />
		@@ -270,6 +271,28 @@
		<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" />
		@@ -316,9 +339,30 @@
		<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\Structures.fxh" />
		<None Include="Src\Shaders\Utilities.fxh" />
		<None Include="Src\TeapotData.inc" />
		</ItemGroup>
		<ItemGroup>
		@@ -332,11 +376,13 @@
		<ClCompile Include="Audio\WAVFileReader.cpp" />
		<ClCompile Include="Src\AlphaTestEffect.cpp" />
		<ClCompile Include="Src\BasicEffect.cpp" />
		<ClCompile Include="Src\BasicPostProcess.cpp" />
		<ClCompile Include="Src\BinaryReader.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\EffectCommon.cpp" />
		<ClCompile Include="Src\EffectFactory.cpp" />
		@@ -366,6 +412,7 @@
		<ClCompile Include="Src\SkinnedEffect.cpp" />
		<ClCompile Include="Src\SpriteBatch.cpp" />
		<ClCompile Include="Src\SpriteFont.cpp" />
		<ClCompile Include="Src\ToneMapPostProcess.cpp" />
		<ClCompile Include="Src\VertexTypes.cpp" />
		<ClCompile Include="Src\WICTextureLoader.cpp" />
		</ItemGroup>
		@@ -409,6 +456,16 @@
		<FileType>Document</FileType>
		</None>
		</ItemGroup>
		<ItemGroup>
		<None Include="Src\Shaders\PostProcess.fx">
		<FileType>Document</FileType>
		</None>
		</ItemGroup>
		<ItemGroup>
		<None Include="Src\Shaders\ToneMap.fx">
		<FileType>Document</FileType>
		</None>
		</ItemGroup>
		<PropertyGroup Label="Globals">
		<ProjectGuid>{f4776924-619c-42c7-88b2-82c947ccc9e7}</ProjectGuid>
		<Keyword>StaticLibrary</Keyword>