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

Some refactoring and fixes to VoxelArea and VoxelManip

Browse source 
In particular this validates the edges of VoxelArea and fixes
all the nonsense tests uncovered by it.
This commit is contained in:
sfan5 2024-10-07 17:48:19 +02:00
parent 5532248cd7
commit 6d5103900f
11 changed files with 178 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

113
src/unittest/test_voxelarea.cpp
View file

@ -38,6 +38,7 @@ public:
void test_equal();
void test_plus();
void test_minor();
void test_diff();
void test_intersect();
void test_index_xyz_all_pos();
void test_index_xyz_x_neg();
@ -75,6 +76,7 @@ void TestVoxelArea::runTests(IGameDef *gamedef)
TEST(test_equal);
TEST(test_plus);
TEST(test_minor);
TEST(test_diff);
TEST(test_intersect);
TEST(test_index_xyz_all_pos);
TEST(test_index_xyz_x_neg);
@ -100,21 +102,21 @@ void TestVoxelArea::runTests(IGameDef *gamedef)
void TestVoxelArea::test_addarea()
{
VoxelArea v1(v3s16(-1447, 8854, -875), v3s16(-147, -9547, 669));
VoxelArea v2(v3s16(-887, 4445, -5478), v3s16(447, -8779, 4778));
VoxelArea v1(v3s16(-1447, -9547, -875), v3s16(-147, 8854, 669));
VoxelArea v2(v3s16(-887, -8779, -5478), v3s16(447, 4445, 4778));
v1.addArea(v2);
UASSERT(v1.MinEdge == v3s16(-1447, 4445, -5478));
UASSERT(v1.MaxEdge == v3s16(447, -8779, 4778));
UASSERT(v1.MinEdge == v3s16(-1447, -9547, -5478));
UASSERT(v1.MaxEdge == v3s16(447, 8854, 4778));
}
void TestVoxelArea::test_pad()
{
VoxelArea v1(v3s16(-1447, 8854, -875), v3s16(-147, -9547, 669));
VoxelArea v1(v3s16(-1447, -9547, -875), v3s16(-147, 8854, 669));
v1.pad(v3s16(100, 200, 300));
UASSERT(v1.MinEdge == v3s16(-1547, 8654, -1175));
UASSERT(v1.MaxEdge == v3s16(-47, -9347, 969));
UASSERT(v1.MinEdge == v3s16(-1547, -9747, -1175));
UASSERT(v1.MaxEdge == v3s16(-47, 9054, 969));
}
void TestVoxelArea::test_extent()
@ -124,6 +126,9 @@ void TestVoxelArea::test_extent()
VoxelArea v2(v3s16(32493, -32507, 32752), v3s16(32508, -32492, 32767));
UASSERT(v2.getExtent() == v3s16(16, 16, 16));
UASSERT(VoxelArea({2,3,4}, {1,2,3}).hasEmptyExtent());
UASSERT(VoxelArea({2,3,4}, {2,2,3}).hasEmptyExtent() == false);
}
void TestVoxelArea::test_volume()
@ -133,6 +138,9 @@ void TestVoxelArea::test_volume()
VoxelArea v2(v3s16(32493, -32507, 32752), v3s16(32508, -32492, 32767));
UASSERTEQ(s32, v2.getVolume(), 4096);
UASSERTEQ(s32, VoxelArea({2,3,4}, {1,2,3}).getVolume(), 0);
UASSERTEQ(s32, VoxelArea({2,3,4}, {2,2,3}).getVolume(), 0);
}
void TestVoxelArea::test_contains_voxelarea()
@ -185,8 +193,7 @@ void TestVoxelArea::test_equal()
VoxelArea v1(v3s16(-1337, -9547, -789), v3s16(-147, 750, 669));
UASSERTEQ(bool, v1 == VoxelArea(v3s16(-1337, -9547, -789), v3s16(-147, 750, 669)),
true);
UASSERTEQ(bool, v1 == VoxelArea(v3s16(0, 0, 0), v3s16(-147, 750, 669)), false);
UASSERTEQ(bool, v1 == VoxelArea(v3s16(0, 0, 0), v3s16(-147, 750, 669)), false);
UASSERTEQ(bool, v1 == VoxelArea(v3s16(-147, 0, 0), v3s16(0, 750, 669)), false);
UASSERTEQ(bool, v1 == VoxelArea(v3s16(0, 0, 0), v3s16(0, 0, 0)), false);
}
@ -212,6 +219,30 @@ void TestVoxelArea::test_minor()
VoxelArea(v3s16(-10, -10, -45), v3s16(100, 100, 65)));
}
void TestVoxelArea::test_diff()
{
const VoxelArea v1({-10, -10, -10}, {100, 100, 100});
std::vector<VoxelArea> res;
v1.diff(VoxelArea({-10, -10, -10}, {99, 100, 100}), res);
UASSERTEQ(auto, res.size(), 1U);
UASSERT(res[0] == VoxelArea({100, -10, -10}, {100, 100, 100}));
res.clear();
v1.diff(VoxelArea({-10, -10, -10}, {100, 50, 80}), res);
UASSERTEQ(auto, res.size(), 2U);
UASSERT(res[0] == VoxelArea({-10, -10, 81}, {100, 100, 100}));
UASSERT(res[1] == VoxelArea({-10, 51, -10}, {100, 100, 80}));
res.clear();
// edge cases
v1.diff(v1, res);
UASSERT(res.empty());
v1.diff(VoxelArea(), res);
UASSERTEQ(auto, res.size(), 1U);
UASSERT(res[0] == v1);
}
void TestVoxelArea::test_intersect()
{
VoxelArea v1({-10, -10, -10}, {10, 10, 10});
@ -231,8 +262,8 @@ void TestVoxelArea::test_index_xyz_all_pos()
VoxelArea v1;
UASSERTEQ(s32, v1.index(156, 25, 236), 155);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(156, 25, 236), 1267138774);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(156, 25, 236), 1310722495);
}
void TestVoxelArea::test_index_xyz_x_neg()
@ -240,8 +271,8 @@ void TestVoxelArea::test_index_xyz_x_neg()
VoxelArea v1;
UASSERTEQ(s32, v1.index(-147, 25, 366), -148);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(-147, 25, 366), -870244825);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(-147, 25, 366), -821642064);
}
void TestVoxelArea::test_index_xyz_y_neg()
@ -249,8 +280,8 @@ void TestVoxelArea::test_index_xyz_y_neg()
VoxelArea v1;
UASSERTEQ(s32, v1.index(247, -269, 100), 246);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(247, -269, 100), -989760747);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(247, -269, 100), -951958678);
}
void TestVoxelArea::test_index_xyz_z_neg()
@ -258,8 +289,8 @@ void TestVoxelArea::test_index_xyz_z_neg()
VoxelArea v1;
UASSERTEQ(s32, v1.index(244, 336, -887), 243);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(244, 336, -887), -191478876);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(244, 336, -887), -190690273);
}
void TestVoxelArea::test_index_xyz_xy_neg()
@ -267,8 +298,8 @@ void TestVoxelArea::test_index_xyz_xy_neg()
VoxelArea v1;
UASSERTEQ(s32, v1.index(-365, -47, 6978), -366);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(-365, -47, 6978), 1493679101);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(-365, -47, 6978), 1797427926);
}
void TestVoxelArea::test_index_xyz_yz_neg()
@ -276,8 +307,8 @@ void TestVoxelArea::test_index_xyz_yz_neg()
VoxelArea v1;
UASSERTEQ(s32, v1.index(66, -58, -789), 65);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(66, -58, -789), 1435362734);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(66, -58, -789), 1439223357);
}
void TestVoxelArea::test_index_xyz_xz_neg()
@ -285,8 +316,8 @@ void TestVoxelArea::test_index_xyz_xz_neg()
VoxelArea v1;
UASSERTEQ(s32, v1.index(-36, 589, -992), -37);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(-36, 589, -992), -1934371362);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(-36, 589, -992), -1937179681);
}
void TestVoxelArea::test_index_xyz_all_neg()
@ -294,8 +325,8 @@ void TestVoxelArea::test_index_xyz_all_neg()
VoxelArea v1;
UASSERTEQ(s32, v1.index(-88, -99, -1474), -89);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(-88, -99, -1474), -1343473846);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(-88, -99, -1474), -1366133749);
}
void TestVoxelArea::test_index_v3s16_all_pos()
@ -303,8 +334,8 @@ void TestVoxelArea::test_index_v3s16_all_pos()
VoxelArea v1;
UASSERTEQ(s32, v1.index(v3s16(156, 25, 236)), 155);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(v3s16(156, 25, 236)), 1267138774);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(v3s16(156, 25, 236)), 1310722495);
}
void TestVoxelArea::test_index_v3s16_x_neg()
@ -312,8 +343,8 @@ void TestVoxelArea::test_index_v3s16_x_neg()
VoxelArea v1;
UASSERTEQ(s32, v1.index(v3s16(-147, 25, 366)), -148);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(v3s16(-147, 25, 366)), -870244825);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(v3s16(-147, 25, 366)), -821642064);
}
void TestVoxelArea::test_index_v3s16_y_neg()
@ -321,8 +352,8 @@ void TestVoxelArea::test_index_v3s16_y_neg()
VoxelArea v1;
UASSERTEQ(s32, v1.index(v3s16(247, -269, 100)), 246);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(v3s16(247, -269, 100)), -989760747);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(v3s16(247, -269, 100)), -951958678);
}
void TestVoxelArea::test_index_v3s16_z_neg()
@ -330,8 +361,8 @@ void TestVoxelArea::test_index_v3s16_z_neg()
VoxelArea v1;
UASSERTEQ(s32, v1.index(v3s16(244, 336, -887)), 243);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(v3s16(244, 336, -887)), -191478876);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(v3s16(244, 336, -887)), -190690273);
}
void TestVoxelArea::test_index_v3s16_xy_neg()
@ -339,8 +370,8 @@ void TestVoxelArea::test_index_v3s16_xy_neg()
VoxelArea v1;
UASSERTEQ(s32, v1.index(v3s16(-365, -47, 6978)), -366);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(v3s16(-365, -47, 6978)), 1493679101);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(v3s16(-365, -47, 6978)), 1797427926);
}
void TestVoxelArea::test_index_v3s16_yz_neg()
@ -348,8 +379,8 @@ void TestVoxelArea::test_index_v3s16_yz_neg()
VoxelArea v1;
UASSERTEQ(s32, v1.index(v3s16(66, -58, -789)), 65);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(v3s16(66, -58, -789)), 1435362734);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(v3s16(66, -58, -789)), 1439223357);
}
void TestVoxelArea::test_index_v3s16_xz_neg()
@ -357,8 +388,8 @@ void TestVoxelArea::test_index_v3s16_xz_neg()
VoxelArea v1;
UASSERTEQ(s32, v1.index(v3s16(-36, 589, -992)), -37);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(v3s16(-36, 589, -992)), -1934371362);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(v3s16(-36, 589, -992)), -1937179681);
}
void TestVoxelArea::test_index_v3s16_all_neg()
@ -366,8 +397,8 @@ void TestVoxelArea::test_index_v3s16_all_neg()
VoxelArea v1;
UASSERTEQ(s32, v1.index(v3s16(-88, -99, -1474)), -89);
VoxelArea v2(v3s16(756, 8854, -875), v3s16(-147, -9547, 669));
UASSERTEQ(s32, v2.index(v3s16(-88, -99, -1474)), -1343473846);
VoxelArea v2(v3s16(-147, -9547, -875), v3s16(756, 8854, 669));
UASSERTEQ(s32, v2.index(v3s16(-88, -99, -1474)), -1366133749);
}
void TestVoxelArea::test_add_x()