optimize (part 3)

This commit is contained in:
MihailRis
2024-11-16 15:24:46 +03:00
parent 1ff89491e6
commit 7bdeba982b
2 changed files with 29 additions and 18 deletions
+17 -6
View File
@@ -257,21 +257,29 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
if (chunkEntries.size() == 1) { if (chunkEntries.size() == 1) {
auto& entry = chunkEntries.at(0); auto& entry = chunkEntries.at(0);
if (found->second.planesMesh == nullptr) { if (found->second.sortedMesh == nullptr) {
found->second.planesMesh = std::make_shared<Mesh>( found->second.sortedMesh = std::make_shared<Mesh>(
entry.vertexData.data(), entry.vertexData.size() / 6, ATTRS entry.vertexData.data(), entry.vertexData.size() / 6, ATTRS
); );
} }
found->second.planesMesh->draw(); found->second.sortedMesh->draw();
continue; continue;
} }
if (chunkEntries.empty()) {
continue;
}
if (found->second.sortedMesh == nullptr) {
std::sort(chunkEntries.begin(), chunkEntries.end()); std::sort(chunkEntries.begin(), chunkEntries.end());
size_t size = 0; size_t size = 0;
for (const auto& entry : chunkEntries) { for (const auto& entry : chunkEntries) {
size += entry.vertexData.size(); size += entry.vertexData.size();
} }
util::Buffer<float> buffer(size); static util::Buffer<float> buffer;
if (buffer.size() < size) {
buffer = util::Buffer<float>(size);
}
size_t offset = 0; size_t offset = 0;
for (const auto& entry : chunkEntries) { for (const auto& entry : chunkEntries) {
std::memcpy( std::memcpy(
@@ -281,7 +289,10 @@ void ChunksRenderer::drawSortedMeshes(const Camera& camera, Shader& shader) {
); );
offset += entry.vertexData.size(); offset += entry.vertexData.size();
} }
sortedMesh->reload(buffer.data(), size / 6); found->second.sortedMesh = std::make_shared<Mesh>(
sortedMesh->draw(); buffer.data(), size / 6, ATTRS
);
}
found->second.sortedMesh->draw();
} }
} }
+1 -1
View File
@@ -31,5 +31,5 @@ struct ChunkMeshData {
struct ChunkMesh { struct ChunkMesh {
std::shared_ptr<Mesh> mesh; std::shared_ptr<Mesh> mesh;
SortingMeshData sortingMeshData; SortingMeshData sortingMeshData;
std::shared_ptr<Mesh> planesMesh = nullptr; std::shared_ptr<Mesh> sortedMesh = nullptr;
}; };