oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-02 16:38:41 +00:00
Code Wiki Activity

Change VoxelArea volume to be u32

Browse source
This commit is contained in:
sfan5 2024-12-06 21:17:59 +01:00
parent 67126cbd1b
commit 4f800dd2b4
6 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/unittest/test_voxelalgorithms.cpp
View file

@ -98,8 +98,8 @@ void TestVoxelAlgorithms::testLighting(IGameDef *gamedef)
std::map<v3s16, MapBlock*> modified_blocks;
MMVManip vm(&map);
vm.initialEmerge(bpmin, bpmax, false);
s32 volume = vm.m_area.getVolume();
for (s32 i = 0; i < volume; i++)
u32 volume = vm.m_area.getVolume();
for (u32 i = 0; i < volume; i++)
vm.m_data[i] = MapNode(CONTENT_AIR);
for (s16 z = -10; z <= 10; z++)
for (s16 y = -10; y <= 10; y++)

13
src/unittest/test_voxelarea.cpp
View file

@ -124,16 +124,17 @@ void TestVoxelArea::test_extent()
void TestVoxelArea::test_volume()
{
VoxelArea v1(v3s16(-1337, -547, -789), v3s16(-147, 447, 669));
UASSERTEQ(s32, v1.getVolume(), 1728980655);
UASSERTEQ(u32, v1.getVolume(), 1728980655);
VoxelArea v2(v3s16(32493, -32507, 32752), v3s16(32508, -32492, 32767));
UASSERTEQ(s32, v2.getVolume(), 4096);
UASSERTEQ(u32, v2.getVolume(), 4096);
VoxelArea v3({-20000, 12, 34}, {20000, 12, 34});
UASSERTEQ(s32, v3.getVolume(), 40000);
// volume bigger than S32_MAX
VoxelArea v3({1, 1, 1}, {1337, 1337, 1337});
UASSERTEQ(u32, v3.getVolume(), 2389979753U);
UASSERTEQ(s32, VoxelArea({2,3,4}, {1,2,3}).getVolume(), 0);
UASSERTEQ(s32, VoxelArea({2,3,4}, {2,2,3}).getVolume(), 0);
UASSERTEQ(u32, VoxelArea({2,3,4}, {1,2,3}).getVolume(), 0);
UASSERTEQ(u32, VoxelArea({2,3,4}, {2,2,3}).getVolume(), 0);
}
void TestVoxelArea::test_contains_voxelarea()