Rework to weak_ptr from lots of shared_ptr.
This commit is contained in:
+6
-19
@@ -1,5 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <algorithm>
|
||||
#include <fcntl.h>
|
||||
#include <memory>
|
||||
#include <raylib.h>
|
||||
@@ -26,16 +27,6 @@ namespace VISEQ::GRAPH::NODES {
|
||||
Node(float x, float y) : Draggable(Vec2Df(x, y)) {}
|
||||
Node(Vec2Df p) : Draggable(p) {}
|
||||
|
||||
/*Node(const Node& n){*/
|
||||
/* distributionMode = n.distributionMode;*/
|
||||
/* radius = n.radius;*/
|
||||
/* config = n.config;*/
|
||||
/* position = n.position;*/
|
||||
/* for(auto c : n.connectors){*/
|
||||
/* connectors.emplace_back(std::make_shared<Connector>(*c));*/
|
||||
/* }*/
|
||||
/*}*/
|
||||
|
||||
NodeType nodeType;
|
||||
|
||||
std::vector<std::shared_ptr<Node>> neighbors;
|
||||
@@ -54,15 +45,10 @@ namespace VISEQ::GRAPH::NODES {
|
||||
|
||||
void addConnector() {
|
||||
connectors.emplace_back(std::make_shared<Connector>(GraphItem::getptr(), position, radius + 5.0f));
|
||||
connectors.back()->init();
|
||||
}
|
||||
|
||||
void removeConnector(std::shared_ptr<Connector> connector){
|
||||
std::erase(connectors, connector);
|
||||
}
|
||||
|
||||
void init() {
|
||||
addConnector();
|
||||
void removeConnector(std::weak_ptr<Connector> connector){
|
||||
std::erase(connectors, connector.lock());
|
||||
}
|
||||
|
||||
virtual NodeType getNodeType() const {return nodeType;}
|
||||
@@ -87,7 +73,7 @@ namespace VISEQ::GRAPH::NODES {
|
||||
|
||||
int free_connectors = 0;
|
||||
for(auto c : connectors){
|
||||
if(!c->partner) free_connectors++;
|
||||
if(c->partner.expired()) free_connectors++;
|
||||
c->setPosition(position);
|
||||
c->update();
|
||||
}
|
||||
@@ -105,6 +91,7 @@ namespace VISEQ::GRAPH::NODES {
|
||||
};
|
||||
|
||||
typedef std::shared_ptr<VISEQ::GRAPH::NODES::Node> SPTR_Node;
|
||||
typedef std::weak_ptr<VISEQ::GRAPH::NODES::Node> WPTR_Node;
|
||||
typedef std::vector<SPTR_Node> VEC_SPTR_Node;
|
||||
|
||||
typedef std::vector<WPTR_Node> VEC_WPTR_Node;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user