oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Merge 6c3ed24ecd into 2d36d32da8

Browse source
This commit is contained in:
lhofhansl 2025-06-26 13:22:16 -07:00 • committed by GitHub
commit 37036a3fd6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/client/mapblock_mesh.cpp
View file

@ -51,15 +51,6 @@ void MeshMakeData::fillBlockDataBegin(const v3s16 &blockpos)
m_vmanip.addArea(voxel_area); 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) void MeshMakeData::fillSingleNode(MapNode data, MapNode padding)
{ {
m_blockpos = {0, 0, 0}; m_blockpos = {0, 0, 0};

1
src/client/mapblock_mesh.h
View file

@ -60,7 +60,6 @@ struct MeshMakeData
Copy block data manually (to allow optimizations by the caller) Copy block data manually (to allow optimizations by the caller)
*/ */
void fillBlockDataBegin(const v3s16 &blockpos); 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). Prepare block data for rendering a single node located at (0,0,0).

2
src/client/mesh_generator_thread.cpp
View file

@ -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++) { for (pos.Y = q->p.Y - 1; pos.Y <= q->p.Y + mesh_grid.cell_size; pos.Y++) {
MapBlock *block = q->map_blocks[i++]; MapBlock *block = q->map_blocks[i++];
if (block) if (block)
data->fillBlockData(pos, block->getData()); block->copyTo(data->m_vmanip);
} }
data->setCrack(q->crack_level, q->crack_pos); data->setCrack(q->crack_level, q->crack_pos);