load 3 models and switch between them

emilys314 · May 3, 2020 · 97cb935 · 97cb935
1 parent d8600ae
commit 97cb935
Show file tree

Hide file tree

Showing 13 changed files with 206 additions and 99 deletions.
diff --git a/HelloTriangleApplication.cpp b/HelloTriangleApplication.cpp
diff --git a/RenderObject.cpp b/RenderObject.cpp
diff --git a/RenderObject.h b/RenderObject.h
@@ -28,5 +28,6 @@ struct RenderObject {
 	VkSampler textureSampler;
 
 	glm::mat4 modelMatrix;
+	bool shouldRender = false;
 };
 
diff --git a/VulkanTest.vcxproj b/VulkanTest.vcxproj
@@ -176,23 +176,50 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="HelloTriangleApplication.cpp" />
-    <ClCompile Include="RenderObject.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="VulkanTest.rc" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="small.ico" />
-    <Image Include="textures\bernstein.jpg" />
-    <Image Include="textures\texture.jpg" />
-    <Image Include="textures\viking_room.png" />
+    <Image Include="textures\bernstein_desc.png" />
+    <Image Include="textures\bernstein_texture.png" />
+    <Image Include="textures\propane_desc.png" />
+    <Image Include="textures\propane_texture.png" />
+    <Image Include="textures\water_desc.png" />
     <Image Include="textures\water_texture.png" />
     <Image Include="VulkanTest.ico" />
   </ItemGroup>
   <ItemGroup>
     <None Include="shaders\shader.frag" />
     <None Include="shaders\shader.vert" />
   </ItemGroup>
+  <ItemGroup>
+    <Object Include="models\bernstein.obj">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Object>
+    <Object Include="models\propane.obj">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Object>
+    <Object Include="models\quad.obj">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Object>
+    <Object Include="models\water.obj">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Object>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/VulkanTest.vcxproj.filters b/VulkanTest.vcxproj.filters
@@ -47,9 +47,6 @@
     <ClCompile Include="HelloTriangleApplication.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="RenderObject.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="VulkanTest.rc">
@@ -63,16 +60,22 @@
     <Image Include="VulkanTest.ico">
       <Filter>Resource Files</Filter>
     </Image>
-    <Image Include="textures\bernstein.jpg">
+    <Image Include="textures\water_texture.png">
       <Filter>Source Files\textures</Filter>
     </Image>
-    <Image Include="textures\texture.jpg">
+    <Image Include="textures\bernstein_desc.png">
       <Filter>Source Files\textures</Filter>
     </Image>
-    <Image Include="textures\viking_room.png">
+    <Image Include="textures\bernstein_texture.png">
       <Filter>Source Files\textures</Filter>
     </Image>
-    <Image Include="textures\water_texture.png">
+    <Image Include="textures\propane_desc.png">
+      <Filter>Source Files\textures</Filter>
+    </Image>
+    <Image Include="textures\propane_texture.png">
+      <Filter>Source Files\textures</Filter>
+    </Image>
+    <Image Include="textures\water_desc.png">
       <Filter>Source Files\textures</Filter>
     </Image>
   </ItemGroup>
@@ -84,4 +87,18 @@
       <Filter>Source Files\shaders</Filter>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Object Include="models\propane.obj">
+      <Filter>Source Files\models</Filter>
+    </Object>
+    <Object Include="models\quad.obj">
+      <Filter>Source Files\models</Filter>
+    </Object>
+    <Object Include="models\water.obj">
+      <Filter>Source Files\models</Filter>
+    </Object>
+    <Object Include="models\bernstein.obj">
+      <Filter>Source Files\models</Filter>
+    </Object>
+  </ItemGroup>
 </Project>
diff --git a/textures/bernstein.jpg b/textures/bernstein.jpg
diff --git a/textures/bernstein_desc.png b/textures/bernstein_desc.png
diff --git a/textures/bernstein_texture.png b/textures/bernstein_texture.png
diff --git a/textures/propane_desc.png b/textures/propane_desc.png
diff --git a/textures/propane_texture.png b/textures/propane_texture.png
diff --git a/textures/texture.jpg b/textures/texture.jpg
diff --git a/textures/viking_room.png b/textures/viking_room.png
diff --git a/textures/water_desc.png b/textures/water_desc.png