cleanup and copy/paste bug identified
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "moveable.h"
|
#include "moveable.h"
|
||||||
#include "raylib.h"
|
|
||||||
#include "selectable.h"
|
#include "selectable.h"
|
||||||
#include "state.h"
|
#include "state.h"
|
||||||
#include "vmath.h"
|
#include "vmath.h"
|
||||||
|
|||||||
@@ -297,7 +297,7 @@ namespace VISEQ::GRAPH{
|
|||||||
copy_connections.push_back(std::make_shared<Edge>(*c));
|
copy_connections.push_back(std::make_shared<Edge>(*c));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
std::cout << copy_connections.size() << std::endl;
|
std::cout << "copy_connections size " << copy_connections.size() << std::endl;
|
||||||
|
|
||||||
for(auto old_node : nodes){
|
for(auto old_node : nodes){
|
||||||
SPTR_Node new_node;
|
SPTR_Node new_node;
|
||||||
|
|||||||
+1
-1
@@ -1,8 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "datatypes.h"
|
#include "datatypes.h"
|
||||||
#include "raylib.h"
|
|
||||||
#include "vmath.h"
|
#include "vmath.h"
|
||||||
|
|
||||||
namespace VISEQ::BASE {
|
namespace VISEQ::BASE {
|
||||||
|
|
||||||
class Interactable{
|
class Interactable{
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "interactable.h"
|
#include "interactable.h"
|
||||||
#include <deque>
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
namespace VISEQ::APP{
|
namespace VISEQ::APP{
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
#include "interaction-manager.h"
|
#include "interaction-manager.h"
|
||||||
|
|
||||||
#include "clipboard.h"
|
|
||||||
#include "connector.h"
|
#include "connector.h"
|
||||||
#include "datatypes.h"
|
#include "datatypes.h"
|
||||||
#include "node.h"
|
#include "node.h"
|
||||||
|
|||||||
@@ -56,13 +56,14 @@ namespace VISEQ::INTERACTION{
|
|||||||
std::shared_ptr<APP::CANVAS::Canvas> canvas;
|
std::shared_ptr<APP::CANVAS::Canvas> canvas;
|
||||||
std::shared_ptr<GraphManager> gm;
|
std::shared_ptr<GraphManager> gm;
|
||||||
std::shared_ptr<SIGNAL::SignalManager> sm;
|
std::shared_ptr<SIGNAL::SignalManager> sm;
|
||||||
VISEQ::APP::Clipboard cb;
|
|
||||||
|
|
||||||
std::shared_ptr<APP::State> state = APP::State::get();
|
std::shared_ptr<APP::State> state = APP::State::get();
|
||||||
|
|
||||||
Vec2Df scale_start;
|
Vec2Df scale_start;
|
||||||
std::shared_ptr<ScaleHandle> scale_handle = std::make_shared<ScaleHandle>();
|
std::shared_ptr<ScaleHandle> scale_handle = std::make_shared<ScaleHandle>();
|
||||||
|
|
||||||
|
VISEQ::APP::Clipboard cb;
|
||||||
|
|
||||||
void update();
|
void update();
|
||||||
void draw();
|
void draw();
|
||||||
void removeNodes(VEC_SPTR_Node nodes);
|
void removeNodes(VEC_SPTR_Node nodes);
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "libremidi/libremidi.hpp"
|
#include "libremidi/libremidi.hpp"
|
||||||
#include "libremidi/observer_configuration.hpp"
|
|
||||||
|
|
||||||
#include <libremidi/configurations.hpp>
|
#include <libremidi/configurations.hpp>
|
||||||
#include <libremidi/defaults.hpp>
|
#include <libremidi/defaults.hpp>
|
||||||
|
|||||||
+2
-3
@@ -1,8 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "state.h"
|
//#include "state.h"
|
||||||
#include "vmath.h"
|
#include "vmath.h"
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
namespace VISEQ::BASE {
|
namespace VISEQ::BASE {
|
||||||
class Movable{
|
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, Vec2Df d, float s) : speed(s), position(p), direction(d) {}
|
||||||
Movable(Vec2Df p, float s) : speed(s), position(p) {}
|
Movable(Vec2Df p, float s) : speed(s), position(p) {}
|
||||||
|
|
||||||
std::shared_ptr<APP::State> state = APP::State::get();
|
// std::shared_ptr<APP::State> state = APP::State::get();
|
||||||
|
|
||||||
float speed = 960.0f;
|
float speed = 960.0f;
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
#include "nlohmann/json.hpp"
|
#include "nlohmann/json.hpp"
|
||||||
#include "raylib.h"
|
#include "raylib.h"
|
||||||
#include "vmath.h"
|
#include "vmath.h"
|
||||||
|
#include <deque>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#define STATE state->istate
|
#define STATE state->istate
|
||||||
|
|||||||
Reference in New Issue
Block a user