diff options
Diffstat (limited to 'game/network/network.impl.h')
-rw-r--r-- | game/network/network.impl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/game/network/network.impl.h b/game/network/network.impl.h index 045335f..8e9e85c 100644 --- a/game/network/network.impl.h +++ b/game/network/network.impl.h @@ -54,14 +54,14 @@ NetworkOf<T>::findNodeDirection(Node::AnyCPtr n) const template<typename T> Link::CCollection -NetworkOf<T>::candidateStraight(glm::vec3 n1, glm::vec3 n2) +NetworkOf<T>::candidateStraight(Position3D n1, Position3D n2) { return {candidateLink<typename T::StraightLink>(n1, n2)}; } template<typename T> Link::CCollection -NetworkOf<T>::candidateJoins(glm::vec3 start, glm::vec3 end) +NetworkOf<T>::candidateJoins(Position3D start, Position3D end) { if (glm::distance(start, end) < 2.F) { return {}; @@ -75,7 +75,7 @@ NetworkOf<T>::candidateJoins(glm::vec3 start, glm::vec3 end) template<typename T> Link::CCollection -NetworkOf<T>::candidateExtend(glm::vec3 start, glm::vec3 end) +NetworkOf<T>::candidateExtend(Position3D start, Position3D end) { const auto [cstart, cend, centre] = genCurveDef(start, end, findNodeDirection(candidateNodeAt(start).first)); return {candidateLink<typename T::CurveLink>(cstart, cend, centre)}; @@ -83,14 +83,14 @@ NetworkOf<T>::candidateExtend(glm::vec3 start, glm::vec3 end) template<typename T> Link::CCollection -NetworkOf<T>::addStraight(glm::vec3 n1, glm::vec3 n2) +NetworkOf<T>::addStraight(Position3D n1, Position3D n2) { return {addLink<typename T::StraightLink>(n1, n2)}; } template<typename T> Link::CCollection -NetworkOf<T>::addJoins(glm::vec3 start, glm::vec3 end) +NetworkOf<T>::addJoins(Position3D start, Position3D end) { if (glm::distance(start, end) < 2.F) { return {}; @@ -103,7 +103,7 @@ NetworkOf<T>::addJoins(glm::vec3 start, glm::vec3 end) template<typename T> Link::CCollection -NetworkOf<T>::addExtend(glm::vec3 start, glm::vec3 end) +NetworkOf<T>::addExtend(Position3D start, Position3D end) { const auto [cstart, cend, centre] = genCurveDef(start, end, findNodeDirection(nodeAt(start))); return {addLink<typename T::CurveLink>(cstart, cend, centre)}; |