Updated for June 2017 release of DirectX Tool Kit

walbourn · Jun 23, 2017 · c666499 · c666499
1 parent d315718
commit c666499
Show file tree

Hide file tree

Showing 48 changed files with 5,848 additions and 41 deletions.
diff --git a/DirectXTK/Audio/DynamicSoundEffectInstance.cpp b/DirectXTK/Audio/DynamicSoundEffectInstance.cpp
@@ -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 ),

diff --git a/DirectXTK/Audio/SoundCommon.cpp b/DirectXTK/Audio/SoundCommon.cpp
@@ -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 )

diff --git a/DirectXTK/Audio/WaveBankReader.h b/DirectXTK/Audio/WaveBankReader.h
@@ -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;
 

diff --git a/DirectXTK/DirectXTK_Desktop_2013.vcxproj b/DirectXTK/DirectXTK_Desktop_2013.vcxproj
@@ -29,6 +29,7 @@
     <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" />
@@ -55,10 +56,12 @@
   <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" />
@@ -87,6 +90,7 @@
     <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>
@@ -297,6 +301,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" />
@@ -343,10 +369,31 @@
     <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>
@@ -385,6 +432,14 @@
       <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">
     <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath>
   </PropertyGroup>
@@ -532,8 +587,6 @@
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
   <Target Name="ATGEnsureShaders" BeforeTargets="PrepareForBuild">
-    <Exec Condition="!Exists('src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc')"
-        WorkingDirectory="$(ProjectDir)src/Shaders"
-        Command="CompileShaders" />
+    <Exec Condition="!Exists('src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc')" WorkingDirectory="$(ProjectDir)src/Shaders" Command="CompileShaders" />
   </Target>
 </Project>
diff --git a/DirectXTK/DirectXTK_Desktop_2013.vcxproj.filters b/DirectXTK/DirectXTK_Desktop_2013.vcxproj.filters
@@ -123,6 +123,9 @@
     <ClInclude Include="Src\vbo.h">
       <Filter>Src\Shared</Filter>
     </ClInclude>
+    <ClInclude Include="Inc\PostProcess.h">
+      <Filter>Inc</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Src\CommonStates.cpp">
@@ -218,6 +221,15 @@
     <ClCompile Include="Src\SimpleMath.cpp">
       <Filter>Src\Shared</Filter>
     </ClCompile>
+    <ClCompile Include="Src\BasicPostProcess.cpp">
+      <Filter>Src</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\DualPostProcess.cpp">
+      <Filter>Src</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\ToneMapPostProcess.cpp">
+      <Filter>Src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="Src\Shaders\CompileShaders.cmd">
@@ -1019,5 +1031,140 @@
     <None Include="Src\Shaders\Compiled\SkinnedEffect_VSSkinnedVertexLightingTwoBonesBn.pdb">
       <Filter>Src\Shaders\Symbols</Filter>
     </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSBloomBlur.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSBloomCombine.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSBloomExtract.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSCopy.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSDownScale2x2.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSDownScale4x4.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSGaussianBlur5x5.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSMerge.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSMonochrome.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSSepia.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_VSQuad.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSBloomBlur.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSBloomCombine.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSBloomExtract.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSCopy.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSDownScale2x2.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSDownScale4x4.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSGaussianBlur5x5.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSMerge.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSMonochrome.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_PSSepia.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\PostProcess_VSQuad.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\ToneMap.fx">
+      <Filter>Src\Shaders</Filter>
+    </None>
+    <None Include="Src\Shaders\PostProcess.fx">
+      <Filter>Src\Shaders</Filter>
+    </None>
+    <None Include="Src\Shaders\Utilities.fxh">
+      <Filter>Src\Shaders\Shared</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PS_SRGB.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSACESFilmic.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSACESFilmic_SRGB.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSCopy.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSHDR10.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSReinhard.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSReinhard_SRGB.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSSaturate.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSSaturate_SRGB.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_VSQuad.inc">
+      <Filter>Src\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PS_SRGB.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSACESFilmic.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSACESFilmic_SRGB.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSCopy.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSHDR10.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSReinhard.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSReinhard_SRGB.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSSaturate.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_PSSaturate_SRGB.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Src\Shaders\Compiled\ToneMap_VSQuad.pdb">
+      <Filter>Src\Shaders\Symbols</Filter>
+    </None>
   </ItemGroup>
 </Project>