diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-07 13:23:27 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-07 13:23:27 +0000 |
| commit | 108bf5b2424da06aa2e1735ffd10a2b713834db8 (patch) | |
| tree | af0918a6a266aa7e6ee1d8129df6d5ef9fc4f8ab /game/network/network.h | |
| parent | Remove more use of legacy types and unnecessary pointers from selectable inte... (diff) | |
| parent | Remove Position3D from RailVehicle (diff) | |
| download | ilt-108bf5b2424da06aa2e1735ffd10a2b713834db8.tar.bz2 ilt-108bf5b2424da06aa2e1735ffd10a2b713834db8.tar.xz ilt-108bf5b2424da06aa2e1735ffd10a2b713834db8.zip | |
Merge branch 'template-types'
Diffstat (limited to 'game/network/network.h')
| -rw-r--r-- | game/network/network.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/game/network/network.h b/game/network/network.h index 8af06a9..9ce6e81 100644 --- a/game/network/network.h +++ b/game/network/network.h @@ -14,7 +14,7 @@ class Texture; class SceneShader; -class Ray; +template<typename> class Ray; template<size_t... n> using GenDef = std::tuple<glm::vec<n, Distance>...>; using GenCurveDef = GenDef<3, 3, 2>; @@ -32,8 +32,8 @@ public: using NodeInsertion = std::pair<Node::Ptr, NodeIs>; [[nodiscard]] NodeInsertion newNodeAt(Position3D); [[nodiscard]] NodeInsertion candidateNodeAt(Position3D) const; - [[nodiscard]] virtual Link::Ptr intersectRayLinks(const Ray &) const = 0; - [[nodiscard]] virtual Node::Ptr intersectRayNodes(const Ray &) const; + [[nodiscard]] virtual Link::Ptr intersectRayLinks(const Ray<GlobalPosition3D> &) const = 0; + [[nodiscard]] virtual Node::Ptr intersectRayNodes(const Ray<GlobalPosition3D> &) const; [[nodiscard]] Link::Nexts routeFromTo(const Link::End &, Position3D) const; [[nodiscard]] Link::Nexts routeFromTo(const Link::End &, const Node::Ptr &) const; @@ -66,7 +66,7 @@ protected: void joinLinks(const Link::Ptr &) const; protected: - [[nodiscard]] Link::Ptr intersectRayLinks(const Ray &) const override; + [[nodiscard]] Link::Ptr intersectRayLinks(const Ray<GlobalPosition3D> &) const override; public: template<typename L, typename... Params> |