Remove all the old network link creation codebetter-network

4 files changed, 0 insertions, 194 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 <glm/glm.hpp>
-#include <memory>
 #include <set>
 #include <string>
 #include <utility>
@@ -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<GlobalPosition3D> &) const override;
 
 public:
-	template<typename L, typename... Params>
-	std::shared_ptr<L>
-	candidateLink(GlobalPosition3D positionA, GlobalPosition3D positionB, Params &&... params)
-		requires std::is_base_of_v<T, L>
-	{
-		const auto node1 = candidateNodeAt(positionA).first, node2 = candidateNodeAt(positionB).first;
-		return std::make_shared<L>(*this, node1, node2, std::forward<Params>(params)...);
-	}
-
-	template<typename L, typename... Params>
-	std::shared_ptr<L>
-	addLink(GlobalPosition3D positionA, GlobalPosition3D positionB, Params &&... params)
-		requires std::is_base_of_v<T, L>
-	{
-		const auto node1 = nodeAt(positionA), node2 = nodeAt(positionB);
-		auto newLink = links.template create<L>(*this, node1, node2, std::forward<Params>(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 <game/geoData.h>
 #include <gfx/gl/sceneShader.h>
@@ -44,107 +43,6 @@ NetworkOf<T, Links...>::findNodeDirection(Node::AnyCPtr n) const
 }
 
 template<typename T, typename... Links>
-Link::CCollection
-NetworkOf<T, Links...>::candidateStraight(GlobalPosition3D positionA, GlobalPosition3D positionB)
-{
-	return {candidateLink<typename T::StraightLink>(positionA, positionB)};
-}
-
-template<typename T, typename... Links>
-Link::CCollection
-NetworkOf<T, Links...>::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<typename T::CurveLink>(c1s, c1e, c1c), candidateLink<typename T::CurveLink>(c2s, c2e, c2c)};
-}
-
-template<typename T, typename... Links>
-Link::CCollection
-NetworkOf<T, Links...>::candidateExtend(GlobalPosition3D start, GlobalPosition3D end)
-{
-	const auto [cstart, cend, centre] = genCurveDef(start, end, findNodeDirection(candidateNodeAt(start).first));
-	return {candidateLink<typename T::CurveLink>(cstart, cend, centre)};
-}
-
-template<typename T, typename... Links>
-Link::CCollection
-NetworkOf<T, Links...>::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<typename T::StraightLink>(positionA, surfaceEdgePosition));
-			positionA = surfaceEdgePosition;
-		}
-	});
-	out.emplace_back(addLink<typename T::StraightLink>(positionA, positionB));
-	return out;
-}
-
-template<typename T, typename... Links>
-Link::CCollection
-NetworkOf<T, Links...>::addCurve(const GeoData * geoData, const GenCurveDef & curve)
-{
-	static constexpr auto MIN_DISTANCE = 2000.F;
-	auto [cstart, cend, centre] = curve;
-	Link::CCollection out;
-	std::set<GeoData::WalkStepCurve, SortedBy<&GeoData::WalkStepCurve::angle>> 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<GlobalPosition3D> 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<typename T::CurveLink>(a, b, centre);
-	});
-	return out;
-}
-
-template<typename T, typename... Links>
-Link::CCollection
-NetworkOf<T, Links...>::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<typename T, typename... Links>
-Link::CCollection
-NetworkOf<T, Links...>::addExtend(const GeoData * geoData, GlobalPosition3D start, GlobalPosition3D end)
-{
-	return addCurve(geoData, genCurveDef(start, end, findNodeDirection(nodeAt(start))));
-}
-
-template<typename T, typename... Links>
 Link::Ptr
 NetworkOf<T, Links...>::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<RailLink>
-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<RailLinkStraight>(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<RailLinkStraight>(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<RailLinkCurve>(start, midh, centre1);
-			return addLink<RailLinkCurve>(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<RailLinkCurve>(midh, start, centre1);
-		return addLink<RailLinkCurve>(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<RailLinkCurve>(start, end, centre.first);
-}
-
 namespace {
 	constexpr const std::array<RelativePosition3D, RAIL_CROSSSECTION_VERTICES> 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<RailLink, RailLinkStraight, RailLinkCurve>, p
 public:
 	RailLinks();
 
-	std::shared_ptr<RailLink> addLinksBetween(GlobalPosition3D start, GlobalPosition3D end);
 	void render(const SceneShader &, const Frustum &) const override;
 
 	[[nodiscard]] const Surface * getBaseSurface() const override;