summaryrefslogtreecommitdiff
path: root/game/network/network.h
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2022-10-13 20:27:46 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2022-10-13 20:27:46 +0100
commitfab2d34959c52383f6be3cb6634c6776b41f62a8 (patch)
treecbf8f4b717d50af882689b5e012c2e3737f44077 /game/network/network.h
parentInheritable of standard typedefs (diff)
downloadilt-fab2d34959c52383f6be3cb6634c6776b41f62a8.tar.bz2
ilt-fab2d34959c52383f6be3cb6634c6776b41f62a8.tar.xz
ilt-fab2d34959c52383f6be3cb6634c6776b41f62a8.zip
Standard typedefs for Node
Diffstat (limited to 'game/network/network.h')
-rw-r--r--game/network/network.h14
1 files changed, 7 insertions, 7 deletions
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<NodePtr, bool> newNodeAt(glm::vec3);
- [[nodiscard]] std::pair<NodePtr, bool> candidateNodeAt(glm::vec3) const;
+ [[nodiscard]] Node::Ptr findNodeAt(glm::vec3) const;
+ [[nodiscard]] Node::Ptr nodeAt(glm::vec3);
+ [[nodiscard]] std::pair<Node::Ptr, bool> newNodeAt(glm::vec3);
+ [[nodiscard]] std::pair<Node::Ptr, bool> 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<NodePtr, PtrMemberSorter<NodePtr, &Node::pos>>;
+ using Nodes = std::set<Node::Ptr, PtrMemberSorter<Node::Ptr, &Node::pos>>;
Nodes nodes;
std::shared_ptr<Texture> texture;
};