oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-30 19:22:14 +00:00
Code Wiki Activity

Monoblocks: optimize blocks that contain a single type of node (#16293)

Browse source 
Reduces memory usage on the server, especially with many user and/or large viewing distances.
Currently disabled on the client due to known data races on a block's data.
This commit is contained in:
lhofhansl 2025-09-21 13:19:30 -07:00 • committed by GitHub
parent afd681d013
commit 08b7870c79
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 245 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

104
src/unittest/test_mapblock.cpp
View file

@ -10,6 +10,7 @@
#include "serialization.h"
#include "noise.h"
#include "inventory.h"
#include "voxel.h"
class TestMapBlock : public TestBase
{
@ -33,6 +34,9 @@ public:
// Tests loading a non-standard MapBlock
void testLoadNonStd(IGameDef *gamedef);
// Tests blocks with a single recurring node
void testMonoblock(IGameDef *gamedef);
};
static TestMapBlock g_test_instance;
@ -45,10 +49,110 @@ void TestMapBlock::runTests(IGameDef *gamedef)
TEST(testLoad29, gamedef);
TEST(testLoad20, gamedef);
TEST(testLoadNonStd, gamedef);
TEST(testMonoblock, gamedef);
}
////////////////////////////////////////////////////////////////////////////////
void TestMapBlock::testMonoblock(IGameDef *gamedef)
{
MapBlock block({}, gamedef);
UASSERT(!block.m_is_mono_block);
// make the array is expanded
block.expandNodesIfNeeded();
UASSERT(std::all_of(block.data, block.data + MapBlock::nodecount, [](MapNode &n) { return n == MapNode(CONTENT_IGNORE); }));
// covert to monoblock
block.tryShrinkNodes();
UASSERT(block.m_is_mono_block);
UASSERT(block.data[0].param0 == CONTENT_IGNORE);
block.data[0] = MapNode(CONTENT_AIR);
UASSERT(block.m_is_mono_block);
UASSERT(block.data[0].param0 == CONTENT_AIR);
block.expandNodesIfNeeded();
UASSERT(!block.m_is_mono_block);
UASSERT(std::all_of(block.data, block.data + MapBlock::nodecount, [](MapNode &n) { return n == MapNode(CONTENT_AIR); }));
// covert back to mono block
block.tryShrinkNodes();
UASSERT(block.m_is_mono_block);
// deconvert explicitly
block.expandNodesIfNeeded();
UASSERT(!block.m_is_mono_block);
// covert back to mono block
block.tryShrinkNodes();
UASSERT(block.m_is_mono_block);
static_assert(CONTENT_AIR != 42);
// set a node, should deconvert the block
block.setNode(5,5,5, MapNode(42));
UASSERT(!block.m_is_mono_block);
// cannot covert to mono block
block.tryShrinkNodes();
UASSERT(!block.m_is_mono_block);
// set all nodes to 42
for (size_t i = 0; i < MapBlock::nodecount; ++i) {
block.data[i] = MapNode(42);
}
// can covert to mono block
block.tryShrinkNodes();
UASSERT(block.m_is_mono_block);
UASSERT(block.data[0].param0 == 42);
VoxelManipulator vmm;
v3s16 data_size(MAP_BLOCKSIZE, MAP_BLOCKSIZE, MAP_BLOCKSIZE);
vmm.addArea(VoxelArea(block.getPosRelative(), block.getPosRelative() + data_size + v3s16(1,1,1)));
block.copyTo(vmm);
UASSERT(block.m_is_mono_block);
UASSERT(vmm.getNode({5,5,5}).param0 == 42);
block.setNode(5,5,5,MapNode(23));
block.copyFrom(vmm);
UASSERT(block.m_is_mono_block);
UASSERT(block.data[0].param0 == 42);
vmm.setNode({5,5,5}, MapNode(23));
block.copyFrom(vmm);
UASSERT(!block.m_is_mono_block);
vmm.setNode({5,5,5}, MapNode(42,1,0));
block.copyFrom(vmm);
UASSERT(!block.m_is_mono_block);
vmm.setNode({5,5,5}, MapNode(42,0,1));
block.copyFrom(vmm);
UASSERT(!block.m_is_mono_block);
vmm.setNode({5,5,5}, MapNode(42));
block.copyFrom(vmm);
UASSERT(block.m_is_mono_block);
block.setNode(5,5,5,MapNode(23));
block.tryShrinkNodes();
UASSERT(!block.m_is_mono_block);
block.setNode(5,5,5,MapNode(42, 1, 0));
block.tryShrinkNodes();
UASSERT(!block.m_is_mono_block);
block.setNode(5,5,5,MapNode(42, 0, 1));
block.tryShrinkNodes();
UASSERT(!block.m_is_mono_block);
block.setNode(5,5,5,MapNode(42));
block.tryShrinkNodes();
UASSERT(block.m_is_mono_block);
}
void TestMapBlock::testSaveLoad(IGameDef *gamedef, const u8 version)
{
// Use the bottom node ids for this test