redstrate/novus
1
Fork 0
mirror of https://github.com/redstrate/Novus.git synced 2025-04-22 03:57:45 +00:00
Code Activity

renderer: Support meshes without materials properly

Browse source
This commit is contained in:
Joshua Goins 2024-02-02 14:26:01 -05:00
parent 3af1e9f8f9
commit 1b518b1eee
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
renderer/src/renderer.cpp
View file

@ -492,19 +492,20 @@ void Renderer::render(const std::vector<RenderModel> &models)
vkUnmapMemory(device, model.boneInfoMemory); vkUnmapMemory(device, model.boneInfoMemory);
} }
if (model.materials.empty())
continue;
for (const auto &part : model.parts) { for (const auto &part : model.parts) {
RenderMaterial defaultMaterial = {};
RenderMaterial *material = nullptr;
if (static_cast<size_t>(part.materialIndex) >= model.materials.size()) { if (static_cast<size_t>(part.materialIndex) >= model.materials.size()) {
continue; material = &defaultMaterial;
} else {
material = &model.materials[part.materialIndex];
} }
RenderMaterial &material = model.materials[part.materialIndex]; const auto h = hash(model, *material);
const auto h = hash(model, material);
if (!cachedDescriptors.count(h)) { if (!cachedDescriptors.count(h)) {
if (auto descriptor = createDescriptorFor(model, material); descriptor != VK_NULL_HANDLE) { if (auto descriptor = createDescriptorFor(model, *material); descriptor != VK_NULL_HANDLE) {
cachedDescriptors[h] = descriptor; cachedDescriptors[h] = descriptor;
} else { } else {
continue; continue;
@ -517,13 +518,14 @@ void Renderer::render(const std::vector<RenderModel> &models)
vkCmdBindVertexBuffers(commandBuffer, 0, 1, &part.vertexBuffer, offsets); vkCmdBindVertexBuffers(commandBuffer, 0, 1, &part.vertexBuffer, offsets);
vkCmdBindIndexBuffer(commandBuffer, part.indexBuffer, 0, VK_INDEX_TYPE_UINT16); vkCmdBindIndexBuffer(commandBuffer, part.indexBuffer, 0, VK_INDEX_TYPE_UINT16);
glm::mat4 p = glm::perspective(glm::radians(45.0f), swapchainExtent.width / (float)swapchainExtent.height, 0.1f, 100.0f); glm::mat4 p = glm::perspective(glm::radians(45.0f), swapchainExtent.width / (float)swapchainExtent.height, 0.1f, 1000.0f);
glm::mat4 v = view; glm::mat4 v = view;
glm::mat4 vp = p * v; glm::mat4 vp = p * v;
vkCmdPushConstants(commandBuffer, pipelineLayout, VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, 0, sizeof(glm::mat4), &vp); vkCmdPushConstants(commandBuffer, pipelineLayout, VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, 0, sizeof(glm::mat4), &vp);
glm::mat4 m = glm::mat4(1.0f); auto m = glm::mat4(1.0f);
m = glm::translate(m, model.position);
vkCmdPushConstants(commandBuffer, vkCmdPushConstants(commandBuffer,
pipelineLayout, pipelineLayout,
@ -540,7 +542,7 @@ void Renderer::render(const std::vector<RenderModel> &models)
sizeof(int), sizeof(int),
&test); &test);
int type = (int)material.type; int type = (int)material->type;
vkCmdPushConstants(commandBuffer, vkCmdPushConstants(commandBuffer,
pipelineLayout, pipelineLayout,
VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT,