little progress on the connector idea
This commit is contained in:
+7
-5
@@ -1,15 +1,17 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include "draggable.h"
|
||||||
namespace VISEQ::BASE {
|
namespace VISEQ::BASE {
|
||||||
class Connectable{
|
class Connectable : public Draggable{
|
||||||
public:
|
public:
|
||||||
Connectable() {}
|
Connectable() {}
|
||||||
virtual ~Connectable() {}
|
virtual ~Connectable() {}
|
||||||
|
|
||||||
|
std::shared_ptr<Connectable> partner;
|
||||||
|
|
||||||
virtual void draw(){
|
virtual void drag() override {
|
||||||
|
Vec2Df mp = {GetMousePosition().x, GetMousePosition().y};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+10
-9
@@ -1,17 +1,18 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "draggable.h"
|
#include "connectable.h"
|
||||||
#include "edge.h"
|
#include "interactable.h"
|
||||||
|
#include "moveable.h"
|
||||||
|
#include "raymath.h"
|
||||||
#include "vmath.h"
|
#include "vmath.h"
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
namespace VISEQ::GRAPH {
|
namespace VISEQ::GRAPH {
|
||||||
class Connector : public BASE::Draggable{
|
class Connector : public BASE::Connectable{
|
||||||
public:
|
public:
|
||||||
Connector() {}
|
Connector() {}
|
||||||
Connector(float orbit) : orbit(orbit) {}
|
Connector(Vec2Df position, float orbit) : Movable(position, 0.0f), orbit(orbit) {}
|
||||||
|
|
||||||
std::shared_ptr<Connector> partner;
|
|
||||||
|
|
||||||
float radius = 5.0f;
|
float radius = 5.0f;
|
||||||
float orbit = 14.0f;
|
float orbit = 14.0f;
|
||||||
@@ -26,14 +27,14 @@ namespace VISEQ::GRAPH {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void update() override{
|
void update() override{
|
||||||
if(pickedUp()) drag();
|
|
||||||
if(released()) putDown();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void draw() {
|
void draw() {
|
||||||
|
Vec2Df mp = {GetMousePosition().x, GetMousePosition().y};
|
||||||
|
|
||||||
Vec2Df connector = position - ((position - mouse)).norm() * (radius + orbit);
|
Vec2Df connector = position - ((position - mp)).norm() * (radius + orbit);
|
||||||
float opacity = 150.0f - Clamp(position.dist(mouse), 0.0f, 150.0f);
|
float opacity = 150.0f - Clamp(position.dist(mp), 0.0f, 150.0f);
|
||||||
|
|
||||||
if(hover_connect){
|
if(hover_connect){
|
||||||
DrawCircle(connector.x, connector.y, 8.0f, (Color){108, 153, 187, 255});
|
DrawCircle(connector.x, connector.y, 8.0f, (Color){108, 153, 187, 255});
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "raylib.h"
|
#include "raylib.h"
|
||||||
#include "vmath.h"
|
|
||||||
namespace VISEQ::BASE {
|
namespace VISEQ::BASE {
|
||||||
|
|
||||||
class Interactable{
|
class Interactable{
|
||||||
|
|||||||
+2
-2
@@ -51,11 +51,11 @@ namespace VISEQ::GRAPH::NODES {
|
|||||||
if(pickedUp()) drag();
|
if(pickedUp()) drag();
|
||||||
if(released()) putDown();
|
if(released()) putDown();
|
||||||
for(auto c : connectors){
|
for(auto c : connectors){
|
||||||
c->update(position);
|
c->updatePosition(position);
|
||||||
|
c->update();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void draw(Vec2Df mouse_pos, Camera2D cam) override {}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef std::shared_ptr<VISEQ::GRAPH::NODES::Node> SPTR_Node;
|
typedef std::shared_ptr<VISEQ::GRAPH::NODES::Node> SPTR_Node;
|
||||||
|
|||||||
Reference in New Issue
Block a user