Simplify vector addition/subtraction with differnt types

Automatically applies correct rounding with float to int operations, adjusts test
expectations accordingly.

3 files changed, 10 insertions, 11 deletions

diff --git a/game/network/link.cpp b/game/network/link.cpp
index 932fc67..122eaf4 100644
--- a/game/network/link.cpp
+++ b/game/network/link.cpp
@@ -28,8 +28,7 @@ LinkStraight::positionAt(RelativeDistance dist, unsigned char start) const
 	const auto es {std::make_pair(ends[start].node.get(), ends[1 - start].node.get())};
 	const RelativePosition3D diff {es.second->pos - es.first->pos};
 	const auto dir {glm::normalize(diff)};
-	return Location {es.first->pos + GlobalPosition3D(vehiclePositionOffset() + dir * dist),
-			{vector_pitch(dir), vector_yaw(dir), 0}};
+	return Location {es.first->pos + (vehiclePositionOffset() + dir * dist), {vector_pitch(dir), vector_yaw(dir), 0}};
 }
 
 bool
@@ -70,7 +69,7 @@ LinkCurve::intersectRay(const Ray<GlobalPosition3D> & ray) const
 	points.reserve(segCount);
 	for (std::remove_const_t<decltype(step)> swing = {arc.first, centreBase.z - e0p.z}; segCount;
 			swing += step, --segCount) {
-		points.emplace_back(centreBase + GlobalPosition3D((sincosf(swing.x) * radius) || swing.y));
+		points.emplace_back(centreBase + ((sincosf(swing.x) * radius) || swing.y));
 	}
 	return ray.passesCloseToEdges(points, 1.F);
 }
diff --git a/game/network/network.cpp b/game/network/network.cpp
index b6c52b8..65b2a62 100644
--- a/game/network/network.cpp
+++ b/game/network/network.cpp
@@ -121,16 +121,16 @@ Network::genCurveDef(const GlobalPosition3D & start, const GlobalPosition3D & en
 	};
 	if (const auto radii = find_arcs_radius(flatStart, startDir, flatEnd, endDir); radii.first < radii.second) {
 		const auto radius {radii.first};
-		const auto c1 = flatStart + GlobalPosition2D(sincosf(startDir + half_pi) * radius);
-		const auto c2 = flatEnd + GlobalPosition2D(sincosf(endDir + half_pi) * radius);
+		const auto c1 = flatStart + (sincosf(startDir + half_pi) * radius);
+		const auto c2 = flatEnd + (sincosf(endDir + half_pi) * radius);
 		const auto mid = (c1 + c2) / 2;
 		const auto midh = mid || midheight(mid);
 		return {{start, midh, c1}, {end, midh, c2}};
 	}
 	else {
 		const auto radius {radii.second};
-		const auto c1 = flatStart + GlobalPosition2D(sincosf(startDir - half_pi) * radius);
-		const auto c2 = flatEnd + GlobalPosition2D(sincosf(endDir - half_pi) * radius);
+		const auto c1 = flatStart + (sincosf(startDir - half_pi) * radius);
+		const auto c2 = flatEnd + (sincosf(endDir - half_pi) * radius);
 		const auto mid = (c1 + c2) / 2;
 		const auto midh = mid || midheight(mid);
 		return {{midh, start, c1}, {midh, end, c2}};
diff --git a/game/network/rail.cpp b/game/network/rail.cpp
index 176a704..34cbceb 100644
--- a/game/network/rail.cpp
+++ b/game/network/rail.cpp
@@ -45,8 +45,8 @@ RailLinks::addLinksBetween(GlobalPosition3D start, GlobalPosition3D end)
 		const float dir2 = pi + findNodeDirection(node2ins.first);
 		if (const auto radii = find_arcs_radius(flatStart, dir, flatEnd, dir2); radii.first < radii.second) {
 			const auto radius {radii.first};
-			const auto c1 = flatStart + GlobalPosition2D(sincosf(dir + half_pi) * radius);
-			const auto c2 = flatEnd + GlobalPosition2D(sincosf(dir2 + half_pi) * radius);
+			const auto c1 = flatStart + (sincosf(dir + half_pi) * radius);
+			const auto c2 = flatEnd + (sincosf(dir2 + half_pi) * radius);
 			const auto mid = (c1 + c2) / 2;
 			const auto midh = mid || midheight(mid);
 			addLink<RailLinkCurve>(start, midh, c1);
@@ -54,8 +54,8 @@ RailLinks::addLinksBetween(GlobalPosition3D start, GlobalPosition3D end)
 		}
 		else {
 			const auto radius {radii.second};
-			const auto c1 = flatStart + GlobalPosition2D(sincosf(dir - half_pi) * radius);
-			const auto c2 = flatEnd + GlobalPosition2D(sincosf(dir2 - half_pi) * radius);
+			const auto c1 = flatStart + (sincosf(dir - half_pi) * radius);
+			const auto c2 = flatEnd + (sincosf(dir2 - half_pi) * radius);
 			const auto mid = (c1 + c2) / 2;
 			const auto midh = mid || midheight(mid);
 			addLink<RailLinkCurve>(midh, start, c1);