summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2024-01-07 13:23:27 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2024-01-07 13:23:27 +0000
commit108bf5b2424da06aa2e1735ffd10a2b713834db8 (patch)
treeaf0918a6a266aa7e6ee1d8129df6d5ef9fc4f8ab /test
parentRemove more use of legacy types and unnecessary pointers from selectable inte... (diff)
parentRemove Position3D from RailVehicle (diff)
downloadilt-108bf5b2424da06aa2e1735ffd10a2b713834db8.tar.bz2
ilt-108bf5b2424da06aa2e1735ffd10a2b713834db8.tar.xz
ilt-108bf5b2424da06aa2e1735ffd10a2b713834db8.zip
Merge branch 'template-types'
Diffstat (limited to 'test')
-rw-r--r--test/test-geoData.cpp4
-rw-r--r--test/test-maths.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/test-geoData.cpp b/test/test-geoData.cpp
index d1c6b8b..efe845c 100644
--- a/test/test-geoData.cpp
+++ b/test/test-geoData.cpp
@@ -109,8 +109,8 @@ using FindRayIntersectData = std::tuple<GlobalPosition3D, Direction3D, GlobalPos
BOOST_DATA_TEST_CASE(findRayIntersect,
boost::unit_test::data::make<FindRayIntersectData>({
- {{310000000, 490000000, 50000}, {1, 1, -2}, {310008585, 490008585, 32834}},
- {{310000000, 490000000, 50000}, {1, 1, -1}, {310017136, 490017136, 32868}},
+ {{310000000, 490000000, 50000}, {1, 1, -2}, {310008582, 490008582, 32834}},
+ {{310000000, 490000000, 50000}, {1, 1, -1}, {310017131, 490017131, 32868}},
}),
p, d, i)
{
diff --git a/test/test-maths.cpp b/test/test-maths.cpp
index b363c17..8680409 100644
--- a/test/test-maths.cpp
+++ b/test/test-maths.cpp
@@ -265,7 +265,7 @@ BOOST_AUTO_TEST_CASE(camera_clicks)
Camera camera {{}, ::half_pi, 1.25F, 1000, 10000000};
constexpr float centre {0.5F}, right {0.9F}, left {0.1F}, top {1.F}, bottom {0.F};
camera.setForward(::north);
- BOOST_CHECK_EQUAL(camera.unProject({centre, centre}).start, RelativePosition3D {});
+ BOOST_CHECK_EQUAL(camera.unProject({centre, centre}).start, GlobalPosition3D {});
BOOST_CHECK_CLOSE_VEC(camera.unProject({centre, centre}).direction, ::north);
BOOST_CHECK_CLOSE_VEC(camera.unProject({left, centre}).direction, glm::normalize(::north + ::west));
BOOST_CHECK_CLOSE_VEC(camera.unProject({right, centre}).direction, glm::normalize(::north + ::east));