From bdf93b08301ebb43b2189249b14e149387652284 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 11 Oct 2022 22:26:25 +0100 Subject: Add candidateNodeAt, returns a network node why may not be part of the network --- game/network/network.cpp | 9 +++++++++ game/network/network.h | 1 + 2 files changed, 10 insertions(+) (limited to 'game') diff --git a/game/network/network.cpp b/game/network/network.cpp index 0189158..aff1aa4 100644 --- a/game/network/network.cpp +++ b/game/network/network.cpp @@ -35,6 +35,15 @@ Network::findNodeAt(glm::vec3 pos) const return {}; } +std::pair +Network::candidateNodeAt(glm::vec3 pos) const +{ + if (const auto n = nodes.find(std::make_shared(pos)); n != nodes.end()) { + return {*n, true}; + } + return {std::make_shared(pos), false}; +} + NodePtr Network::intersectRayNodes(const Ray & ray) const { diff --git a/game/network/network.h b/game/network/network.h index d561e55..79a4a2b 100644 --- a/game/network/network.h +++ b/game/network/network.h @@ -24,6 +24,7 @@ public: [[nodiscard]] NodePtr findNodeAt(glm::vec3) const; [[nodiscard]] NodePtr nodeAt(glm::vec3); [[nodiscard]] std::pair newNodeAt(glm::vec3); + [[nodiscard]] std::pair candidateNodeAt(glm::vec3) const; [[nodiscard]] virtual LinkPtr intersectRayLinks(const Ray &) const = 0; [[nodiscard]] virtual NodePtr intersectRayNodes(const Ray &) const; -- cgit v1.2.3