Skinning.fxh shared shader file added

CMakeLists.txt

@@ -129,6 +129,7 @@ set(SHADER_SOURCES
     Src/Shaders/PostProcess.fx
     Src/Shaders/RootSig.fxh
     Src/Shaders/SkinnedEffect.fx
+    Src/Shaders/Skinning.fxh
     Src/Shaders/SpriteEffect.fx
     Src/Shaders/Structures.fxh
     Src/Shaders/ToneMap.fx

DirectXTK_Desktop_2017_Win10.vcxproj

@@ -139,6 +139,7 @@
     <None Include="Src\Shaders\PBRCommon.fxh" />
     <None Include="Src\Shaders\PixelPacking_Velocity.hlsli" />
     <None Include="Src\Shaders\RootSig.fxh" />
+    <None Include="Src\Shaders\Skinning.fxh" />
     <None Include="Src\Shaders\SpriteEffect.fx" />
     <None Include="Src\Shaders\Structures.fxh" />
     <None Include="Src\Shaders\Utilities.fxh" />

DirectXTK_Desktop_2017_Win10.vcxproj.filters

@@ -374,5 +374,8 @@
       <Filter>Src\Shaders</Filter>
     </None>
     <None Include="README.md" />
+    <None Include="Src\Shaders\Skinning.fxh">
+      <Filter>Src\Shaders\Shared</Filter>
+    </None>
   </ItemGroup>
 </Project>

DirectXTK_Desktop_2019_Win10.vcxproj

@@ -139,6 +139,7 @@
     <None Include="Src\Shaders\PBRCommon.fxh" />
     <None Include="Src\Shaders\PixelPacking_Velocity.hlsli" />
     <None Include="Src\Shaders\RootSig.fxh" />
+    <None Include="Src\Shaders\Skinning.fxh" />
     <None Include="Src\Shaders\SpriteEffect.fx" />
     <None Include="Src\Shaders\Structures.fxh" />
     <None Include="Src\Shaders\Utilities.fxh" />

DirectXTK_Desktop_2019_Win10.vcxproj.filters

@@ -374,5 +374,8 @@
       <Filter>Src\Shaders</Filter>
     </None>
     <None Include="README.md" />
+    <None Include="Src\Shaders\Skinning.fxh">
+      <Filter>Src\Shaders\Shared</Filter>
+    </None>
   </ItemGroup>
 </Project>

DirectXTK_Desktop_2022_Win10.vcxproj

@@ -139,6 +139,7 @@
     <None Include="Src\Shaders\PBRCommon.fxh" />
     <None Include="Src\Shaders\PixelPacking_Velocity.hlsli" />
     <None Include="Src\Shaders\RootSig.fxh" />
+    <None Include="Src\Shaders\Skinning.fxh" />
     <None Include="Src\Shaders\SpriteEffect.fx" />
     <None Include="Src\Shaders\Structures.fxh" />
     <None Include="Src\Shaders\Utilities.fxh" />

DirectXTK_Desktop_2022_Win10.vcxproj.filters

@@ -374,5 +374,8 @@
       <Filter>Src\Shaders</Filter>
     </None>
     <None Include="README.md" />
+    <None Include="Src\Shaders\Skinning.fxh">
+      <Filter>Src\Shaders\Shared</Filter>
+    </None>
   </ItemGroup>
 </Project>

DirectXTK_GDK_2017.vcxproj

@@ -607,6 +607,7 @@
     <None Include="Src\Shaders\PBRCommon.fxh" />
     <None Include="Src\Shaders\PixelPacking_Velocity.hlsli" />
     <None Include="Src\Shaders\RootSig.fxh" />
+    <None Include="Src\Shaders\Skinning.fxh" />
     <None Include="Src\Shaders\Structures.fxh" />
     <None Include="Src\Shaders\Utilities.fxh" />
     <None Include="Src\TeapotData.inc" />

DirectXTK_GDK_2017.vcxproj.filters

@@ -380,5 +380,8 @@
       <Filter>Src\Shaders</Filter>
     </None>
     <None Include="README.md" />
+    <None Include="Src\Shaders\Skinning.fxh">
+      <Filter>Src\Shaders\Shared</Filter>
+    </None>
   </ItemGroup>
 </Project>

DirectXTK_GDK_2019.vcxproj

@@ -616,6 +616,7 @@
     <None Include="Src\Shaders\PBRCommon.fxh" />
     <None Include="Src\Shaders\PixelPacking_Velocity.hlsli" />
     <None Include="Src\Shaders\RootSig.fxh" />
+    <None Include="Src\Shaders\Skinning.fxh" />
     <None Include="Src\Shaders\Structures.fxh" />
     <None Include="Src\Shaders\Utilities.fxh" />
     <None Include="Src\TeapotData.inc" />

DirectXTK_GDK_2019.vcxproj.filters

@@ -380,5 +380,8 @@
       <Filter>Src\Shaders</Filter>
     </None>
     <None Include="README.md" />
+    <None Include="Src\Shaders\Skinning.fxh">
+      <Filter>Src\Shaders\Shared</Filter>
+    </None>
   </ItemGroup>
 </Project>

DirectXTK_Windows10_2017.vcxproj

@@ -87,6 +87,7 @@
     <None Include="Src\Shaders\PBRCommon.fxh" />
     <None Include="Src\Shaders\PixelPacking_Velocity.hlsli" />
     <None Include="Src\Shaders\RootSig.fxh" />
+    <None Include="Src\Shaders\Skinning.fxh" />
     <None Include="Src\Shaders\Structures.fxh" />
     <None Include="Src\Shaders\Utilities.fxh" />
     <None Include="Src\TeapotData.inc" />

DirectXTK_Windows10_2017.vcxproj.filters

@@ -219,6 +219,9 @@
       <Filter>Src\Shaders</Filter>
     </None>
     <None Include="README.md" />
+    <None Include="Src\Shaders\Skinning.fxh">
+      <Filter>Src\Shaders\Shared</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Src\AlphaTestEffect.cpp">

DirectXTK_Windows10_2019.vcxproj

@@ -87,6 +87,7 @@
     <None Include="Src\Shaders\PBRCommon.fxh" />
     <None Include="Src\Shaders\PixelPacking_Velocity.hlsli" />
     <None Include="Src\Shaders\RootSig.fxh" />
+    <None Include="Src\Shaders\Skinning.fxh" />
     <None Include="Src\Shaders\Structures.fxh" />
     <None Include="Src\Shaders\Utilities.fxh" />
     <None Include="Src\TeapotData.inc" />

DirectXTK_Windows10_2019.vcxproj.filters

@@ -219,6 +219,9 @@
       <Filter>Src\Shaders</Filter>
     </None>
     <None Include="README.md" />
+    <None Include="Src\Shaders\Skinning.fxh">
+      <Filter>Src\Shaders\Shared</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Src\AlphaTestEffect.cpp">

DirectXTK_XboxOneXDK_2017.vcxproj

@@ -126,6 +126,7 @@
     <None Include="Src\Shaders\PBRCommon.fxh" />
     <None Include="Src\Shaders\PixelPacking_Velocity.hlsli" />
     <None Include="Src\Shaders\RootSig.fxh" />
+    <None Include="Src\Shaders\Skinning.fxh" />
     <None Include="Src\Shaders\Structures.fxh" />
     <None Include="Src\Shaders\Utilities.fxh" />
     <None Include="Src\TeapotData.inc" />

DirectXTK_XboxOneXDK_2017.vcxproj.filters

@@ -382,5 +382,8 @@
       <Filter>Src\Shaders</Filter>
     </None>
     <None Include="README.md" />
+    <None Include="Src\Shaders\Skinning.fxh">
+      <Filter>Src\Shaders\Shared</Filter>
+    </None>
   </ItemGroup>
 </Project>

Src/Shaders/AlphaTestEffect.fx

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/?LinkID=615561
-// http://create.msdn.com/en-US/education/catalog/sample/stock_effects
 
 
 Texture2D<float4> Texture : register(t0);

Src/Shaders/BasicEffect.fx

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/?LinkID=615561
-// http://create.msdn.com/en-US/education/catalog/sample/stock_effects
 
 
 Texture2D<float4> Texture : register(t0);

Src/Shaders/Common.fxh

@@ -4,7 +4,6 @@
 // http://go.microsoft.com/fwlink/?LinkId=248926
 // http://go.microsoft.com/fwlink/?LinkId=248929
 // http://go.microsoft.com/fwlink/?LinkID=615561
-// http://create.msdn.com/en-US/education/catalog/sample/stock_effects
 
 
 float ComputeFogFactor(float4 position)

Src/Shaders/DualTextureEffect.fx

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/?LinkID=615561
-// http://create.msdn.com/en-US/education/catalog/sample/stock_effects
 
 
 Texture2D<float4> Texture  : register(t0);

Src/Shaders/EnvironmentMapEffect.fx

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/?LinkID=615561
-// http://create.msdn.com/en-US/education/catalog/sample/stock_effects
 
 
 Texture2D<float4>   Texture             : register(t0);

Src/Shaders/Lighting.fxh

@@ -4,7 +4,6 @@
 // http://go.microsoft.com/fwlink/?LinkId=248926
 // http://go.microsoft.com/fwlink/?LinkId=248929
 // http://go.microsoft.com/fwlink/?LinkID=615561
-// http://create.msdn.com/en-US/education/catalog/sample/stock_effects
 
 
 struct ColorPair

Src/Shaders/NormalMapEffect.fx

@@ -42,21 +42,7 @@ cbuffer SkinningParameters : register(b1)
 #include "RootSig.fxh"
 #include "Lighting.fxh"
 #include "Utilities.fxh"
-
-
-float3 Skin(inout VSInputNmTxWeights vin, float3 normal, uniform int boneCount)
-{
-    float4x3 skinning = 0;
-
-    [unroll]
-    for (int i = 0; i < boneCount; i++)
-    {
-        skinning += Bones[vin.Indices[i]] * vin.Weights[i];
-    }
-
-    vin.Position.xyz = mul(vin.Position, skinning);
-    return mul(normal, (float3x3) skinning);
-}
+#include "Skinning.fxh"
 
 
 // Vertex shader: pixel lighting + texture.

Src/Shaders/PBRCommon.fxh

@@ -4,7 +4,6 @@
 // http://go.microsoft.com/fwlink/?LinkId=248926
 // http://go.microsoft.com/fwlink/?LinkId=248929
 // http://go.microsoft.com/fwlink/?LinkID=615561
-// http://create.msdn.com/en-US/education/catalog/sample/stock_effects
 
 
 struct CommonVSOutputPixelLighting

Src/Shaders/SkinnedEffect.fx

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/?LinkID=615561
-// http://create.msdn.com/en-US/education/catalog/sample/stock_effects
 
 
 Texture2D<float4> Texture : register(t0);
@@ -38,21 +37,7 @@ cbuffer Parameters : register(b0)
 #include "RootSig.fxh"
 #include "Lighting.fxh"
 #include "Utilities.fxh"
-
-[RootSignature(MainRS)]
-float3 Skin(inout VSInputNmTxWeights vin, float3 normal, uniform int boneCount)
-{
-    float4x3 skinning = 0;
-
-    [unroll]
-    for (int i = 0; i < boneCount; i++)
-    {
-        skinning += Bones[vin.Indices[i]] * vin.Weights[i];
-    }
-
-    vin.Position.xyz = mul(vin.Position, skinning);
-    return mul(normal, (float3x3)skinning);
-}
+#include "Skinning.fxh"
 
 
 // Vertex shader: vertex lighting, one bone.

Src/Shaders/Skinning.fxh

@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+//
+// http://go.microsoft.com/fwlink/?LinkId=248929
+// http://go.microsoft.com/fwlink/?LinkID=615561
+
+
+float3 Skin(inout VSInputNmTxWeights vin, float3 normal, uniform int boneCount)
+{
+    float4x3 skinning = 0;
+
+    [unroll]
+    for (int i = 0; i < boneCount; i++)
+    {
+        skinning += Bones[vin.Indices[i]] * vin.Weights[i];
+    }
+
+    vin.Position.xyz = mul(vin.Position, skinning);
+    return mul(normal, (float3x3) skinning);
+}

Src/Shaders/SpriteEffect.fx

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/?LinkID=615561
-// http://create.msdn.com/en-US/education/catalog/sample/stock_effects
 
 #include "Structures.fxh"
 #include "RootSig.fxh"

Src/Shaders/Structures.fxh

@@ -4,7 +4,6 @@
 // http://go.microsoft.com/fwlink/?LinkId=248926
 // http://go.microsoft.com/fwlink/?LinkId=248929
 // http://go.microsoft.com/fwlink/?LinkID=615561
-// http://create.msdn.com/en-US/education/catalog/sample/stock_effects
 
 
 // Vertex shader input structures.