From b02eb7e1d4c4fde79bcb7c05d53c8c0685e3a163 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 24 Jun 2026 11:04:28 +0200 Subject: [PATCH] cleanup and copy/paste bug identified --- src/draggable.h | 1 - src/graph-manager.cpp | 2 +- src/interactable.h | 2 +- src/interaction-event.h | 1 - src/interaction-manager.cpp | 1 - src/interaction-manager.h | 3 ++- src/midi.h | 1 - src/moveable.h | 5 ++--- src/state.h | 3 ++- 9 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/draggable.h b/src/draggable.h index f8d7e66..22239df 100644 --- a/src/draggable.h +++ b/src/draggable.h @@ -1,7 +1,6 @@ #pragma once #include "moveable.h" -#include "raylib.h" #include "selectable.h" #include "state.h" #include "vmath.h" diff --git a/src/graph-manager.cpp b/src/graph-manager.cpp index ce6731e..3373d38 100644 --- a/src/graph-manager.cpp +++ b/src/graph-manager.cpp @@ -297,7 +297,7 @@ namespace VISEQ::GRAPH{ copy_connections.push_back(std::make_shared(*c)); } } - std::cout << copy_connections.size() << std::endl; + std::cout << "copy_connections size " << copy_connections.size() << std::endl; for(auto old_node : nodes){ SPTR_Node new_node; diff --git a/src/interactable.h b/src/interactable.h index 51f7b75..4a75844 100644 --- a/src/interactable.h +++ b/src/interactable.h @@ -1,8 +1,8 @@ #pragma once #include "datatypes.h" -#include "raylib.h" #include "vmath.h" + namespace VISEQ::BASE { class Interactable{ diff --git a/src/interaction-event.h b/src/interaction-event.h index ff7b933..03325f9 100644 --- a/src/interaction-event.h +++ b/src/interaction-event.h @@ -1,7 +1,6 @@ #pragma once #include "interactable.h" -#include #include namespace VISEQ::APP{ diff --git a/src/interaction-manager.cpp b/src/interaction-manager.cpp index 8dca1a1..87ef5f7 100644 --- a/src/interaction-manager.cpp +++ b/src/interaction-manager.cpp @@ -1,6 +1,5 @@ #include "interaction-manager.h" -#include "clipboard.h" #include "connector.h" #include "datatypes.h" #include "node.h" diff --git a/src/interaction-manager.h b/src/interaction-manager.h index a1597d8..35dcf50 100644 --- a/src/interaction-manager.h +++ b/src/interaction-manager.h @@ -56,13 +56,14 @@ namespace VISEQ::INTERACTION{ std::shared_ptr canvas; std::shared_ptr gm; std::shared_ptr sm; - VISEQ::APP::Clipboard cb; std::shared_ptr state = APP::State::get(); Vec2Df scale_start; std::shared_ptr scale_handle = std::make_shared(); + VISEQ::APP::Clipboard cb; + void update(); void draw(); void removeNodes(VEC_SPTR_Node nodes); diff --git a/src/midi.h b/src/midi.h index 7ff3fa3..78ed848 100644 --- a/src/midi.h +++ b/src/midi.h @@ -1,7 +1,6 @@ #pragma once #include "libremidi/libremidi.hpp" -#include "libremidi/observer_configuration.hpp" #include #include diff --git a/src/moveable.h b/src/moveable.h index 7fe9eb6..5bc3649 100644 --- a/src/moveable.h +++ b/src/moveable.h @@ -1,8 +1,7 @@ #pragma once -#include "state.h" +//#include "state.h" #include "vmath.h" -#include namespace VISEQ::BASE { class Movable{ @@ -14,7 +13,7 @@ namespace VISEQ::BASE { Movable(Vec2Df p, Vec2Df d, float s) : speed(s), position(p), direction(d) {} Movable(Vec2Df p, float s) : speed(s), position(p) {} - std::shared_ptr state = APP::State::get(); +// std::shared_ptr state = APP::State::get(); float speed = 960.0f; diff --git a/src/state.h b/src/state.h index 49b71b2..56af850 100644 --- a/src/state.h +++ b/src/state.h @@ -4,6 +4,7 @@ #include "nlohmann/json.hpp" #include "raylib.h" #include "vmath.h" +#include #include #define STATE state->istate @@ -86,7 +87,7 @@ namespace VISEQ::APP{ Vec2Df selection_origin; Color mode_color = settings.mode_colors[0]; - + void pushEvent(InteractionEvent e); InteractionEvent pullEvent(); void update(Camera2D camera);