From 87c21f99fefb7b446d7014b0897c24f6471d30dd Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sat, 2 Sep 2023 12:34:00 +0200 Subject: [PATCH] Rename MeshSurfaces to MeshSurfaceIndexes for clarity --- src/common/rendering/hwrenderer/data/hw_levelmesh.h | 2 +- src/common/rendering/vulkan/accelstructs/vk_raytrace.cpp | 4 ++-- src/rendering/hwrenderer/doom_levelmesh.cpp | 6 +++--- src/rendering/hwrenderer/doom_levelmesh.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/rendering/hwrenderer/data/hw_levelmesh.h b/src/common/rendering/hwrenderer/data/hw_levelmesh.h index e8e745f518..d33806aea7 100644 --- a/src/common/rendering/hwrenderer/data/hw_levelmesh.h +++ b/src/common/rendering/hwrenderer/data/hw_levelmesh.h @@ -205,7 +205,7 @@ public: TArray MeshVertices; TArray MeshUVIndex; TArray MeshElements; - TArray MeshSurfaces; + TArray MeshSurfaceIndexes; TArray surfaceInfo; TArray portalInfo; diff --git a/src/common/rendering/vulkan/accelstructs/vk_raytrace.cpp b/src/common/rendering/vulkan/accelstructs/vk_raytrace.cpp index 00098ab42e..eb30000e4d 100644 --- a/src/common/rendering/vulkan/accelstructs/vk_raytrace.cpp +++ b/src/common/rendering/vulkan/accelstructs/vk_raytrace.cpp @@ -138,7 +138,7 @@ void VkRaytrace::CreateVertexAndIndexBuffers() surfaceIndexBuffer = BufferBuilder() .Usage(VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT) - .Size(Mesh->MeshSurfaces.Size() * sizeof(int)) + .Size(Mesh->MeshSurfaceIndexes.Size() * sizeof(int)) .DebugName("surfaceBuffer") .Create(fb->GetDevice()); @@ -158,7 +158,7 @@ void VkRaytrace::CreateVertexAndIndexBuffers() .AddBuffer(vertexBuffer.get(), vertices.data(), vertices.size() * sizeof(FVector4)) .AddBuffer(indexBuffer.get(), Mesh->MeshElements.Data(), (size_t)Mesh->MeshElements.Size() * sizeof(uint32_t)) .AddBuffer(nodesBuffer.get(), &nodesHeader, sizeof(CollisionNodeBufferHeader), nodes.data(), nodes.size() * sizeof(CollisionNode)) - .AddBuffer(surfaceIndexBuffer.get(), Mesh->MeshSurfaces.Data(), Mesh->MeshSurfaces.Size() * sizeof(int)) + .AddBuffer(surfaceIndexBuffer.get(), Mesh->MeshSurfaceIndexes.Data(), Mesh->MeshSurfaceIndexes.Size() * sizeof(int)) .AddBuffer(surfaceBuffer.get(), Mesh->surfaceInfo.Data(), Mesh->surfaceInfo.Size() * sizeof(SurfaceInfo)) .AddBuffer(portalBuffer.get(), Mesh->portalInfo.Data(), Mesh->portalInfo.Size() * sizeof(PortalInfo)) .Execute(fb->GetDevice(), fb->GetCommands()->GetTransferCommands()); diff --git a/src/rendering/hwrenderer/doom_levelmesh.cpp b/src/rendering/hwrenderer/doom_levelmesh.cpp index 1f0b70165b..852dfda07c 100644 --- a/src/rendering/hwrenderer/doom_levelmesh.cpp +++ b/src/rendering/hwrenderer/doom_levelmesh.cpp @@ -61,7 +61,7 @@ DoomLevelMesh::DoomLevelMesh(FLevelLocals &doomMap) MeshElements.Push(pos); MeshElements.Push(pos + j - 1); MeshElements.Push(pos + j); - MeshSurfaces.Push((int)i); + MeshSurfaceIndexes.Push((int)i); } } } @@ -72,14 +72,14 @@ DoomLevelMesh::DoomLevelMesh(FLevelLocals &doomMap) MeshElements.Push(pos + 0); MeshElements.Push(pos + 1); MeshElements.Push(pos + 2); - MeshSurfaces.Push((int)i); + MeshSurfaceIndexes.Push((int)i); } if (!IsDegenerate(verts[1], verts[2], verts[3])) { MeshElements.Push(pos + 3); MeshElements.Push(pos + 2); MeshElements.Push(pos + 1); - MeshSurfaces.Push((int)i); + MeshSurfaceIndexes.Push((int)i); } } } diff --git a/src/rendering/hwrenderer/doom_levelmesh.h b/src/rendering/hwrenderer/doom_levelmesh.h index 4b8874b829..a7792c7bc6 100644 --- a/src/rendering/hwrenderer/doom_levelmesh.h +++ b/src/rendering/hwrenderer/doom_levelmesh.h @@ -24,7 +24,7 @@ public: if (hit.fraction == 1.0f) return true; - int surfaceIndex = MeshSurfaces[hit.triangle]; + int surfaceIndex = MeshSurfaceIndexes[hit.triangle]; return Surfaces[surfaceIndex].bSky; }