Create a list of snap points for the existing networkbetter-network

These form key positions in the world to ease neat creation.

2 files changed, 11 insertions, 5 deletions

diff --git a/ui/editNetwork.cpp b/ui/editNetwork.cpp
index 98a60d3..20ec877 100644
--- a/ui/editNetwork.cpp
+++ b/ui/editNetwork.cpp
@@ -5,7 +5,7 @@
 #include <gfx/gl/sceneShader.h>
 #include <gfx/models/texture.h>
 
-EditNetwork::EditNetwork(Network * n) : network {n} { }
+EditNetwork::EditNetwork(Network * n) : network {n}, snapPoints {network->getSnapPoints()} { }
 
 bool
 EditNetwork::click(const SDL_MouseButtonEvent & event, const Ray<GlobalPosition3D> & ray)
@@ -34,6 +34,7 @@ EditNetwork::click(const SDL_MouseButtonEvent & event, const Ray<GlobalPosition3
 						currentStart.reset();
 					}
 					candidates.clear();
+					snapPoints = network->getSnapPoints();
 				}
 			}
 			return true;
@@ -63,16 +64,20 @@ EditNetwork::handleInput(const SDL_Event &)
 void
 EditNetwork::render(const SceneShader &, const Frustum &) const
 {
+	// TODO render snapPoints
 }
 
 std::optional<CreationDefinitionEnd>
 EditNetwork::resolveRay(const Ray<GlobalPosition3D> & ray) const
 {
 	if (const auto position = gameState->terrain->intersectRay(ray)) {
-		const auto node = network->intersectRayNodes(ray);
-		if (node) {
-			const auto direction = network->findNodeDirection(node);
-			return CreationDefinitionEnd {.position = node->pos, .direction = direction};
+		if (const auto closestSnapPoint = std::ranges::min_element(snapPoints, {},
+					[position](auto && snapPoint) {
+						return distance(position->first, snapPoint.snapPosition);
+					});
+				closestSnapPoint != snapPoints.end()
+				&& distance(position->first, closestSnapPoint->snapPosition) < 1'200.F) {
+			return *closestSnapPoint;
 		}
 		return CreationDefinitionEnd {.position = position->first, .direction = std::nullopt};
 	}
diff --git a/ui/editNetwork.h b/ui/editNetwork.h
index e155105..8011c1e 100644
--- a/ui/editNetwork.h
+++ b/ui/editNetwork.h
@@ -23,6 +23,7 @@ private:
 
 	Network * network;
 	bool continuousMode {false};
+	SnapPoints snapPoints;
 	std::optional<CreationDefinitionEnd> currentStart;
 	Link::Collection candidates;
 };