zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-03-13 22:42:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename MeshSurfaces to MeshSurfaceIndexes for clarity

Browse source
This commit is contained in:
Magnus Norddahl 2023-09-02 12:34:00 +02:00 committed by Christoph Oelckers
parent 87f52367ad
commit 87c21f99fe
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/rendering/hwrenderer/data/hw_levelmesh.h
View file

@ -205,7 +205,7 @@ public:
TArray<FVector3> MeshVertices;
TArray<int> MeshUVIndex;
TArray<uint32_t> MeshElements;
TArray<int> MeshSurfaces;
TArray<int> MeshSurfaceIndexes;
TArray<SurfaceInfo> surfaceInfo;
TArray<PortalInfo> portalInfo;

4
src/common/rendering/vulkan/accelstructs/vk_raytrace.cpp
View file

@ -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());

6
src/rendering/hwrenderer/doom_levelmesh.cpp
View file

@ -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);
}
}
}

2
src/rendering/hwrenderer/doom_levelmesh.h
View file

@ -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;
}