summaryrefslogtreecommitdiff
path: root/game/network
diff options
context:
space:
mode:
Diffstat (limited to 'game/network')
-rw-r--r--game/network/network.h10
-rw-r--r--game/network/network.impl.h14
2 files changed, 22 insertions, 2 deletions
diff --git a/game/network/network.h b/game/network/network.h
index 773426e..b95dfdc 100644
--- a/game/network/network.h
+++ b/game/network/network.h
@@ -33,8 +33,10 @@ public:
virtual Link::CCollection candidateStraight(glm::vec3, glm::vec3) = 0;
virtual Link::CCollection candidateJoins(glm::vec3, glm::vec3) = 0;
+ virtual Link::CCollection candidateExtend(glm::vec3, glm::vec3) = 0;
virtual Link::CCollection addStraight(glm::vec3, glm::vec3) = 0;
virtual Link::CCollection addJoins(glm::vec3, glm::vec3) = 0;
+ virtual Link::CCollection addExtend(glm::vec3, glm::vec3) = 0;
protected:
static void joinLinks(const Link::Ptr & l, const Link::Ptr & ol);
@@ -57,7 +59,8 @@ protected:
public:
template<typename L, typename... Params>
std::shared_ptr<L>
- candidateLink(glm::vec3 a, glm::vec3 b, Params &&... params) requires std::is_base_of_v<T, L>
+ candidateLink(glm::vec3 a, glm::vec3 b, Params &&... params)
+ requires std::is_base_of_v<T, L>
{
const auto node1 = candidateNodeAt(a).first, node2 = candidateNodeAt(b).first;
return std::make_shared<L>(node1, node2, std::forward<Params>(params)...);
@@ -65,7 +68,8 @@ public:
template<typename L, typename... Params>
std::shared_ptr<L>
- addLink(glm::vec3 a, glm::vec3 b, Params &&... params) requires std::is_base_of_v<T, L>
+ addLink(glm::vec3 a, glm::vec3 b, Params &&... params)
+ requires std::is_base_of_v<T, L>
{
const auto node1 = nodeAt(a), node2 = nodeAt(b);
auto l {links.template create<L>(node1, node2, std::forward<Params>(params)...)};
@@ -75,8 +79,10 @@ public:
Link::CCollection candidateStraight(glm::vec3 n1, glm::vec3 n2) override;
Link::CCollection candidateJoins(glm::vec3, glm::vec3) override;
+ Link::CCollection candidateExtend(glm::vec3, glm::vec3) override;
Link::CCollection addStraight(glm::vec3 n1, glm::vec3 n2) override;
Link::CCollection addJoins(glm::vec3, glm::vec3) override;
+ Link::CCollection addExtend(glm::vec3, glm::vec3) override;
void render(const Shader &) const override;
};
diff --git a/game/network/network.impl.h b/game/network/network.impl.h
index 6769320..d112bf7 100644
--- a/game/network/network.impl.h
+++ b/game/network/network.impl.h
@@ -53,6 +53,13 @@ NetworkOf<T>::candidateJoins(glm::vec3 n1, glm::vec3 n2)
template<typename T>
Link::CCollection
+NetworkOf<T>::candidateExtend(glm::vec3 n1, glm::vec3 n2)
+{
+ return {candidateLink<typename T::StraightLink>(n1, n2)};
+}
+
+template<typename T>
+Link::CCollection
NetworkOf<T>::addStraight(glm::vec3 n1, glm::vec3 n2)
{
return {addLink<typename T::StraightLink>(n1, n2)};
@@ -64,3 +71,10 @@ NetworkOf<T>::addJoins(glm::vec3 n1, glm::vec3 n2)
{
return {addLink<typename T::StraightLink>(n1, n2)};
}
+
+template<typename T>
+Link::CCollection
+NetworkOf<T>::addExtend(glm::vec3 n1, glm::vec3 n2)
+{
+ return {addLink<typename T::StraightLink>(n1, n2)};
+}