From 64a40f462001e56ab4cee2a29ecc5cef322b5688 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Mon, 12 May 2025 04:08:09 +0100 Subject: Remove all the old network link creation code --- game/network/network.h | 36 ---------------- game/network/network.impl.h | 102 -------------------------------------------- game/network/rail.cpp | 55 ------------------------ game/network/rail.h | 1 - test/test-network.cpp | 69 ------------------------------ 5 files changed, 263 deletions(-) diff --git a/game/network/network.h b/game/network/network.h index adaae5f..86e0421 100644 --- a/game/network/network.h +++ b/game/network/network.h @@ -8,7 +8,6 @@ #include "sorting.h" #include "special_members.h" #include -#include #include #include #include @@ -55,13 +54,6 @@ public: [[nodiscard]] Link::Nexts routeFromTo(const Link::End &, GlobalPosition3D) const; [[nodiscard]] static Link::Nexts routeFromTo(const Link::End &, const Node::Ptr &); - virtual Link::CCollection candidateStraight(GlobalPosition3D, GlobalPosition3D) = 0; - virtual Link::CCollection candidateJoins(GlobalPosition3D, GlobalPosition3D) = 0; - virtual Link::CCollection candidateExtend(GlobalPosition3D, GlobalPosition3D) = 0; - virtual Link::CCollection addStraight(const GeoData *, GlobalPosition3D, GlobalPosition3D) = 0; - virtual Link::CCollection addJoins(const GeoData *, GlobalPosition3D, GlobalPosition3D) = 0; - virtual Link::CCollection addExtend(const GeoData *, GlobalPosition3D, GlobalPosition3D) = 0; - [[nodiscard]] virtual float findNodeDirection(Node::AnyCPtr) const = 0; [[nodiscard]] Link::Collection create(const GeoData *, const CreationDefinition &); @@ -109,33 +101,6 @@ protected: [[nodiscard]] Link::Ptr intersectRayLinks(const Ray &) const override; public: - template - std::shared_ptr - candidateLink(GlobalPosition3D positionA, GlobalPosition3D positionB, Params &&... params) - requires std::is_base_of_v - { - const auto node1 = candidateNodeAt(positionA).first, node2 = candidateNodeAt(positionB).first; - return std::make_shared(*this, node1, node2, std::forward(params)...); - } - - template - std::shared_ptr - addLink(GlobalPosition3D positionA, GlobalPosition3D positionB, Params &&... params) - requires std::is_base_of_v - { - const auto node1 = nodeAt(positionA), node2 = nodeAt(positionB); - auto newLink = links.template create(*this, node1, node2, std::forward(params)...); - joinLinks(newLink); - return std::move(newLink); - } - - Link::CCollection candidateStraight(GlobalPosition3D, GlobalPosition3D) override; - Link::CCollection candidateJoins(GlobalPosition3D, GlobalPosition3D) override; - Link::CCollection candidateExtend(GlobalPosition3D, GlobalPosition3D) override; - Link::CCollection addStraight(const GeoData *, GlobalPosition3D, GlobalPosition3D) override; - Link::CCollection addJoins(const GeoData *, GlobalPosition3D, GlobalPosition3D) override; - Link::CCollection addExtend(const GeoData *, GlobalPosition3D, GlobalPosition3D) override; - [[nodiscard]] float findNodeDirection(Node::AnyCPtr) const override; using Network::create; [[nodiscard]] Link::Ptr create(const GenStraightDef &) override; @@ -144,6 +109,5 @@ public: void add(GeoData *, const Link::Ptr &) override; protected: - Link::CCollection addCurve(const GeoData *, const GenCurveDef &); [[nodiscard]] bool anyLinks() const; }; diff --git a/game/network/network.impl.h b/game/network/network.impl.h index 04c5d7c..dda4974 100644 --- a/game/network/network.impl.h +++ b/game/network/network.impl.h @@ -1,4 +1,3 @@ -#include "collections.h" #include "network.h" #include #include @@ -43,107 +42,6 @@ NetworkOf::findNodeDirection(Node::AnyCPtr n) const throw std::runtime_error("Node exists but couldn't find it"); } -template -Link::CCollection -NetworkOf::candidateStraight(GlobalPosition3D positionA, GlobalPosition3D positionB) -{ - return {candidateLink(positionA, positionB)}; -} - -template -Link::CCollection -NetworkOf::candidateJoins(GlobalPosition3D start, GlobalPosition3D end) -{ - static constexpr auto MIN_DISTANCE = 2000.F; - if (::distance(start, end) < MIN_DISTANCE) { - return {}; - } - const auto defs = genCurveDef( - start, end, findNodeDirection(candidateNodeAt(start).first), findNodeDirection(candidateNodeAt(end).first)); - const auto & [c1s, c1e, c1c] = defs.first; - const auto & [c2s, c2e, c2c] = defs.second; - return {candidateLink(c1s, c1e, c1c), candidateLink(c2s, c2e, c2c)}; -} - -template -Link::CCollection -NetworkOf::candidateExtend(GlobalPosition3D start, GlobalPosition3D end) -{ - const auto [cstart, cend, centre] = genCurveDef(start, end, findNodeDirection(candidateNodeAt(start).first)); - return {candidateLink(cstart, cend, centre)}; -} - -template -Link::CCollection -NetworkOf::addStraight(const GeoData * geoData, GlobalPosition3D positionA, GlobalPosition3D positionB) -{ - Link::CCollection out; - geoData->walk(positionA.xy(), positionB, [geoData, &out, this, &positionA](const GeoData::WalkStep & step) { - if (step.previous.is_valid() && geoData->getSurface(step.current) != geoData->getSurface(step.previous)) { - const auto surfaceEdgePosition = geoData->positionAt(GeoData::PointFace(step.exitPosition, step.current)); - out.emplace_back(addLink(positionA, surfaceEdgePosition)); - positionA = surfaceEdgePosition; - } - }); - out.emplace_back(addLink(positionA, positionB)); - return out; -} - -template -Link::CCollection -NetworkOf::addCurve(const GeoData * geoData, const GenCurveDef & curve) -{ - static constexpr auto MIN_DISTANCE = 2000.F; - auto [cstart, cend, centre] = curve; - Link::CCollection out; - std::set> breaks; - const auto radiusMid = ::distance(cstart.xy(), centre); - for (const auto radiusOffset : {-getBaseWidth() / 2.F, 0.F, getBaseWidth() / 2.F}) { - const auto radius = radiusOffset + radiusMid; - const auto start = centre + (difference(cstart.xy(), centre) * radius) / radiusMid; - const auto end = centre + (difference(cend.xy(), centre) * radius) / radiusMid; - geoData->walk(start, end, centre, [geoData, &breaks](const GeoData::WalkStepCurve & step) { - if (step.previous.is_valid() && geoData->getSurface(step.current) != geoData->getSurface(step.previous)) { - breaks.insert(step); - } - }); - } - std::vector points; - points.reserve(breaks.size() + 2); - points.push_back(cstart); - std::ranges::transform( - breaks, std::back_inserter(points), [geoData, centre, radiusMid](const GeoData::WalkStepCurve & step) { - return (centre + (sincos(step.angle) * radiusMid)) - || geoData->positionAt(GeoData::PointFace(step.exitPosition, step.current)).z; - }); - points.push_back(cend); - mergeClose(points, ::distance<3, GlobalDistance>, ::midpoint<3, GlobalDistance>, MIN_DISTANCE); - std::ranges::transform(points | std::views::pairwise, std::back_inserter(out), [this, centre](const auto pair) { - const auto [a, b] = pair; - return this->addLink(a, b, centre); - }); - return out; -} - -template -Link::CCollection -NetworkOf::addJoins(const GeoData * geoData, GlobalPosition3D start, GlobalPosition3D end) -{ - static constexpr auto MIN_DISTANCE = 2000.F; - if (::distance(start, end) < MIN_DISTANCE) { - return {}; - } - const auto defs = genCurveDef(start, end, findNodeDirection(nodeAt(start)), findNodeDirection(nodeAt(end))); - return addCurve(geoData, defs.first) + addCurve(geoData, defs.second); -} - -template -Link::CCollection -NetworkOf::addExtend(const GeoData * geoData, GlobalPosition3D start, GlobalPosition3D end) -{ - return addCurve(geoData, genCurveDef(start, end, findNodeDirection(nodeAt(start)))); -} - template Link::Ptr NetworkOf::create(const GenStraightDef & def) diff --git a/game/network/rail.cpp b/game/network/rail.cpp index 37eb7df..342a2ad 100644 --- a/game/network/rail.cpp +++ b/game/network/rail.cpp @@ -18,61 +18,6 @@ RailLinks::tick(TickDuration) { } -std::shared_ptr -RailLinks::addLinksBetween(GlobalPosition3D start, GlobalPosition3D end) -{ - auto node1ins = newNodeAt(start), node2ins = newNodeAt(end); - if (node1ins.second == NodeIs::NotInNetwork && node2ins.second == NodeIs::NotInNetwork) { - // Both nodes are new, direct link, easy - return addLink(start, end); - } - if (node1ins.second == NodeIs::NotInNetwork && node2ins.second == NodeIs::InNetwork) { - // node1 is new, node2 exists, but we build from existing outwards - std::swap(node1ins, node2ins); - std::swap(start, end); - } - // Find start link/end - opposite entry dir to existing link; so pi +... - const Angle dir = pi + findNodeDirection(node1ins.first); - if (dir == vector_yaw(difference(end, start))) { - return addLink(start, end); - } - const auto flatStart {start.xy()}, flatEnd {end.xy()}; - if (node2ins.second == NodeIs::InNetwork) { - auto midheight = [&](auto mid) { - const auto startToMid = ::distance<2>(flatStart, mid); - const auto endToMid = ::distance<2>(flatEnd, mid); - return start.z + GlobalDistance(RelativeDistance(end.z - start.z) * (startToMid / (startToMid + endToMid))); - }; - const float dir2 = pi + findNodeDirection(node2ins.first); - const auto radii = find_arcs_radius(flatStart, dir, flatEnd, dir2); - if (radii.first < radii.second) { - const auto radius = radii.first; - const auto centre1 = flatStart + (sincos(dir + half_pi) * radius); - const auto centre2 = flatEnd + (sincos(dir2 + half_pi) * radius); - const auto mid = (centre1 + centre2) / 2; - const auto midh = mid || midheight(mid); - addLink(start, midh, centre1); - return addLink(end, midh, centre2); - } - const auto radius = radii.second; - const auto centre1 = flatStart + (sincos(dir - half_pi) * radius); - const auto centre2 = flatEnd + (sincos(dir2 - half_pi) * radius); - const auto mid = (centre1 + centre2) / 2; - const auto midh = mid || midheight(mid); - addLink(midh, start, centre1); - return addLink(midh, end, centre2); - } - const auto diff = difference(end, start); - const auto yaw = vector_yaw(diff); - const auto n2ed = (yaw * 2) - dir - pi; - const auto centre = find_arc_centre(flatStart, dir, flatEnd, n2ed); - - if (centre.second) { // right hand arc - std::swap(start, end); - } - return addLink(start, end, centre.first); -} - namespace { constexpr const std::array RAIL_CROSS_SECTION {{ {-1330.F, 0.F, 0}, diff --git a/game/network/rail.h b/game/network/rail.h index 4aef9e3..15b9ae4 100644 --- a/game/network/rail.h +++ b/game/network/rail.h @@ -74,7 +74,6 @@ class RailLinks : public NetworkOf, p public: RailLinks(); - std::shared_ptr addLinksBetween(GlobalPosition3D start, GlobalPosition3D end); void render(const SceneShader &, const Frustum &) const override; [[nodiscard]] const Surface * getBaseSurface() const override; diff --git a/test/test-network.cpp b/test/test-network.cpp index a5e4f75..28a338f 100644 --- a/test/test-network.cpp +++ b/test/test-network.cpp @@ -436,72 +436,3 @@ BOOST_AUTO_TEST_CASE(NetworkCreateBiarcPairEqTanPerp) } BOOST_AUTO_TEST_SUITE_END() - -BOOST_FIXTURE_TEST_CASE(TestRailNetwork, RailLinks) -{ - // 0 1 2 - // --p000 <-> p100 <-> p200 <-> p300 \ x - // / ?----- \ x - // / / \ | - // | / 4 / - // 3 p110 \ / - // \ | \ / - // \ / ------/ - // -------- - auto link0 = addLinksBetween(P000, P100); - BOOST_CHECK(dynamic_cast(link0.get())); - BOOST_CHECK_EQUAL(link0->length, ::distance(P000, P100)); - BOOST_CHECK_CLOSE(link0->ends[0].dir, half_pi, 0.1F); - BOOST_CHECK_CLOSE(link0->ends[1].dir, -half_pi, 0.1F); - BOOST_CHECK(link0->ends[0].nexts.empty()); - BOOST_CHECK(link0->ends[1].nexts.empty()); - - auto link1 = addLinksBetween(P200, P100); - BOOST_CHECK(dynamic_cast(link1.get())); - BOOST_CHECK_EQUAL(link1->length, ::distance(P200, P100)); - BOOST_CHECK_CLOSE(link1->ends[0].dir, half_pi, 0.1F); - BOOST_CHECK_CLOSE(link1->ends[1].dir, -half_pi, 0.1F); - BOOST_CHECK(link0->ends[0].nexts.empty()); - BOOST_CHECK_EQUAL(link0->ends[1].nexts.at(0).first.lock(), link1); - BOOST_CHECK_EQUAL(link0->ends[1].nexts.at(0).second, 0); - BOOST_CHECK_EQUAL(link1->ends[0].nexts.at(0).first.lock(), link0); - BOOST_CHECK_EQUAL(link1->ends[0].nexts.at(0).second, 1); - BOOST_CHECK(link1->ends[1].nexts.empty()); - - auto link2 = addLinksBetween(P200, P300); - BOOST_CHECK(dynamic_cast(link2.get())); - BOOST_CHECK_EQUAL(link2->length, ::distance(P200, P300)); - BOOST_CHECK_CLOSE(link2->ends[0].dir, half_pi, 0.1F); - BOOST_CHECK_CLOSE(link2->ends[1].dir, -half_pi, 0.1F); - BOOST_CHECK(link0->ends[0].nexts.empty()); - BOOST_CHECK_EQUAL(link1->ends[1].nexts.at(0).first.lock(), link2); - BOOST_CHECK_EQUAL(link1->ends[1].nexts.at(0).second, 0); - BOOST_CHECK_EQUAL(link2->ends[0].nexts.at(0).first.lock(), link1); - BOOST_CHECK_EQUAL(link2->ends[0].nexts.at(0).second, 1); - BOOST_CHECK(link2->ends[1].nexts.empty()); - - BOOST_CHECK_IF(link3, addLinksBetween(P000, P110)) { - BOOST_CHECK_IF(link3c, dynamic_cast(link3.get())) { - BOOST_CHECK_CLOSE(link3c->radius, 10'300.F, 0.1F); - BOOST_CHECK_CLOSE(link3c->arc.length(), pi + half_pi, 0.5F); - BOOST_CHECK_CLOSE(link3->length, 48'563.F, 0.1F); - BOOST_CHECK_CLOSE(link3->ends[0].dir, -half_pi, 0.5F); - BOOST_CHECK_CLOSE(link3->ends[1].dir, -0.0097F, 0.5F); - BOOST_CHECK_EQUAL(link0->ends[0].nexts.at(0).first.lock(), link3); - BOOST_CHECK_EQUAL(link0->ends[0].nexts.at(0).second, 0); - BOOST_CHECK_EQUAL(link3->ends[0].nexts.at(0).first.lock(), link0); - BOOST_CHECK_EQUAL(link3->ends[0].nexts.at(0).second, 0); - BOOST_CHECK(link3->ends[1].nexts.empty()); - } - } - - BOOST_CHECK_IF(link4, addLinksBetween(P110, P300)) { - BOOST_CHECK_IF(link4c, dynamic_cast(link4.get())) { - BOOST_CHECK_CLOSE(link4c->radius, 6950.F, 0.1F); - BOOST_CHECK_CLOSE(link4c->arc.length(), 4.456F, 0.1F); - BOOST_CHECK_CLOSE(link4->length, 30'981.F, 0.1F); - BOOST_CHECK_BETWEEN(link4->ends[0].dir, .25F, .26F); - BOOST_CHECK_CLOSE(link4->ends[1].dir, half_pi, 0.1F); - } - } -} -- cgit v1.2.3