diff --git a/src/connector.h b/src/connector.h index 311da0b..3de5356 100644 --- a/src/connector.h +++ b/src/connector.h @@ -11,12 +11,21 @@ namespace VISEQ::GRAPH { using GraphItem::state; Connector() {} - Connector(Vec2Df center_position, float orbit) : orbit(orbit) {setPosition(center_position);} - + Connector(std::shared_ptr parent, Vec2Df center_position, float orbit) : orbit(orbit) { + setPosition(center_position); + setParent(parent); + } + + std::shared_ptr parent; + float radius = 5.0f; float orbit = 14.0f; Vec2Df center_position; + void setParent(std::shared_ptr _parent){ + parent = _parent; + } + void setPosition(Vec2Df pos) override { center_position = pos; if(!partner) position = center_position - ((center_position - state->screen_mouse)).norm() * (radius + orbit); diff --git a/src/node.h b/src/node.h index f0539db..8ffd59b 100644 --- a/src/node.h +++ b/src/node.h @@ -25,7 +25,7 @@ namespace VISEQ::GRAPH::NODES { Node(Vec2Df p) : Draggable(p) {} void addConnector() { - connectors.emplace_back(std::make_shared(position, radius + 5.0f)); + connectors.emplace_back(std::make_shared(std::make_shared(this), position, radius + 5.0f)); connectors.back()->init(); } @@ -38,6 +38,8 @@ namespace VISEQ::GRAPH::NODES { std::vector> neighbors; std::vector> connections; + std::vector> connected_nodes; //TODO: change from node->edge->node to node->node with edge being edge[node->node] + std::vector> connectors; Distribution distributionMode = Distribution::GEOMETRIC;