sebastian/viseq
Public Access
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drag selection working again - not much progress

Browse Source
This commit is contained in:
Sebastian
2024-11-18 01:57:10 +01:00
parent e9633ff19d
commit 22842f9deb
6 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/canvas.h
+2 -3
View File
@@ -33,8 +33,7 @@ namespace VISEQ::APP::CANVAS {
EndMode2D(); EndMode2D();
} }
void select_rect(){ void selectNodes(){
if(state->mouse_left.clicked){ if(state->mouse_left.clicked){
state->selection = (Rectangle){0,0,0,0}; state->selection = (Rectangle){0,0,0,0};
select_start = state->screen_mouse; select_start = state->screen_mouse;
@@ -55,7 +54,7 @@ namespace VISEQ::APP::CANVAS {
virtual void update() override { virtual void update() override {
camera_delta = state->mouse_delta * (-1.0f/camera.zoom); camera_delta = state->mouse_delta * (-1.0f/camera.zoom);
if(hovering()) drag(); if(hovering()) drag();
if(state->istate == InteractionState::HOVER_CANVAS || state->istate == InteractionState::DRAW_SELECTION) select_rect(); if(state->istate == InteractionState::HOVER_CANVAS || state->istate == InteractionState::DRAW_SELECTION) selectNodes();
float wheel = GetMouseWheelMove(); float wheel = GetMouseWheelMove();
if(wheel != 0){ if(wheel != 0){
src/draggable.h
+15 -11
View File
@@ -19,7 +19,7 @@ namespace VISEQ::BASE {
bool picked_up = false; bool picked_up = false;
virtual bool pickedUp() { virtual bool pickedUp() {
if(clicked() && held() && state->istate == APP::InteractionState::HOVER_NODE) { if(clicked() && held() && (state->istate == APP::InteractionState::HOVER_NODE || state->istate == APP::InteractionState::DRAG_NODE)) {
picked_up = true; picked_up = true;
drag_offset = position - state->screen_mouse; drag_offset = position - state->screen_mouse;
} }
@@ -40,16 +40,20 @@ namespace VISEQ::BASE {
virtual void select() override { virtual void select() override {
selected = (state->keys_down.shift && selected) || CheckCollisionPointRec(position, state->selection); selected = (state->keys_down.shift && selected) || CheckCollisionPointRec(position, state->selection);
/**/
/*//std::cout << "select" << std::endl;*/
/*if(CheckCollisionPointRec(position, state->selection)) {*/
/* in_selection_rect = true;*/
/*} else {*/
/* in_selection_rect = false;*/
/*}*/
/*if(released() && in_selection_rect) selected = true;*/
/*if(released() && !in_selection_rect) selected = false;*/
} }
virtual void update() override {
if((held() && !picked_up) || (clicked() && !state->keys_down.shift)) select();
if(entered()) state->istate = APP::InteractionState::HOVER_NODE;
if(exited()) state->istate = APP::InteractionState::HOVER_CANVAS;
if(pickedUp()){
drag();
state->istate = APP::InteractionState::DRAG_NODE;
}
if(released() && picked_up){
putDown();
state->istate = APP::InteractionState::HOVER_CANVAS;
}
}
}; };
} }
src/graph-manager.h
+1 -1
View File
@@ -45,7 +45,7 @@ namespace VISEQ::GRAPH {
EDGES::VEC_SPTR_Edge remove_edges; EDGES::VEC_SPTR_Edge remove_edges;
EDGES::VEC_SPTR_Edge split_edges; EDGES::VEC_SPTR_Edge split_edges;
VEC_SPTR_Node selected_nodes; //VEC_SPTR_Node selected_nodes;
std::map<NODES::SPTR_Node, int> counter; std::map<NODES::SPTR_Node, int> counter;
src/midi-node.h
+7 -15
View File
@@ -87,7 +87,7 @@ namespace VISEQ::GRAPH::NODES {
void interact(){ void interact(){
float wheel = GetMouseWheelMove(); float wheel = GetMouseWheelMove();
if(IsKeyDown(KEY_LEFT_CONTROL) && !IsKeyDown(KEY_LEFT_ALT)){ if(state->keys_down.ctrl && !state->keys_down.alt){
switch(GraphItem::state->node_mode){ switch(GraphItem::state->node_mode){
case 0:{ case 0:{
midi_note += wheel; midi_note += wheel;
@@ -108,14 +108,14 @@ namespace VISEQ::GRAPH::NODES {
if(midi_pitch_bend < 0 ) midi_pitch_bend = 0; if(midi_pitch_bend < 0 ) midi_pitch_bend = 0;
if(midi_pitch_bend > 16383 ) midi_pitch_bend = 16383; if(midi_pitch_bend > 16383 ) midi_pitch_bend = 16383;
} else if(IsKeyDown(KEY_LEFT_SHIFT) && !IsKeyDown(KEY_LEFT_ALT)) { } else if(state->keys_down.shift && !state->keys_down.alt) {
midi_velocity += wheel; midi_velocity += wheel;
if(midi_velocity < 0 ) midi_velocity = 127; if(midi_velocity < 0 ) midi_velocity = 127;
if(midi_velocity > 127 ) midi_velocity = 0; if(midi_velocity > 127 ) midi_velocity = 0;
} else if(IsKeyDown(KEY_LEFT_ALT)) { } else if(state->keys_down.alt) {
switch(GraphItem::state->node_mode){ switch(GraphItem::state->node_mode){
case 0:{ case 0:{
float incr = (float)wheel * (IsKeyDown(KEY_LEFT_SHIFT) ? 100.0f : IsKeyDown(KEY_LEFT_CONTROL) ? 1000.0f : 10.0f); float incr = (float)wheel * (state->keys_down.shift ? 100.0f : state->keys_down.ctrl ? 1000.0f : 10.0f);
midi_gate += incr; midi_gate += incr;
if(midi_gate < 0 ) midi_gate = 0; if(midi_gate < 0 ) midi_gate = 0;
break;} break;}
@@ -125,7 +125,7 @@ namespace VISEQ::GRAPH::NODES {
if(midi_cc_value > 127 ) midi_cc_value = 127; if(midi_cc_value > 127 ) midi_cc_value = 127;
break;} break;}
case 2:{ case 2:{
float incr = (float)wheel * (IsKeyDown(KEY_LEFT_SHIFT) ? 100.0f : IsKeyDown(KEY_LEFT_CONTROL) ? 1000.0f : 10.0f); float incr = (float)wheel * (state->keys_down.shift ? 100.0f : state->keys_down.ctrl ? 1000.0f : 10.0f);
midi_pitch_bend += incr; midi_pitch_bend += incr;
if(midi_pitch_bend < 0 ) midi_pitch_bend = 0; if(midi_pitch_bend < 0 ) midi_pitch_bend = 0;
if(midi_pitch_bend > 16383 ) midi_pitch_bend = 16383; if(midi_pitch_bend > 16383 ) midi_pitch_bend = 16383;
@@ -167,7 +167,7 @@ namespace VISEQ::GRAPH::NODES {
break;} break;}
} }
if(!picked_up && !selected && !in_selection_rect && !hovering()) DrawCircle(position.x, position.y, radius, gate_color); if(!picked_up && !selected && !in_selection_rect && !hovering()) DrawCircle(position.x, position.y, radius, gate_color);
//if(selected || picked_up || in_selection_rect || hovering()) DrawCircle(position.x, position.y, radius, (Color){108, 153, 187, 255}); if(picked_up || in_selection_rect || hovering()) DrawCircle(position.x, position.y, radius, (Color){108, 153, 187, 255});
if(selected) DrawCircle(position.x, position.y, radius, (Color){255, 153, 187, 255}); if(selected) DrawCircle(position.x, position.y, radius, (Color){255, 153, 187, 255});
if(distributionMode == Distribution::RANDOM) DrawCircle(position.x, position.y, radius/2.0f, VS_COLOR_PINK); if(distributionMode == Distribution::RANDOM) DrawCircle(position.x, position.y, radius/2.0f, VS_COLOR_PINK);
@@ -175,7 +175,7 @@ namespace VISEQ::GRAPH::NODES {
if(selected) DrawCircleLinesV(position, radius+8, (Color){158, 255, 210, 255}); if(selected) DrawCircleLinesV(position, radius+8, (Color){158, 255, 210, 255});
if(IsKeyDown(KEY_LEFT_ALT)){ if(state->keys_down.alt){
float value = 0; float value = 0;
int offset_gate = 0; int offset_gate = 0;
switch(mode){ switch(mode){
@@ -212,14 +212,6 @@ namespace VISEQ::GRAPH::NODES {
} }
} }
/*Vec2Df connector = position - ((position - mouse)).norm() * (radius + RADIUS);*/
/*float opacity = 150.0f - Clamp(position.dist(mouse), 0.0f, 150.0f);*/
/**/
/*if(hover_connect){*/
/* DrawCircle(connector.x, connector.y, 8.0f, (Color){108, 153, 187, 255});*/
/*} else {*/
/* DrawCircle(connector.x, connector.y, 8.0f, (Color){108, 153, 187, (unsigned char)opacity});*/
/*}*/
if(highlighted) DrawCircleLinesV(position, radius+2, (Color){255, 0, 0, 200}); if(highlighted) DrawCircleLinesV(position, radius+2, (Color){255, 0, 0, 200});
DrawText(std::format("{}", id).c_str(), position.x + 20.0f, position.y + 20.0f, 10, WHITE); DrawText(std::format("{}", id).c_str(), position.x + 20.0f, position.y + 20.0f, 10, WHITE);
} }
src/node.h
+1 -11
View File
@@ -69,17 +69,7 @@ namespace VISEQ::GRAPH::NODES {
} }
void update() override{ void update() override{
if((held() && !picked_up) || (clicked() && !state->keys_down.shift)) select(); BASE::Draggable::update();
if(entered()) state->istate = APP::InteractionState::HOVER_NODE;
if(exited()) state->istate = APP::InteractionState::HOVER_CANVAS;
if(pickedUp()){
drag();
state->istate = APP::InteractionState::DRAG_NODE;
}
if(released() && picked_up){
putDown();
state->istate = APP::InteractionState::HOVER_CANVAS;
}
int free_connectors = 0; int free_connectors = 0;
for(auto c : connectors){ for(auto c : connectors){
src/selectable.h
+2
View File
@@ -1,6 +1,7 @@
#pragma once #pragma once
#include "interactable.h" #include "interactable.h"
#include "vmath.h"
namespace VISEQ::BASE { namespace VISEQ::BASE {
class Selectable : public Interactable{ class Selectable : public Interactable{
@@ -13,6 +14,7 @@ namespace VISEQ::BASE {
bool copied = false; bool copied = false;
bool highlighted = false; bool highlighted = false;
bool erase = false; bool erase = false;
Vec2Df selection_offset;
virtual bool clicked() override { virtual bool clicked() override {
return (selected || hovering()) && IsMouseButtonPressed(MOUSE_BUTTON_LEFT); return (selected || hovering()) && IsMouseButtonPressed(MOUSE_BUTTON_LEFT);