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

VoxelArea: Fix missing cacheExtent calls in helpers (#15657)

Browse source
This commit is contained in:
DS 2025-01-11 16:43:20 +01:00 • committed by GitHub
parent 37899f7a14
commit 436b391a80
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/unittest/test_voxelarea.cpp
View file

@ -98,10 +98,12 @@ void TestVoxelArea::test_addarea()
void TestVoxelArea::test_pad() void TestVoxelArea::test_pad()
{ {
VoxelArea v1(v3s16(-1447, -9547, -875), v3s16(-147, 8854, 669)); VoxelArea v1(v3s16(-1447, -9547, -875), v3s16(-147, 8854, 669));
auto old_extent = v1.getExtent();
v1.pad(v3s16(100, 200, 300)); v1.pad(v3s16(100, 200, 300));
UASSERT(v1.MinEdge == v3s16(-1547, -9747, -1175)); UASSERT(v1.MinEdge == v3s16(-1547, -9747, -1175));
UASSERT(v1.MaxEdge == v3s16(-47, 9054, 969)); UASSERT(v1.MaxEdge == v3s16(-47, 9054, 969));
UASSERT(v1.getExtent() > old_extent);
} }
void TestVoxelArea::test_extent() void TestVoxelArea::test_extent()
@ -165,6 +167,12 @@ void TestVoxelArea::test_contains_point()
UASSERTEQ(bool, v1.contains(v3s16(-100, 100, 10000)), false); UASSERTEQ(bool, v1.contains(v3s16(-100, 100, 10000)), false);
UASSERTEQ(bool, v1.contains(v3s16(-100, 100, -10000)), false); UASSERTEQ(bool, v1.contains(v3s16(-100, 100, -10000)), false);
UASSERTEQ(bool, v1.contains(v3s16(10000, 100, 10)), false); UASSERTEQ(bool, v1.contains(v3s16(10000, 100, 10)), false);
VoxelArea v2;
UASSERTEQ(bool, v2.contains(v3s16(-200, 10, 10)), false);
UASSERTEQ(bool, v2.contains(v3s16(0, 0, 0)), false);
UASSERTEQ(bool, v2.contains(v3s16(1, 1, 1)), false);
UASSERTEQ(bool, v2.contains(v3s16(-1, -1, -1)), false);
} }
void TestVoxelArea::test_contains_i() void TestVoxelArea::test_contains_i()
@ -180,6 +188,12 @@ void TestVoxelArea::test_contains_i()
UASSERTEQ(bool, v2.contains(10), true); UASSERTEQ(bool, v2.contains(10), true);
UASSERTEQ(bool, v2.contains(0), true); UASSERTEQ(bool, v2.contains(0), true);
UASSERTEQ(bool, v2.contains(-1), false); UASSERTEQ(bool, v2.contains(-1), false);
VoxelArea v3;
UASSERTEQ(bool, v3.contains(0), false);
UASSERTEQ(bool, v3.contains(-1), false);
UASSERTEQ(bool, v3.contains(1), false);
UASSERTEQ(bool, v3.contains(2), false);
} }
void TestVoxelArea::test_equal() void TestVoxelArea::test_equal()
@ -244,6 +258,7 @@ void TestVoxelArea::test_intersect()
VoxelArea v3({11, 11, 11}, {11, 11, 11}); VoxelArea v3({11, 11, 11}, {11, 11, 11});
VoxelArea v4({-11, -2, -10}, {10, 2, 11}); VoxelArea v4({-11, -2, -10}, {10, 2, 11});
UASSERT(v2.intersect(v1) == v2); UASSERT(v2.intersect(v1) == v2);
UASSERT(!v2.intersect(v1).hasEmptyExtent());
UASSERT(v1.intersect(v2) == v2.intersect(v1)); UASSERT(v1.intersect(v2) == v2.intersect(v1));
UASSERT(v1.intersect(v3).hasEmptyExtent()); UASSERT(v1.intersect(v3).hasEmptyExtent());
UASSERT(v3.intersect(v1) == v1.intersect(v3)); UASSERT(v3.intersect(v1) == v1.intersect(v3));

2
src/voxel.h
View file

@ -103,6 +103,7 @@ public:
{ {
MinEdge -= d; MinEdge -= d;
MaxEdge += d; MaxEdge += d;
cacheExtent();
} }
/* /*
@ -188,6 +189,7 @@ public:
ret.MaxEdge.Y = std::min(a.MaxEdge.Y, MaxEdge.Y); ret.MaxEdge.Y = std::min(a.MaxEdge.Y, MaxEdge.Y);
ret.MinEdge.Z = std::max(a.MinEdge.Z, MinEdge.Z); ret.MinEdge.Z = std::max(a.MinEdge.Z, MinEdge.Z);
ret.MaxEdge.Z = std::min(a.MaxEdge.Z, MaxEdge.Z); ret.MaxEdge.Z = std::min(a.MaxEdge.Z, MaxEdge.Z);
ret.cacheExtent();
return ret; return ret;
} }