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

Node interactions working again, graph editing functions not complete yet

Browse Source
This commit is contained in:
Sebastian
2024-11-30 02:54:40 +01:00
parent 635c94e3cf
commit fcc5d74e18
12 changed files with 343 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
-280
View File
@@ -61,104 +61,7 @@ int main(){
app.update();
app.draw();
/*else if(IsKeyDown(KEY_LEFT_SHIFT)){*/
/* float steps = round((dragNode->neighbors.front()->position.dist(mouse_pos)) / state->settings.grid) * state->settings.grid;*/
/* if(dragNode->neighbors.size() > 1){*/
/* Vec2Df dn1 = dragNode->neighbors[0]->position;*/
/* Vec2Df dn2 = dragNode->neighbors[1]->position;*/
/* Vec2Df v1_orth = dn1.center(dn2);*/
/**/
/* if(dn1.x < dn2.x) std::swap(dn1,dn2);*/
/**/
/* float dist = dn1.dist(dn2);*/
/* float dist_orth = std::sqrt(std::pow(steps,2) - std::pow(dist/2,2));*/
/**/
/* if(mouse_pos.y < v1_orth.y) dist_orth *= -1;*/
/**/
/* Vec2Df v1_orth_t = v1_orth + (dn1-dn2).norm().orth() * dist_orth;*/
/* DrawLineV(dn1, dn2, VS_COLOR_RED);*/
/* DrawLineV(v1_orth, v1_orth_t, VS_COLOR_RED);*/
/* DrawCircleV(v1_orth, 3.0f, VS_COLOR_RED);*/
/* dragNode->position = v1_orth_t;*/
/* } else if(!dragNode->neighbors.empty()){*/
/* float pol_r = steps;*/
/* float pol_theta = Vector2Angle(Vec2Df{1,0},(mouse_pos - dragNode->neighbors.front()->position));*/
/* Vec2Df polar = VISEQ::VMATH::polarToCartesian(pol_r, pol_theta); */
/* dragNode->position = dragNode->neighbors.front()->position + polar;*/
/* }*/
// auto dragging_nodes = app.gm.nodes | RANGE_FILTER([](SPTR_Node n) { return n->dragging;});
/*auto connecting_nodes = app.gm.nodes | RANGE_FILTER([](SPTR_Node n) { return n->connecting;});*/
/*auto selected_nodes = app.gm.nodes | RANGE_FILTER([](SPTR_Node n) { return n->selected && !n->picked_up;}) | std::ranges::to<VEC_SPTR_Node>();*/
/*auto hovering_nodes = app.gm.nodes | RANGE_FILTER([](SPTR_Node n) { return n->hovering();});*/
/*auto hovering_connectors = app.gm.nodes | RANGE_FILTER([&mouse_pos](SPTR_Node n) { return CheckCollisionPointCircle(mouse_pos, (n->position - ((n->position - mouse_pos)).norm() * (n->radius + 14.0f)), 8.0f);});*/
/**/
/*for(auto &n : app.gm.nodes ){*/
/* if(hovering_connectors.empty()) n->hover_connect = false;*/
/*}*/
/**/
/*if(istate != InteractionState::ADD_NODES_MENU && !mouse_down && !mouse_right_down && dragging_nodes.empty() && connecting_nodes.empty() && hovering_nodes.empty() && hovering_connectors.empty()) istate = InteractionState::HOVER_CANVAS;*/
/*if((mouse_clicked || mouse_down || mouse_released) && !mouse_right_down && dragging_nodes.empty() && connecting_nodes.empty() && hovering_nodes.empty() && hovering_connectors.empty() && istate != InteractionState::SCALE_SELECTION) istate = InteractionState::DRAW_SELECTION;*/
/**/
/*if(!hovering_nodes.empty() && !mouse_down && !mouse_right_down) istate = InteractionState::HOVER_NODE;*/
/*if(!dragging_nodes.empty()) istate = InteractionState::DRAG_NODE; */
/*if(!hovering_connectors.empty() && !mouse_right_down && istate == InteractionState::HOVER_CANVAS) istate = InteractionState::HOVER_CONNECTOR;*/
/*if(!connecting_nodes.empty()) istate = InteractionState::CONNECT_NODE;*/
/**/
/*if(!selected_nodes.empty() && IsKeyPressed(KEY_DELETE)) istate = InteractionState::DELETE_SELECTED_NODES;*/
/*if(!selected_nodes.empty() && IsKeyDown(KEY_LEFT_CONTROL) && IsKeyPressed(KEY_C)) istate = InteractionState::COPY_SELECTED_NODES;*/
/**/
/*if(!copied_nodes.empty() && IsKeyDown(KEY_LEFT_CONTROL) && IsKeyPressed(KEY_V)) istate = InteractionState::PASTE_SELECTED_NODES;*/
/**/
/*if(IsKeyPressed(KEY_TAB)) {*/
/* state->settings.mode = (state->settings.mode + 1) % 3;*/
/* app.gm.setNodeMode(state->settings.mode);*/
/*}*/
/*if(!selected_nodes.empty()){*/
/* float offset = 30;*/
/* Vec2Df corner_tl = {50000, 50000};*/
/* Vec2Df corner_br = {-50000, -50000};*/
/* std::shared_ptr<Node> node_tl;*/
/* std::shared_ptr<Node> node_br;*/
/**/
/* for(auto n : selected_nodes){*/
/* float x = n->position.x;*/
/* float y = n->position.y;*/
/**/
/* if(x < corner_tl.x && y < corner_tl.y) node_tl = n;*/
/* if(x > corner_br.x && y > corner_br.y) node_br = n;*/
/**/
/* if(x <= corner_tl.x) corner_tl.x = x;*/
/* if(x >= corner_br.x) corner_br.x = x;*/
/* if(y <= corner_tl.y) corner_tl.y = y;*/
/* if(y >= corner_br.y) corner_br.y = y;*/
/* }*/
/* corner_tl -= Vec2Df(offset, offset);*/
/* corner_br += Vec2Df(offset, offset);*/
/**/
/* DrawRectangleLines(corner_tl.x, corner_tl.y, (corner_br.x - corner_tl.x), (corner_br.y - corner_tl.y), VS_COLOR_LIGHTGREY);*/
/* DrawCircleV(corner_br, 5, YELLOW);*/
/**/
/* if(istate == InteractionState::SCALE_SELECTION && mouse_released){*/
/* istate = InteractionState::HOVER_CANVAS;*/
/* }*/
/* if(mouse_clicked && corner_br.dist(mouse_pos) < 10){*/
/* scale_start = (corner_br - corner_tl);*/
/* for(auto n : selected_nodes){*/
/* n->drag_offset = n->position - node_tl->position;*/
/* }*/
/* istate = InteractionState::SCALE_SELECTION;*/
/* }*/
/* if(istate == InteractionState::SCALE_SELECTION && mouse_down){*/
/* Vec2Df scale = (mouse_pos - corner_tl) / scale_start;*/
/* if(IsKeyDown(KEY_LEFT_SHIFT)) scale.y = scale.x;*/
/* DrawText(std::format("{:.2f} {:.2f}", scale.x, scale.y).c_str(), corner_br.x+5, corner_br.y+5, 10, RED);*/
/* for(auto n : selected_nodes){*/
/* n->position = node_tl->position + (n->drag_offset * scale);*/
/* }*/
/* istate = InteractionState::SCALE_SELECTION;*/
/* }*/
/*}*/
/*switch(istate){*/
/* case InteractionState::SCALE_SELECTION:*/
@@ -186,189 +89,6 @@ int main(){
/* DrawCircleLines(node_menu_position.x, node_menu_position.y, 32, VS_COLOR_DARKGREY);*/
/**/
/* }*/
/* case InteractionState::DRAW_SELECTION:*/
/* {*/
/* if(mouse_clicked){*/
/* select_start = mouse_pos;*/
/* }*/
/* if(mouse_down){*/
/* Vec2Df select1 = {mouse_pos.x > select_start.x ? select_start.x : mouse_pos.x, mouse_pos.y > select_start.y ? select_start.y : mouse_pos.y};*/
/* Vec2Df select2 = {mouse_pos.x > select_start.x ? mouse_pos.x - select_start.x : select_start.x - mouse_pos.x, mouse_pos.y > select_start.y ? mouse_pos.y - select_start.y : select_start.y - mouse_pos.y};*/
/* DrawRectangleLines(select1.x, select1.y, select2.x, select2.y, (Color){150,150,150,150});*/
/* selection = (Rectangle){select1.x, select1.y, select2.x, select2.y};*/
/**/
/* for(auto& n : app.gm.nodes){*/
/* if(CheckCollisionPointRec(n->position, selection)) {*/
/* n->in_rect = true;*/
/* } else {*/
/* n->in_rect = false;*/
/* }*/
/* }*/
/* }*/
/**/
/* if(mouse_released){ */
/* int n_selected = 0;*/
/* for(auto& n : app.gm.nodes){*/
/* if(CheckCollisionPointRec(n->position, selection)) {*/
/* n->selected = true;*/
/* n->in_rect = false;*/
/* n_selected++;*/
/* } else {*/
/* if(!IsKeyDown(KEY_LEFT_SHIFT)) n->selected = false;*/
/* }*/
/* }*/
/* if(n_selected > 0) copied_nodes.clear();*/
/* selection = (Rectangle){0,0,0,0};*/
/* }*/
/* break;*/
/* }*/
/* case InteractionState::HOVER_NODE:*/
/* {*/
/* if(mouse_clicked) {*/
/* if(IsKeyDown(KEY_LEFT_SHIFT)) {*/
/* hovering_nodes.front()->selected = true;*/
/* } else {*/
/* hovering_nodes.front()->dragging = true;*/
/* hovering_nodes.front()->drag_offset = hovering_nodes.front()->position - mouse_pos;*/
/* }*/
/* }*/
/* if(mouse_right_clicked) hovering_nodes.front()->config = true;*/
/* break;*/
/* }*/
/* case InteractionState::DRAG_NODE:*/
/* {*/
/* if(!dragging_nodes.empty()){*/
/* SPTR_Node dragNode = dragging_nodes.front();*/
/**/
/* for(auto &n : selected_nodes){*/
/* if(!n->picked_up) n->drag_offset = n->position - dragNode->position;*/
/* n->picked_up = true;*/
/* }*/
/**/
/* if(IsKeyDown(KEY_LEFT_CONTROL)) {*/
/* dragNode->position.x = round((mouse_pos.x + dragNode->drag_offset.x) / state->settings.grid) * state->settings.grid;*/
/* dragNode->position.y = round((mouse_pos.y + dragNode->drag_offset.y) / state->settings.grid) * state->settings.grid;*/
/* } else if(IsKeyDown(KEY_LEFT_SHIFT)){*/
/* float steps = round((dragNode->neighbors.front()->position.dist(mouse_pos)) / state->settings.grid) * state->settings.grid;*/
/* if(dragNode->neighbors.size() > 1){*/
/* Vec2Df dn1 = dragNode->neighbors[0]->position;*/
/* Vec2Df dn2 = dragNode->neighbors[1]->position;*/
/* Vec2Df v1_orth = dn1.center(dn2);*/
/**/
/* if(dn1.x < dn2.x) std::swap(dn1,dn2);*/
/**/
/* float dist = dn1.dist(dn2);*/
/* float dist_orth = std::sqrt(std::pow(steps,2) - std::pow(dist/2,2));*/
/**/
/* if(mouse_pos.y < v1_orth.y) dist_orth *= -1;*/
/**/
/* Vec2Df v1_orth_t = v1_orth + (dn1-dn2).norm().orth() * dist_orth;*/
/* DrawLineV(dn1, dn2, VS_COLOR_RED);*/
/* DrawLineV(v1_orth, v1_orth_t, VS_COLOR_RED);*/
/* DrawCircleV(v1_orth, 3.0f, VS_COLOR_RED);*/
/* dragNode->position = v1_orth_t;*/
/* } else if(!dragNode->neighbors.empty()){*/
/* float pol_r = steps;*/
/* float pol_theta = Vector2Angle(Vec2Df{1,0},(mouse_pos - dragNode->neighbors.front()->position));*/
/* Vec2Df polar = VISEQ::VMATH::polarToCartesian(pol_r, pol_theta); */
/* dragNode->position = dragNode->neighbors.front()->position + polar;*/
/* }*/
/* } else {*/
/* dragNode->position = mouse_pos + dragNode->drag_offset;*/
/* }*/
/**/
/* for(auto &n : selected_nodes){*/
/* n->position = dragNode->position + n->drag_offset;*/
/* }*/
/**/
/* if(mouse_released) {*/
/* for(auto &n : dragging_nodes){*/
/* n->dragging = false;*/
/* n->picked_up = false;*/
/* }*/
/* for(auto &n : selected_nodes){*/
/* n->picked_up = false;*/
/* n->dragging = false;*/
/* }*/
/* }*/
/* }*/
/* break;*/
/* }*/
/* case InteractionState::HOVER_CONNECTOR:*/
/* {*/
/* if(!hovering_connectors.empty()){*/
/* hovering_connectors.front()->hover_connect = true;*/
/* if(mouse_clicked) hovering_connectors.front()->connecting = true;*/
/* }*/
/* break;*/
/* }*/
/* case InteractionState::CONNECT_NODE:*/
/* {*/
/* Vec2Df connector_position = connecting_nodes.front()->position - ((connecting_nodes.front()->position - mouse_pos)).norm() * (connecting_nodes.front()->radius + 14.0f);*/
/* Vec2Df target_position = mouse_pos;*/
/**/
/* if(IsKeyDown(KEY_LEFT_CONTROL)) {*/
/* target_position.x = round((mouse_pos.x) / state->settings.grid) * state->settings.grid;*/
/* target_position.y = round((mouse_pos.y) / state->settings.grid) * state->settings.grid;*/
/* } else if(IsKeyDown(KEY_LEFT_SHIFT)){*/
/* std::shared_ptr<Node> closest = app.gm.getClosestNode(mouse_pos);*/
/* float steps = round((closest->position.dist(mouse_pos)) / state->settings.grid) * state->settings.grid;*/
/* float pol_r = steps;*/
/* float pol_theta = Vector2Angle(Vec2Df{1,0},(mouse_pos - closest->position));*/
/**/
/* Vec2Df polar = VISEQ::VMATH::polarToCartesian(pol_r, pol_theta); */
/* target_position = closest->position + polar;*/
/* } else {*/
/* target_position = mouse_pos;*/
/* }*/
/**/
/* if(connecting_nodes.front()->connecting && mouse_down){*/
/* DrawLine(connector_position.x, connector_position.y, target_position.x, target_position.y, (Color){229, 181, 103, 255});*/
/* connecting_nodes.front()->hover_connect = true;*/
/* }*/
/**/
/* if(!hovering_connectors.empty()) {*/
/* hovering_connectors.front()->hover_connect = true;*/
/* }*/
/**/
/* if(mouse_released) {*/
/* if(&hovering_nodes.front() != &connecting_nodes.front() && &connecting_nodes.front() != &hovering_connectors.front()){*/
/* if(!hovering_nodes.empty()){*/
/* app.gm.addConnection(connecting_nodes.front(), hovering_nodes.front());*/
/* } else if(!hovering_connectors.empty()){*/
/* app.gm.addConnection(connecting_nodes.front(), hovering_connectors.front());*/
/* } else {*/
/* SPTR_Node new_node = app.gm.copyNode(std::dynamic_pointer_cast<MidiNode>(connecting_nodes.front()), target_position);*/
/* new_node->connecting = false;*/
/* app.gm.addConnection(connecting_nodes.front(), new_node);*/
/* }*/
/* }*/
/* connecting_nodes.front()->connecting = false;*/
/* istate = InteractionState::HOVER_CANVAS;*/
/* }*/
/* break;*/
/* }*/
/* case InteractionState::DELETE_SELECTED_NODES:*/
/* {*/
/* app.removeNodes(selected_nodes | std::ranges::to<VEC_SPTR_Node>());*/
/* break;*/
/* }*/
/* case InteractionState::COPY_SELECTED_NODES:*/
/* {*/
/* std::ranges::copy(selected_nodes.begin(), selected_nodes.end(), std::back_inserter(copied_nodes));*/
/* std::ranges::for_each(selected_nodes.begin(), selected_nodes.end(), [](SPTR_Node n){n->selected = false;});*/
/* selected_nodes.clear();*/
/* break;*/
/* }*/
/* case InteractionState::PASTE_SELECTED_NODES:*/
/* {*/
/* for(auto n: copied_nodes){*/
/* n->drag_offset = (n->position - copied_nodes.front()->position);*/
/* }*/
/* app.copyNodesAndConnections(copied_nodes, mouse_pos);*/
/* //copied_nodes.clear();*/
/* break;*/
/* }*/
/*};*/
}