Add distance helperterrain-for-networks

Works with integer positions, first template param allows forcing to N dimensions

3 files changed, 7 insertions, 7 deletions

diff --git a/game/network/network.cpp b/game/network/network.cpp
index 1666c4d..e67942f 100644
--- a/game/network/network.cpp
+++ b/game/network/network.cpp
@@ -121,8 +121,8 @@ Network::genCurveDef(const GlobalPosition3D & start, const GlobalPosition3D & en
 	endDir += pi;
 	const auto flatStart {start.xy()}, flatEnd {end.xy()};
 	auto midheight = [&](auto mid) {
-		const auto sm = glm::length(RelativePosition2D(flatStart - mid)),
-				   em = glm::length(RelativePosition2D(flatEnd - mid));
+		const auto sm = ::distance<2>(flatStart, mid);
+		const auto em = ::distance<2>(flatEnd, mid);
 		return start.z + GlobalDistance(RelativeDistance(end.z - start.z) * (sm / (sm + em)));
 	};
 	if (const auto radii = find_arcs_radius(flatStart, startDir, flatEnd, endDir); radii.first < radii.second) {
diff --git a/game/network/network.impl.h b/game/network/network.impl.h
index ff29088..33b0a86 100644
--- a/game/network/network.impl.h
+++ b/game/network/network.impl.h
@@ -52,7 +52,7 @@ template<typename T, typename... Links>
 Link::CCollection
 NetworkOf<T, Links...>::candidateJoins(GlobalPosition3D start, GlobalPosition3D end)
 {
-	if (glm::length(RelativePosition3D(start - end)) < 2000.F) {
+	if (::distance(start, end) < 2000.F) {
 		return {};
 	}
 	const auto defs = genCurveDef(
@@ -81,7 +81,7 @@ template<typename T, typename... Links>
 Link::CCollection
 NetworkOf<T, Links...>::addJoins(GlobalPosition3D start, GlobalPosition3D end)
 {
-	if (glm::length(RelativePosition3D(start - end)) < 2000.F) {
+	if (::distance(start, end) < 2000.F) {
 		return {};
 	}
 	const auto defs = genCurveDef(start, end, findNodeDirection(nodeAt(start)), findNodeDirection(nodeAt(end)));
diff --git a/game/network/rail.cpp b/game/network/rail.cpp
index 2820cca..d7de231 100644
--- a/game/network/rail.cpp
+++ b/game/network/rail.cpp
@@ -40,8 +40,8 @@ RailLinks::addLinksBetween(GlobalPosition3D start, GlobalPosition3D end)
 	const auto flatStart {start.xy()}, flatEnd {end.xy()};
 	if (node2ins.second == NodeIs::InNetwork) {
 		auto midheight = [&](auto mid) {
-			const auto sm = glm::length(RelativePosition2D(flatStart - mid)),
-					   em = glm::length(RelativePosition2D(flatEnd - mid));
+			const auto sm = ::distance<2>(flatStart, mid);
+			const auto em = ::distance<2>(flatEnd, mid);
 			return start.z + GlobalDistance(RelativeDistance(end.z - start.z) * (sm / (sm + em)));
 		};
 		const float dir2 = pi + findNodeDirection(node2ins.first);
@@ -117,7 +117,7 @@ RailLinkStraight::RailLinkStraight(
 
 RailLinkCurve::RailLinkCurve(
 		NetworkLinkHolder<RailLinkCurve> & instances, const Node::Ptr & a, const Node::Ptr & b, GlobalPosition2D c) :
-	RailLinkCurve(instances, a, b, c || a->pos.z, glm::length(difference(a->pos.xy(), c)), {c, a->pos, b->pos})
+	RailLinkCurve(instances, a, b, c || a->pos.z, ::distance<2>(a->pos.xy(), c), {c, a->pos, b->pos})
 {
 }