From 6c3ed24ecd83415008c291b578a748c1c8aa8c71 Mon Sep 17 00:00:00 2001 From: Lars Date: Thu, 26 Jun 2025 13:16:17 -0700 Subject: [PATCH] Use MapBlock::copyTo to fill MeshMakeData --- src/client/mapblock_mesh.cpp | 9 --------- src/client/mapblock_mesh.h | 1 - src/client/mesh_generator_thread.cpp | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/client/mapblock_mesh.cpp b/src/client/mapblock_mesh.cpp index 07381b473..51d61b489 100644 --- a/src/client/mapblock_mesh.cpp +++ b/src/client/mapblock_mesh.cpp @@ -51,15 +51,6 @@ void MeshMakeData::fillBlockDataBegin(const v3s16 &blockpos) m_vmanip.addArea(voxel_area); } -void MeshMakeData::fillBlockData(const v3s16 &bp, MapNode *data) -{ - v3s16 data_size(MAP_BLOCKSIZE, MAP_BLOCKSIZE, MAP_BLOCKSIZE); - VoxelArea data_area(v3s16(0,0,0), data_size - v3s16(1,1,1)); - - v3s16 blockpos_nodes = bp * MAP_BLOCKSIZE; - m_vmanip.copyFrom(data, data_area, v3s16(0,0,0), blockpos_nodes, data_size); -} - void MeshMakeData::fillSingleNode(MapNode data, MapNode padding) { m_blockpos = {0, 0, 0}; diff --git a/src/client/mapblock_mesh.h b/src/client/mapblock_mesh.h index 38db55b0f..aa0942cdd 100644 --- a/src/client/mapblock_mesh.h +++ b/src/client/mapblock_mesh.h @@ -60,7 +60,6 @@ struct MeshMakeData Copy block data manually (to allow optimizations by the caller) */ void fillBlockDataBegin(const v3s16 &blockpos); - void fillBlockData(const v3s16 &bp, MapNode *data); /* Prepare block data for rendering a single node located at (0,0,0). diff --git a/src/client/mesh_generator_thread.cpp b/src/client/mesh_generator_thread.cpp index 6f400b6b5..fe2e3eb79 100644 --- a/src/client/mesh_generator_thread.cpp +++ b/src/client/mesh_generator_thread.cpp @@ -193,7 +193,7 @@ void MeshUpdateQueue::fillDataFromMapBlocks(QueuedMeshUpdate *q) for (pos.Y = q->p.Y - 1; pos.Y <= q->p.Y + mesh_grid.cell_size; pos.Y++) { MapBlock *block = q->map_blocks[i++]; if (block) - data->fillBlockData(pos, block->getData()); + block->copyTo(data->m_vmanip); } data->setCrack(q->crack_level, q->crack_pos);