From 5804ca009a9346f932e5d1345673450be326af09 Mon Sep 17 00:00:00 2001
From: ink-soul <qingci30@163.com>
Date: Thu, 25 May 2023 16:27:50 +0800
Subject: [PATCH] fix wrong merge

---
 homework/homework1/homework1.cpp | 34 ++++++++++++--------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/homework/homework1/homework1.cpp b/homework/homework1/homework1.cpp
index 8848fe9..298196a 100644
--- a/homework/homework1/homework1.cpp
+++ b/homework/homework1/homework1.cpp
@@ -24,7 +24,7 @@
 		The following functions take a glTF input model loaded via tinyglTF and convert all required data into our own structure
 	*/
 
-	void loadImages(tinygltf::Model& input)
+	void VulkanglTFModel::loadImages(tinygltf::Model& input)
 	{
 		// Images can be stored inside the glTF (which is the case for the sample model), so instead of directly
 		// loading them from disk, we fetch them from the glTF loader and upload the buffers
@@ -60,7 +60,7 @@
 		}
 	}
 
-	void loadTextures(tinygltf::Model& input)
+	void VulkanglTFModel::loadTextures(tinygltf::Model& input)
 	{
 		textures.resize(input.textures.size());
 		for (size_t i = 0; i < input.textures.size(); i++) {
@@ -507,14 +507,6 @@
 		}
 	}
 
-};
-
-class VulkanExample : public VulkanExampleBase
-{
-public:
-	bool wireframe = false;
-
-	VulkanglTFModel glTFModel;
 
 
 	VulkanExample::VulkanExample():
@@ -648,7 +640,7 @@ public:
 		pbrFrameBuffer.bCreate = true;
 	}
 
-	void buildCommandBuffers()
+	void VulkanExample::buildCommandBuffers()
 	{
 		VkCommandBufferBeginInfo cmdBufInfo = vks::initializers::commandBufferBeginInfo();
 
@@ -817,14 +809,14 @@ public:
 		vkFreeMemory(device, indexStaging.memory, nullptr);
 	}
 
-	void loadAssets()
+	void VulkanExample::loadAssets()
 	{
 		loadglTFFile(getAssetPath() + "buster_drone/busterDrone.gltf", glTFModel);
 		loadglTFFile(getAssetPath() + "models/cube.gltf", skyboxModel, true);
 		ibltextures.skyboxCube.loadFromFile(getAssetPath() + "textures/hdr/pisa_cube.ktx", VK_FORMAT_R16G16B16A16_SFLOAT, vulkanDevice, queue);
 	}
 
-	void setupDescriptors()
+	void VulkanExample::setupDescriptors()
 	{
 		/*
 			This sample uses separate descriptor sets (and layouts) for the matrices and materials (textures)
@@ -931,7 +923,7 @@ public:
 		}
 	}
 
-	void preparePipelines()
+	void VulkanExample::preparePipelines()
 	{
 		VkPipelineInputAssemblyStateCreateInfo inputAssemblyStateCI = vks::initializers::pipelineInputAssemblyStateCreateInfo(VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, 0, VK_FALSE);
 		VkPipelineRasterizationStateCreateInfo rasterizationStateCI = vks::initializers::pipelineRasterizationStateCreateInfo(VK_POLYGON_MODE_FILL, VK_CULL_MODE_BACK_BIT, VK_FRONT_FACE_COUNTER_CLOCKWISE, 0);
@@ -2041,7 +2033,7 @@ public:
 
 #pragma endregion
 	// Prepare and initialize uniform buffer containing shader uniforms
-	void prepareUniformBuffers()
+	void VulkanExample::prepareUniformBuffers()
 	{
 		// Vertex shader uniform buffer block
 		VK_CHECK_RESULT(vulkanDevice->createBuffer(
@@ -2073,7 +2065,7 @@ public:
 		updateUniformBuffers();
 	}
 
-	void updateUniformBuffers()
+	void VulkanExample::updateUniformBuffers()
 	{
 		shaderData.values.projection = camera.matrices.perspective;
 		shaderData.values.model = camera.matrices.view;
@@ -2083,7 +2075,7 @@ public:
 		memcpy(shaderData.buffer.mapped, &shaderData.values, sizeof(shaderData.values));
 	}
 
-	void prepare()
+	void VulkanExample::prepare()
 	{
 		VulkanExampleBase::prepare();
 		loadAssets();
@@ -2097,7 +2089,7 @@ public:
 		prepared = true;
 	}
 
-	virtual void render()
+	void VulkanExample::render()
 	{
 		renderFrame();
 		if (camera.updated) {
@@ -2107,12 +2099,12 @@ public:
 			glTFModel.updateAnimation(frameTimer, shaderData.skinSSBO);
 	}
 
-	virtual void viewChanged()
+	void VulkanExample::viewChanged()
 	{
 		updateUniformBuffers();
 	}
 
-	virtual void OnUpdateUIOverlay(vks::UIOverlay *overlay)
+	void VulkanExample::OnUpdateUIOverlay(vks::UIOverlay *overlay)
 	{
 		if (overlay->header("Settings")) {
 			if (overlay->checkBox("Wireframe", &wireframe)) {
@@ -2134,6 +2126,6 @@ public:
 			overlay->checkBox("Pause", &paused);
 		}
 	}
-};
+
 
 VULKAN_EXAMPLE_MAIN()