From fab2d34959c52383f6be3cb6634c6776b41f62a8 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Thu, 13 Oct 2022 20:27:46 +0100 Subject: Standard typedefs for Node --- game/network/network.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'game/network/network.h') diff --git a/game/network/network.h b/game/network/network.h index 34e6a60..4ef6a4f 100644 --- a/game/network/network.h +++ b/game/network/network.h @@ -21,15 +21,15 @@ public: explicit Network(const std::string & textureName); virtual ~Network() = default; - [[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]] Node::Ptr findNodeAt(glm::vec3) const; + [[nodiscard]] Node::Ptr 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; + [[nodiscard]] virtual Node::Ptr intersectRayNodes(const Ray &) const; [[nodiscard]] Link::Nexts routeFromTo(const Link::End &, glm::vec3) const; - [[nodiscard]] Link::Nexts routeFromTo(const Link::End &, const NodePtr &) const; + [[nodiscard]] Link::Nexts routeFromTo(const Link::End &, const Node::Ptr &) const; virtual LinkCPtr addStraight(glm::vec3, glm::vec3) = 0; virtual CLinks addJoins(glm::vec3, glm::vec3) = 0; @@ -37,7 +37,7 @@ public: protected: static void joinLinks(const LinkPtr & l, const LinkPtr & ol); - using Nodes = std::set>; + using Nodes = std::set>; Nodes nodes; std::shared_ptr texture; }; -- cgit v1.2.3