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

Use appropriate sized type for VoxelArea extent

Browse source
This commit is contained in:
sfan5 2024-12-06 21:00:47 +01:00
parent 3c5e0d10fc
commit 8957739cdf
16 changed files with 62 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/unittest/test_voxelarea.cpp
View file

@ -107,11 +107,16 @@ void TestVoxelArea::test_pad()
void TestVoxelArea::test_extent()
{
VoxelArea v1(v3s16(-1337, -547, -789), v3s16(-147, 447, 669));
UASSERT(v1.getExtent() == v3s16(1191, 995, 1459));
UASSERT(v1.getExtent() == v3s32(1191, 995, 1459));
VoxelArea v2(v3s16(32493, -32507, 32752), v3s16(32508, -32492, 32767));
UASSERT(v2.getExtent() == v3s16(16, 16, 16));
UASSERT(v2.getExtent() == v3s32(16, 16, 16));
// side length bigger than S16_MAX
VoxelArea v3({-20000, 12, 34}, {20000, 12, 34});
UASSERT(v3.getExtent() == v3s32(40001, 1, 1));
UASSERT(VoxelArea().hasEmptyExtent());
UASSERT(VoxelArea({2,3,4}, {1,2,3}).hasEmptyExtent());
UASSERT(VoxelArea({2,3,4}, {2,2,3}).hasEmptyExtent() == false);
}
@ -124,6 +129,9 @@ void TestVoxelArea::test_volume()
VoxelArea v2(v3s16(32493, -32507, 32752), v3s16(32508, -32492, 32767));
UASSERTEQ(s32, v2.getVolume(), 4096);
VoxelArea v3({-20000, 12, 34}, {20000, 12, 34});
UASSERTEQ(s32, v3.getVolume(), 40000);
UASSERTEQ(s32, VoxelArea({2,3,4}, {1,2,3}).getVolume(), 0);
UASSERTEQ(s32, VoxelArea({2,3,4}, {2,2,3}).getVolume(), 0);
}
@ -388,7 +396,7 @@ void TestVoxelArea::test_index_v3s16_all_neg()
void TestVoxelArea::test_add_x()
{
v3s16 extent;
v3s32 extent;
u32 i = 4;
VoxelArea::add_x(extent, i, 8);
UASSERTEQ(u32, i, 12)
@ -396,7 +404,7 @@ void TestVoxelArea::test_add_x()
void TestVoxelArea::test_add_y()
{
v3s16 extent(740, 16, 87);
v3s32 extent(740, 16, 87);
u32 i = 8;
VoxelArea::add_y(extent, i, 88);
UASSERTEQ(u32, i, 65128)
@ -404,7 +412,7 @@ void TestVoxelArea::test_add_y()
void TestVoxelArea::test_add_z()
{
v3s16 extent(114, 80, 256);
v3s32 extent(114, 80, 256);
u32 i = 4;
VoxelArea::add_z(extent, i, 8);
UASSERTEQ(u32, i, 72964)
@ -412,7 +420,7 @@ void TestVoxelArea::test_add_z()
void TestVoxelArea::test_add_p()
{
v3s16 extent(33, 14, 742);
v3s32 extent(33, 14, 742);
v3s16 a(15, 12, 369);
u32 i = 4;
VoxelArea::add_p(extent, i, a);