claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor code cleanup

Browse source
This commit is contained in:
Sascha Willems 2024-05-01 18:29:52 +02:00
parent 3d641ac5cd
commit 2cb468dd84
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/gltfskinning/gltfskinning.h
View file

@ -1,7 +1,7 @@
/* /*
* Vulkan Example - glTF skinned animation * Vulkan Example - glTF skinned animation
* *
* Copyright (C) 2020-2023 by Sascha Willems - www.saschawillems.de * Copyright (C) 2020-2024 by Sascha Willems - www.saschawillems.de
* *
* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
*/ */
@ -202,7 +202,7 @@ class VulkanExample : public VulkanExampleBase
} values; } values;
} shaderData; } shaderData;
VkPipelineLayout pipelineLayout; VkPipelineLayout pipelineLayout{ VK_NULL_HANDLE };
struct Pipelines struct Pipelines
{ {
VkPipeline solid{ VK_NULL_HANDLE }; VkPipeline solid{ VK_NULL_HANDLE };

18
examples/pbrbasic/pbrbasic.cpp
View file

@ -3,7 +3,7 @@
* *
* See http://graphicrants.blogspot.de/2013/08/specular-brdf-reference.html for a good reference to the different functions that make up a specular BRDF * See http://graphicrants.blogspot.de/2013/08/specular-brdf-reference.html for a good reference to the different functions that make up a specular BRDF
* *
* Copyright (C) 2017-2023 by Sascha Willems - www.saschawillems.de * Copyright (C) 2017-2024 by Sascha Willems - www.saschawillems.de
* *
* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
*/ */
@ -11,9 +11,6 @@
#include "vulkanexamplebase.h" #include "vulkanexamplebase.h"
#include "VulkanglTFModel.h" #include "VulkanglTFModel.h"
#define GRID_DIM 7
#define OBJ_DIM 0.05f
struct Material { struct Material {
// Parameter block used as push constant block // Parameter block used as push constant block
struct PushBlock { struct PushBlock {
@ -150,13 +147,16 @@ public:
Material mat = materials[materialIndex]; Material mat = materials[materialIndex];
for (uint32_t y = 0; y < GRID_DIM; y++) { const uint32_t gridSize = 7;
for (uint32_t x = 0; x < GRID_DIM; x++) {
glm::vec3 pos = glm::vec3(float(x - (GRID_DIM / 2.0f)) * 2.5f, 0.0f, float(y - (GRID_DIM / 2.0f)) * 2.5f); // Render a 2D grid of objects with varying PBR parameters
for (uint32_t y = 0; y < gridSize; y++) {
for (uint32_t x = 0; x < gridSize; x++) {
glm::vec3 pos = glm::vec3(float(x - (gridSize / 2.0f)) * 2.5f, 0.0f, float(y - (gridSize / 2.0f)) * 2.5f);
vkCmdPushConstants(drawCmdBuffers[i], pipelineLayout, VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(glm::vec3), &pos); vkCmdPushConstants(drawCmdBuffers[i], pipelineLayout, VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(glm::vec3), &pos);
// Vary metallic and roughness, two important PBR parameters // Vary metallic and roughness, two important PBR parameters
mat.params.metallic = glm::clamp((float)x / (float)(GRID_DIM - 1), 0.1f, 1.0f); mat.params.metallic = glm::clamp((float)x / (float)(gridSize - 1), 0.1f, 1.0f);
mat.params.roughness = glm::clamp((float)y / (float)(GRID_DIM - 1), 0.05f, 1.0f); mat.params.roughness = glm::clamp((float)y / (float)(gridSize - 1), 0.05f, 1.0f);
vkCmdPushConstants(drawCmdBuffers[i], pipelineLayout, VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(glm::vec3), sizeof(Material::PushBlock), &mat); vkCmdPushConstants(drawCmdBuffers[i], pipelineLayout, VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(glm::vec3), sizeof(Material::PushBlock), &mat);
models.objects[models.objectIndex].draw(drawCmdBuffers[i]); models.objects[models.objectIndex].draw(drawCmdBuffers[i]);
} }