Merge pull request #667 from microsoft/cleanupRaytracingSamples

Fix a copy error during the build process by using the MiniEngine spona.h3d file
microsoft · Nov 5, 2020 · e2e1cbc · e2e1cbc
2 parents d09524e + 66938ba
commit e2e1cbc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj
@@ -149,7 +149,7 @@
     <Image Include="WideLogo.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Models\sponza.h3d">
+    <None Include="..\..\..\..\..\MiniEngine\ModelViewer\Models\sponza.h3d">
       <DeploymentContent>true</DeploymentContent>
     </None>
     <None Include="packages.config" />

diff --git a/...ktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj.filters b/...ktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj.filters
@@ -201,6 +201,12 @@
     <FxCompile Include="*Lib.hlsl" />
     <FxCompile Include="*Lib.hlsl" />
     <FxCompile Include="*Lib.hlsl" />
+    <FxCompile Include="*Lib.hlsl" />
+    <FxCompile Include="*Lib.hlsl" />
+    <FxCompile Include="*Lib.hlsl" />
+    <FxCompile Include="*Lib.hlsl" />
+    <FxCompile Include="*Lib.hlsl" />
+    <FxCompile Include="*Lib.hlsl" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ForwardPlusLighting.cpp" />
@@ -406,14 +412,14 @@
     <None Include="Shaders\LightGrid.hlsli">
       <Filter>Shaders</Filter>
     </None>
-    <None Include="Models\sponza.h3d">
-      <Filter>Resources</Filter>
-    </None>
     <None Include="Shaders\ModelViewerRS.hlsli">
       <Filter>Shaders</Filter>
     </None>
     <None Include="readme.md" />
     <None Include="packages.config" />
+    <None Include="..\..\..\..\..\MiniEngine\ModelViewer\Models\sponza.h3d">
+      <Filter>Resources</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Shaders">