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

Read block data for mesh making in main client thread

Browse source
This commit is contained in:
Lars 2025-06-23 22:45:17 -07:00
parent 0ea89d4112
commit f03e6e2f5d
3 changed files with 22 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/client/mapblock_mesh.cpp
View file

@ -47,7 +47,7 @@ void MeshMakeData::fillBlockDataBegin(const v3s16 &blockpos)
m_vmanip.clear();
// extra 1 block thick layer around the mesh
VoxelArea voxel_area(blockpos_nodes - v3s16(1,1,1) * MAP_BLOCKSIZE,
blockpos_nodes + v3s16(1,1,1) * (m_side_length + MAP_BLOCKSIZE) - v3s16(1,1,1));
blockpos_nodes + v3s16(1,1,1) * (m_side_length + MAP_BLOCKSIZE - 1));
m_vmanip.addArea(voxel_area);
}

57
src/client/mesh_generator_thread.cpp
View file

@ -85,7 +85,11 @@ bool MeshUpdateQueue::addBlock(Map *map, v3s16 p, bool ack_block_to_server, bool
if (block) {
block->refGrab();
q->map_blocks[i] = block;
q->data->fillBlockData(pos, block->getData());
}
} else if (p == pos) {
// the "center" block might have changed
q->data->fillBlockData(pos, q->map_blocks[i]->getData());
}
i++;
}
@ -96,6 +100,13 @@ bool MeshUpdateQueue::addBlock(Map *map, v3s16 p, bool ack_block_to_server, bool
/*
Make a list of blocks necessary for mesh generation and lock the blocks in memory.
*/
QueuedMeshUpdate *q = new QueuedMeshUpdate;
MeshMakeData *data = new MeshMakeData(m_client->ndef(),
MAP_BLOCKSIZE * mesh_grid.cell_size, mesh_grid);
q->p = mesh_position;
data->fillBlockDataBegin(q->p);
q->data = data;
std::vector<MapBlock *> map_blocks;
map_blocks.reserve((mesh_grid.cell_size+2)*(mesh_grid.cell_size+2)*(mesh_grid.cell_size+2));
v3s16 pos;
@ -104,15 +115,15 @@ bool MeshUpdateQueue::addBlock(Map *map, v3s16 p, bool ack_block_to_server, bool
for (pos.Y = mesh_position.Y - 1; pos.Y <= mesh_position.Y + mesh_grid.cell_size; pos.Y++) {
MapBlock *block = map->getBlockNoCreateNoEx(pos);
map_blocks.push_back(block);
if (block)
if (block) {
block->refGrab();
data->fillBlockData(pos, block->getData());
}
}
/*
Add the block
*/
QueuedMeshUpdate *q = new QueuedMeshUpdate;
q->p = mesh_position;
if(ack_block_to_server)
q->ack_list.push_back(p);
q->crack_level = m_client->getCrackLevel();
@ -128,7 +139,6 @@ bool MeshUpdateQueue::addBlock(Map *map, v3s16 p, bool ack_block_to_server, bool
// Returns NULL if queue is empty
QueuedMeshUpdate *MeshUpdateQueue::pop()
{
QueuedMeshUpdate *result = NULL;
{
MutexAutoLock lock(m_mutex);
@ -143,15 +153,16 @@ QueuedMeshUpdate *MeshUpdateQueue::pop()
m_queue.erase(i);
m_urgents.erase(q->p);
m_inflight_blocks.insert(q->p);
result = q;
break;
q->data->setCrack(q->crack_level, q->crack_pos);
q->data->m_generate_minimap = !!m_client->getMinimap();
q->data->m_smooth_lighting = m_cache_smooth_lighting;
q->data->m_enable_water_reflections = m_cache_enable_water_reflections;
return q;
}
}
if (result)
fillDataFromMapBlocks(result);
return result;
return NULL;
}
void MeshUpdateQueue::done(v3s16 pos)
@ -160,32 +171,6 @@ void MeshUpdateQueue::done(v3s16 pos)
m_inflight_blocks.erase(pos);
}
void MeshUpdateQueue::fillDataFromMapBlocks(QueuedMeshUpdate *q)
{
auto mesh_grid = m_client->getMeshGrid();
MeshMakeData *data = new MeshMakeData(m_client->ndef(),
MAP_BLOCKSIZE * mesh_grid.cell_size, mesh_grid);
q->data = data;
data->fillBlockDataBegin(q->p);
v3s16 pos;
int i = 0;
for (pos.X = q->p.X - 1; pos.X <= q->p.X + mesh_grid.cell_size; pos.X++)
for (pos.Z = q->p.Z - 1; pos.Z <= q->p.Z + mesh_grid.cell_size; pos.Z++)
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());
}
data->setCrack(q->crack_level, q->crack_pos);
data->m_generate_minimap = !!m_client->getMinimap();
data->m_smooth_lighting = m_cache_smooth_lighting;
data->m_enable_water_reflections = m_cache_enable_water_reflections;
}
/*
MeshUpdateWorkerThread
*/

2
src/client/mesh_generator_thread.h
View file

@ -72,8 +72,6 @@ private:
// TODO: Add callback to update these when g_settings changes, and update all meshes
bool m_cache_smooth_lighting;
bool m_cache_enable_water_reflections;
void fillDataFromMapBlocks(QueuedMeshUpdate *q);
};
struct MeshUpdateResult