complete
							parent
							
								
									310ab79454
								
							
						
					
					
						commit
						0ed950f7c1
					
				
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| 
						 | 
					@ -216,15 +216,15 @@ public:
 | 
				
			||||||
	void      loadMaterials(tinygltf::Model& input);
 | 
						void      loadMaterials(tinygltf::Model& input);
 | 
				
			||||||
	Node* findNode(Node* parent, uint32_t index);
 | 
						Node* findNode(Node* parent, uint32_t index);
 | 
				
			||||||
	Node* nodeFromIndex(uint32_t index);
 | 
						Node* nodeFromIndex(uint32_t index);
 | 
				
			||||||
	void      loadSkins(tinygltf::Model& input);
 | 
						//void      loadSkins(tinygltf::Model& input);
 | 
				
			||||||
	void      loadAnimations(tinygltf::Model& input);
 | 
						void      loadAnimations(tinygltf::Model& input);
 | 
				
			||||||
	void      loadNode(const tinygltf::Node& inputNode, const tinygltf::Model& input, VulkanglTFModel::Node* parent, uint32_t nodeIndex, std::vector<uint32_t>& indexBuffer, std::vector<VulkanglTFModel::Vertex>& vertexBuffer);
 | 
						void      loadNode(const tinygltf::Node& inputNode, const tinygltf::Model& input, VulkanglTFModel::Node* parent, uint32_t nodeIndex, std::vector<uint32_t>& indexBuffer, std::vector<VulkanglTFModel::Vertex>& vertexBuffer);
 | 
				
			||||||
	glm::mat4 getNodeMatrix(VulkanglTFModel::Node* node);
 | 
						glm::mat4 getNodeMatrix(VulkanglTFModel::Node* node);
 | 
				
			||||||
	void updateNodeMatrix(Node* node, std::vector<glm::mat4>& nodeMatrics);
 | 
						void updateNodeMatrix(Node* node, std::vector<glm::mat4>& nodeMatrics);
 | 
				
			||||||
	void      updateJoints(VulkanglTFModel::Node* node);
 | 
						//void      updateJoints(VulkanglTFModel::Node* node);
 | 
				
			||||||
	void      updateAnimation(float deltaTime,vks::Buffer buffer);
 | 
						void      updateAnimation(float deltaTime, vks::Buffer& buffer);
 | 
				
			||||||
	void drawNode(VkCommandBuffer commandBuffer, VkPipelineLayout pipelineLayout, VulkanglTFModel::Node node);
 | 
						void drawNode(VkCommandBuffer commandBuffer, VkPipelineLayout pipelineLayout, VulkanglTFModel::Node* node, bool bPushConstants);
 | 
				
			||||||
	void      draw(VkCommandBuffer commandBuffer, VkPipelineLayout pipelineLayout);
 | 
						void      draw(VkCommandBuffer commandBuffer, VkPipelineLayout pipelineLayout, bool flag);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class VulkanExample : public VulkanExampleBase
 | 
					class VulkanExample : public VulkanExampleBase
 | 
				
			||||||
| 
						 | 
					@ -344,7 +344,7 @@ public:
 | 
				
			||||||
		// Sampling deltas
 | 
							// Sampling deltas
 | 
				
			||||||
		float deltaPhi = (2.0f * float(M_PI)) / 180.0f;
 | 
							float deltaPhi = (2.0f * float(M_PI)) / 180.0f;
 | 
				
			||||||
		float deltaTheta = (0.5f * float(M_PI)) / 64.0f;
 | 
							float deltaTheta = (0.5f * float(M_PI)) / 64.0f;
 | 
				
			||||||
	} irradinacePushBlock;
 | 
						} irradiancePushBlock;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	struct PrefilterPushBlock {
 | 
						struct PrefilterPushBlock {
 | 
				
			||||||
		glm::mat4 mvp;
 | 
							glm::mat4 mvp;
 | 
				
			||||||
| 
						 | 
					@ -383,7 +383,7 @@ public:
 | 
				
			||||||
		shaderData.buffer.destroy();
 | 
							shaderData.buffer.destroy();
 | 
				
			||||||
		shaderData.skinSSBO.destroy();
 | 
							shaderData.skinSSBO.destroy();
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	void         loadglTFFile(std::string filename, VulkanglTFModel& model, bool bSkyboxFlag = false);
 | 
						void         loadglTFFile(std::string filename, VulkanglTFModel& model, bool bSkyboxFlag);
 | 
				
			||||||
	virtual void getEnabledFeatures();
 | 
						virtual void getEnabledFeatures();
 | 
				
			||||||
	void createAttachment(VkFormat format, VkImageUsageFlagBits usage, FrameBufferAttachment* attachment, uint32_t width, uint32_t height);
 | 
						void createAttachment(VkFormat format, VkImageUsageFlagBits usage, FrameBufferAttachment* attachment, uint32_t width, uint32_t height);
 | 
				
			||||||
	virtual void setupFrameBuffer();
 | 
						virtual void setupFrameBuffer();
 | 
				
			||||||
| 
						 | 
					@ -391,10 +391,10 @@ public:
 | 
				
			||||||
	void         loadAssets();
 | 
						void         loadAssets();
 | 
				
			||||||
	void         setupDescriptors();
 | 
						void         setupDescriptors();
 | 
				
			||||||
	void         preparePipelines();
 | 
						void         preparePipelines();
 | 
				
			||||||
	void prepareToneMappingPipeline();
 | 
						void CreateToneMappingPipeline();
 | 
				
			||||||
	void generateIrradianceCubemap();
 | 
						void GenerateIrradianceCubemap();
 | 
				
			||||||
	void generatePrefilteredCubemap();
 | 
						void GeneratePrefilteredCubemap();
 | 
				
			||||||
	void generateBRDFLUT();
 | 
						void GenerateBRDFLUT();
 | 
				
			||||||
	void         prepareUniformBuffers();
 | 
						void         prepareUniformBuffers();
 | 
				
			||||||
	void         updateUniformBuffers();
 | 
						void         updateUniformBuffers();
 | 
				
			||||||
	void         prepare();
 | 
						void         prepare();
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue