Back to work!
This commit is contained in:
@@ -27,8 +27,10 @@ namespace VISEQ::BASE {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void update() override{
|
void update() override{
|
||||||
|
Draggable::update();
|
||||||
if(pickedUp()) drag();
|
if(pickedUp()) drag();
|
||||||
if(released()) putDown();
|
if(released()) putDown();
|
||||||
|
is_hovering = hovering();
|
||||||
}
|
}
|
||||||
|
|
||||||
void putDown() override {
|
void putDown() override {
|
||||||
|
|||||||
@@ -18,6 +18,14 @@ namespace VISEQ::BASE {
|
|||||||
|
|
||||||
bool picked_up = false;
|
bool picked_up = false;
|
||||||
|
|
||||||
|
virtual bool entered() override {
|
||||||
|
return !is_hovering && hovering();
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual bool exited() override {
|
||||||
|
return is_hovering && !hovering();
|
||||||
|
}
|
||||||
|
|
||||||
virtual bool pickedUp() {
|
virtual bool pickedUp() {
|
||||||
if(clicked() && held() && (STATE == IState::HOVER_NODE || STATE == IState::DRAG_NODE)) {
|
if(clicked() && held() && (STATE == IState::HOVER_NODE || STATE == IState::DRAG_NODE)) {
|
||||||
picked_up = true;
|
picked_up = true;
|
||||||
|
|||||||
@@ -61,14 +61,6 @@ namespace VISEQ::GRAPH::NODES {
|
|||||||
return STATE != APP::InteractionState::DRAW_SELECTION && CheckCollisionPointCircle(SCREEN_MOUSE, position, radius);
|
return STATE != APP::InteractionState::DRAW_SELECTION && CheckCollisionPointCircle(SCREEN_MOUSE, position, radius);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool entered() override {
|
|
||||||
return !is_hovering && hovering();
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual bool exited() override {
|
|
||||||
return is_hovering && !hovering();
|
|
||||||
}
|
|
||||||
|
|
||||||
void update() override{
|
void update() override{
|
||||||
BASE::Draggable::update();
|
BASE::Draggable::update();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user