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

Code cleanup

Browse source
This commit is contained in:
Sascha Willems 2023-11-25 15:35:54 +01:00
parent 4d0d96e0af
commit 3c0f3e18cd
3 changed files with 5 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

19
examples/subpasses/subpasses.cpp
View file

@ -48,7 +48,6 @@ public:
};
struct {
glm::vec4 viewPos;
Light lights[NUM_LIGHTS];
} uboLights;
@ -766,7 +765,6 @@ public:
// Update
updateUniformBufferDeferredMatrices();
updateUniformBufferDeferredLights();
}
void updateUniformBufferDeferredMatrices()
@ -794,16 +792,11 @@ public:
for (auto& light : uboLights.lights)
{
light.position = glm::vec4(rndDist(rndGen) * 6.0f, 0.25f + std::abs(rndDist(rndGen)) * 4.0f, rndDist(rndGen) * 6.0f, 1.0f);
light.position = glm::vec4(rndDist(rndGen) * 8.0f, 0.25f + std::abs(rndDist(rndGen)) * 4.0f, rndDist(rndGen) * 8.0f, 1.0f);
light.color = colors[rndCol(rndGen)];
light.radius = 1.0f + std::abs(rndDist(rndGen));
}
}
// Update fragment shader light position uniform block
void updateUniformBufferDeferredLights()
{
uboLights.viewPos = glm::vec4(camera.position, 0.0f) * glm::vec4(-1.0f, 1.0f, -1.0f, 1.0f);
memcpy(uniformBuffers.lights.mapped, &uboLights, sizeof(uboLights));
}
@ -825,8 +818,8 @@ public:
{
VulkanExampleBase::prepare();
loadAssets();
initLights();
prepareUniformBuffers();
initLights();
setupDescriptorSetLayout();
preparePipelines();
setupDescriptorPool();
@ -843,16 +836,9 @@ public:
draw();
if (camera.updated) {
updateUniformBufferDeferredMatrices();
updateUniformBufferDeferredLights();
}
}
virtual void viewChanged()
{
updateUniformBufferDeferredMatrices();
updateUniformBufferDeferredLights();
}
virtual void OnUpdateUIOverlay(vks::UIOverlay *overlay)
{
if (overlay->header("Subpasses")) {
@ -863,7 +849,6 @@ public:
if (overlay->header("Settings")) {
if (overlay->button("Randomize lights")) {
initLights();
updateUniformBufferDeferredLights();
}
}
}