aboutsummaryrefslogtreecommitdiff
path: root/src/unittest/test_voxelalgorithms.cpp
diff options
context:
space:
mode:
authorElias Fleckenstein <eliasfleckenstein@web.de>2020-11-04 16:57:41 +0100
committerElias Fleckenstein <eliasfleckenstein@web.de>2020-11-04 16:57:41 +0100
commit6ccb5835ff55d85156be91473c598eca9d6cb9a6 (patch)
tree7f1eaf8b94694c8e24e206909ba8f55a1ebfbb3e /src/unittest/test_voxelalgorithms.cpp
parent244713971a976e43e8740b6a9d9d122e37020ef2 (diff)
downloaddragonfireclient-6ccb5835ff55d85156be91473c598eca9d6cb9a6.tar.xz
Revert "Make Lint Happy"
This reverts commit ad148587dcf5244c2d2011dba339786c765c54c4.
Diffstat (limited to 'src/unittest/test_voxelalgorithms.cpp')
-rw-r--r--src/unittest/test_voxelalgorithms.cpp25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/unittest/test_voxelalgorithms.cpp b/src/unittest/test_voxelalgorithms.cpp
index c259fd7f1..0ffd24b7d 100644
--- a/src/unittest/test_voxelalgorithms.cpp
+++ b/src/unittest/test_voxelalgorithms.cpp
@@ -23,8 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "voxelalgorithms.h"
#include "util/numeric.h"
-class TestVoxelAlgorithms : public TestBase
-{
+class TestVoxelAlgorithms : public TestBase {
public:
TestVoxelAlgorithms() { TestManager::registerTestModule(this); }
const char *getName() { return "TestVoxelAlgorithms"; }
@@ -50,32 +49,32 @@ void TestVoxelAlgorithms::testVoxelLineIterator(const NodeDefManager *ndef)
// Test some lines
// Do not test lines that start or end on the border of
// two voxels as rounding errors can make the test fail!
- std::vector<core::line3d<f32>> lines;
+ std::vector<core::line3d<f32> > lines;
for (f32 x = -9.1; x < 9; x += 3.124) {
- for (f32 y = -9.2; y < 9; y += 3.123) {
- for (f32 z = -9.3; z < 9; z += 3.122) {
- lines.emplace_back(-x, -y, -z, x, y, z);
- }
- }
+ for (f32 y = -9.2; y < 9; y += 3.123) {
+ for (f32 z = -9.3; z < 9; z += 3.122) {
+ lines.emplace_back(-x, -y, -z, x, y, z);
+ }
+ }
}
lines.emplace_back(0, 0, 0, 0, 0, 0);
// Test every line
- std::vector<core::line3d<f32>>::iterator it = lines.begin();
+ std::vector<core::line3d<f32> >::iterator it = lines.begin();
for (; it < lines.end(); it++) {
core::line3d<f32> l = *it;
// Initialize test
voxalgo::VoxelLineIterator iterator(l.start, l.getVector());
- // Test the first voxel
+ //Test the first voxel
v3s16 start_voxel = floatToInt(l.start, 1);
UASSERT(iterator.m_current_node_pos == start_voxel);
// Values for testing
v3s16 end_voxel = floatToInt(l.end, 1);
v3s16 voxel_vector = end_voxel - start_voxel;
- int nodecount = abs(voxel_vector.X) + abs(voxel_vector.Y) +
- abs(voxel_vector.Z);
+ int nodecount = abs(voxel_vector.X) + abs(voxel_vector.Y)
+ + abs(voxel_vector.Z);
int actual_nodecount = 0;
v3s16 old_voxel = iterator.m_current_node_pos;
@@ -88,7 +87,7 @@ void TestVoxelAlgorithms::testVoxelLineIterator(const NodeDefManager *ndef)
// The line must intersect with the voxel
v3f voxel_center = intToFloat(iterator.m_current_node_pos, 1);
aabb3f box(voxel_center - v3f(0.5, 0.5, 0.5),
- voxel_center + v3f(0.5, 0.5, 0.5));
+ voxel_center + v3f(0.5, 0.5, 0.5));
UASSERT(box.intersectsWithLine(l));
// Update old voxel
old_voxel = new_voxel;