make sure "3D Rendering" uses the same project layout as "Setting Up 3D Rendering"

Floyd Huizinga · Floyd Huizinga · commit c8c5ac8eee90 · 2023-01-05T13:57:37.000+01:00
diff --git a/src/Cpp/1-getting-started/1-3-3-SettingUp3DRendering/1-3-3-SettingUp3DRendering.vcxproj b/src/Cpp/1-getting-started/1-3-3-SettingUp3DRendering/1-3-3-SettingUp3DRendering.vcxproj
@@ -124,7 +124,6 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
   <ItemGroup>
     <ClInclude Include="Definitions.hpp" />
     <ClInclude Include="ShaderCollection.hpp" />
-    <ClInclude Include="ResourceDescriptor.hpp" />
     <ClInclude Include="Setting3DApplication.hpp" />
     <ClInclude Include="VertexType.hpp" />
   </ItemGroup>
diff --git a/src/Cpp/1-getting-started/1-3-3-SettingUp3DRendering/1-3-3-SettingUp3DRendering.vcxproj.filters b/src/Cpp/1-getting-started/1-3-3-SettingUp3DRendering/1-3-3-SettingUp3DRendering.vcxproj.filters
@@ -25,9 +25,6 @@
     <ClInclude Include="ShaderCollection.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ResourceDescriptor.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Setting3DApplication.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/src/Cpp/1-getting-started/1-3-3-SettingUp3DRendering/ResourceDescriptor.hpp b/src/Cpp/1-getting-started/1-3-3-SettingUp3DRendering/ResourceDescriptor.hpp
diff --git a/src/Cpp/1-getting-started/1-3-4-3DRendering/1-3-4-3DRendering.vcxproj b/src/Cpp/1-getting-started/1-3-4-3DRendering/1-3-4-3DRendering.vcxproj
@@ -116,13 +116,9 @@ xcopy /Y $(ProjectDir)Assets\Textures\*.* $(OutDir)Assets\Textures\</Command>
   <ItemGroup>
     <ClInclude Include="3DRenderingApplication.hpp" />
     <ClInclude Include="Definitions.hpp" />
-    <ClInclude Include="ResourceDescriptor.hpp" />
     <ClInclude Include="ShaderCollection.hpp" />
     <ClInclude Include="VertexType.hpp" />
   </ItemGroup>
-  <ItemGroup>
-    <Image Include="Assets\Textures\T_Good_Froge.dds" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="Assets\Shaders\Main.ps.hlsl">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
diff --git a/src/Cpp/1-getting-started/1-3-4-3DRendering/1-3-4-3DRendering.vcxproj.filters b/src/Cpp/1-getting-started/1-3-4-3DRendering/1-3-4-3DRendering.vcxproj.filters
@@ -1,52 +1,30 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    <Filter Include="Assets">
+      <UniqueIdentifier>{65594d11-0ce4-46ca-954c-37cfb4e90093}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    <Filter Include="Assets\Shaders">
+      <UniqueIdentifier>{bc1b63d8-0a47-4d97-ad71-b603d5a65214}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="3DRenderingApplication.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ShaderCollection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="3DRenderingApplication.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="VertexType.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ShaderCollection.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Definitions.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ResourceDescriptor.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
+    <ClCompile Include="Main.cpp" />
+    <ClCompile Include="ShaderCollection.cpp" />
+    <ClCompile Include="3DRenderingApplication.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="Assets\Textures\T_Good_Froge.dds" />
+    <ClInclude Include="VertexType.hpp" />
+    <ClInclude Include="3DRenderingApplication.hpp" />
+    <ClInclude Include="Definitions.hpp" />
+    <ClInclude Include="ShaderCollection.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Assets\Shaders\Main.ps.hlsl" />
-    <None Include="Assets\Shaders\Main.vs.hlsl" />
+    <None Include="Assets\Shaders\Main.vs.hlsl">
+      <Filter>Assets\Shaders</Filter>
+    </None>
+    <None Include="Assets\Shaders\Main.ps.hlsl">
+      <Filter>Assets\Shaders</Filter>
+    </None>
   </ItemGroup>
 </Project>
diff --git a/src/Cpp/1-getting-started/1-3-4-3DRendering/ResourceDescriptor.hpp b/src/Cpp/1-getting-started/1-3-4-3DRendering/ResourceDescriptor.hpp
