Cancelling wiring with escape, deleting wires and rewiring

rj45 · rj45 · commit 6cea5c943899 · 2024-06-08T13:00:31.000-07:00
diff --git a/build.zig b/build.zig
@@ -65,7 +65,7 @@ pub fn build(b: *std.Build) void {
         } else {
             cflags.appendSlice(&.{
                 "-g",
-                "-O1",
+                "-O0",
                 "-fno-omit-frame-pointer",
                 "-fno-optimize-sibling-calls",
                 "-Wall",
diff --git a/src/autoroute/autoroute.c b/src/autoroute/autoroute.c
@@ -48,6 +48,8 @@ struct AutoRoute {
 
   RT_Graph *graph;
 
+  bool needsRefresh;
+
   int timeIndex;
   int timeLength;
   uint64_t buildTimes[TIME_SAMPLES];
@@ -171,6 +173,34 @@ static void autoroute_on_waypoint_update(void *user, WaypointID id, void *ptr) {
     ar, waypoint->net, circuit_net_ptr(ar->circuit, waypoint->net));
 }
 
+static void autoroute_on_any_delete(void *user, ID id, void *ptr) {
+  AutoRoute *ar = user;
+  ar->needsRefresh = true;
+}
+
+static void autoroute_refresh_data(AutoRoute *ar) {
+  for (int i = 0; i < circuit_component_len(ar->circuit); i++) {
+    Component *comp = &ar->circuit->components[i];
+    autoroute_on_component_update(
+      ar, circuit_component_id(ar->circuit, i), comp);
+  }
+  for (int i = 0; i < circuit_net_len(ar->circuit); i++) {
+    Net *net = &ar->circuit->nets[i];
+    autoroute_on_net_update(ar, circuit_net_id(ar->circuit, i), net);
+  }
+  for (int i = 0; i < circuit_endpoint_len(ar->circuit); i++) {
+    Endpoint *endpoint = &ar->circuit->endpoints[i];
+    autoroute_on_endpoint_update(
+      ar, circuit_endpoint_id(ar->circuit, i), endpoint);
+  }
+  for (int i = 0; i < circuit_waypoint_len(ar->circuit); i++) {
+    Waypoint *waypoint = &ar->circuit->waypoints[i];
+    autoroute_on_waypoint_update(
+      ar, circuit_waypoint_id(ar->circuit, i), waypoint);
+  }
+  ar->needsRefresh = false;
+}
+
 AutoRoute *autoroute_create(Circuit *circuit) {
   AutoRoute *ar = malloc(sizeof(AutoRoute));
   *ar = (AutoRoute){
@@ -180,23 +210,27 @@ AutoRoute *autoroute_create(Circuit *circuit) {
     &circuit->sm.components, (void **)&ar->boxes, sizeof(*ar->boxes));
   circuit_on_component_create(circuit, ar, autoroute_on_component_update);
   circuit_on_component_update(circuit, ar, autoroute_on_component_update);
+  circuit_on_component_delete(circuit, ar, autoroute_on_any_delete);
 
   smap_add_synced_array(
     &circuit->sm.nets, (void **)&ar->nets, sizeof(*ar->nets));
   smap_add_synced_array(
     &circuit->sm.nets, (void **)&ar->netViews, sizeof(*ar->netViews));
   circuit_on_net_create(circuit, ar, autoroute_on_net_update);
   circuit_on_net_update(circuit, ar, autoroute_on_net_update);
+  circuit_on_net_delete(circuit, ar, autoroute_on_any_delete);
 
   smap_add_synced_array(
     &circuit->sm.endpoints, (void **)&ar->endpoints, sizeof(*ar->endpoints));
   circuit_on_endpoint_create(circuit, ar, autoroute_on_endpoint_update);
   circuit_on_endpoint_update(circuit, ar, autoroute_on_endpoint_update);
+  circuit_on_endpoint_delete(circuit, ar, autoroute_on_any_delete);
 
   smap_add_synced_array(
     &circuit->sm.waypoints, (void **)&ar->waypoints, sizeof(*ar->waypoints));
   circuit_on_waypoint_create(circuit, ar, autoroute_on_waypoint_update);
   circuit_on_waypoint_update(circuit, ar, autoroute_on_waypoint_update);
+  circuit_on_waypoint_delete(circuit, ar, autoroute_on_any_delete);
 
   RT_Result res = RT_graph_new(&ar->graph);
   assert(res == RT_RESULT_SUCCESS);
@@ -317,6 +351,10 @@ static void autoroute_prepare_routing(AutoRoute *ar, RoutingConfig config) {
     return;
   }
 
+  if (ar->needsRefresh) {
+    autoroute_refresh_data(ar);
+  }
+
   RT_Result res = RT_graph_build(
     ar->graph, (RT_Slice_Anchor){ar->anchors, arrlen(ar->anchors)},
     (RT_Slice_BoundingBox){ar->boxes, circuit_component_len(ar->circuit)},
diff --git a/src/core/circuit.c b/src/core/circuit.c
@@ -218,8 +218,8 @@ static void circuit_port_deleted(void *user, ID id, void *ptr) {
 
   if (circuit_has(circuit, port->endpoint)) {
     Endpoint *endpoint = circuit_endpoint_ptr(circuit, port->endpoint);
-    circuit_update_id(circuit, port->endpoint);
     endpoint->port = NO_PORT;
+    circuit_update_id(circuit, port->endpoint);
   }
 
   circuit_del(circuit, port->label);
diff --git a/src/main.c b/src/main.c
@@ -424,9 +424,9 @@ void event(const sapp_event *event, void *user_data) {
     bv_set(app->circuit.ux.input.keysDown, event->key_code);
     bv_set(app->circuit.ux.input.keysPressed, event->key_code);
     app->circuit.ux.input.modifiers = event->modifiers;
-    if (event->key_code == SAPP_KEYCODE_ESCAPE) {
-      sapp_request_quit();
-    }
+    // if (event->key_code == SAPP_KEYCODE_ESCAPE) {
+    //   sapp_request_quit();
+    // }
     break;
 
   case SAPP_EVENTTYPE_KEY_UP:
@@ -472,6 +472,11 @@ sapp_desc sokol_main(int argc, char *argv[]) {
 
   log_info("Global setup complete");
 
+#ifndef _WIN32
+  init_exceptions(argv[0]);
+  log_info("Exceptions hooked");
+#endif
+
   my_app_t *app = malloc(sizeof(my_app_t));
   *app = (my_app_t){
     .filename = "testdata/alu_1bit_2gatemux.dig",
diff --git a/src/ux/input.c b/src/ux/input.c
@@ -15,6 +15,7 @@
 */
 
 #include "core/core.h"
+#include "core/structs.h"
 #include "handmade_math.h"
 #include "render/draw.h"
 #include "stb_ds.h"
@@ -39,29 +40,36 @@ static const char *stateNames[] = {
   [STATE_SELECT_AREA] = "SelArea",
   [STATE_SELECT_ONE] = "SelOne",
   [STATE_MOVE_SELECTION] = "MoveSel",
+  [STATE_CLICK_ENDPOINT] = "ClickEndpoint",
   [STATE_CLICK_PORT] = "ClickPort",
   [STATE_DRAG_WIRING] = "DragWiring",
   [STATE_START_CLICK_WIRING] = "StartClickWiring",
   [STATE_CLICK_WIRING] = "ClickWiring",
   [STATE_CONNECT_PORT] = "ConnectPort",
   [STATE_FLOATING_WIRE] = "FloatingWire",
+  [STATE_CANCEL_WIRE] = "CancelWire",
   [STATE_ADDING_COMPONENT] = "AddingComponent",
   [STATE_ADD_COMPONENT] = "AddComponent",
 };
 
 static void ux_mouse_down_state_machine(CircuitUX *ux, HMM_Vec2 worldMousePos) {
   bool rightDown = ux->input.modifiers & MODIFIER_RMB;
   bool leftDown = ux->input.modifiers & MODIFIER_LMB;
+  bool shiftDown = ux->input.modifiers & MODIFIER_SHIFT;
+  bool escDown = bv_is_set(ux->input.keysDown, KEYCODE_ESCAPE);
 
   bool overPort = false;
   bool overItem = false;
+  bool overEndpoint = false;
 
   for (size_t i = 0; i < arrlen(ux->view.hovered); i++) {
     ID id = ux->view.hovered[i];
     if (id_type(id) == ID_PORT) {
       overPort = true;
     } else if (id_type(id) == ID_COMPONENT || id_type(id) == ID_WAYPOINT) {
       overItem = true;
+    } else if (id_type(id) == ID_ENDPOINT) {
+      overEndpoint = true;
     }
   }
 
@@ -102,6 +110,12 @@ static void ux_mouse_down_state_machine(CircuitUX *ux, HMM_Vec2 worldMousePos) {
       if (leftDown) {
         if (inSelection) {
           state = STATE_MOVE_SELECTION;
+        } else if (overEndpoint) {
+          if (shiftDown && overPort) {
+            state = STATE_CLICK_PORT;
+          } else {
+            state = STATE_CLICK_ENDPOINT;
+          }
         } else if (overPort) {
           state = STATE_CLICK_PORT;
         } else if (overItem) {
@@ -152,6 +166,7 @@ static void ux_mouse_down_state_machine(CircuitUX *ux, HMM_Vec2 worldMousePos) {
         state = STATE_UP;
       }
       break;
+    case STATE_CLICK_ENDPOINT: // fallthrough
     case STATE_CLICK_PORT:
       if (!leftDown) {
         state = STATE_START_CLICK_WIRING;
@@ -160,7 +175,9 @@ static void ux_mouse_down_state_machine(CircuitUX *ux, HMM_Vec2 worldMousePos) {
       }
       break;
     case STATE_DRAG_WIRING:
-      if (overPort && !leftDown) {
+      if (escDown) {
+        state = STATE_CANCEL_WIRE;
+      } else if (overPort && !leftDown) {
         state = STATE_CONNECT_PORT;
       } else if (!overPort && !leftDown) {
         state = STATE_FLOATING_WIRE;
@@ -178,6 +195,8 @@ static void ux_mouse_down_state_machine(CircuitUX *ux, HMM_Vec2 worldMousePos) {
         } else if (!overPort) {
           state = STATE_FLOATING_WIRE;
         }
+      } else if (escDown) {
+        state = STATE_CANCEL_WIRE;
       }
       break;
     case STATE_CONNECT_PORT:
@@ -190,6 +209,11 @@ static void ux_mouse_down_state_machine(CircuitUX *ux, HMM_Vec2 worldMousePos) {
         state = STATE_UP;
       }
       break;
+    case STATE_CANCEL_WIRE:
+      if (!leftDown && !escDown) {
+        state = STATE_UP;
+      }
+      break;
     case STATE_ADDING_COMPONENT:
       if (leftDown) {
         state = STATE_ADD_COMPONENT;
@@ -282,6 +306,16 @@ static void ux_mouse_down_state_machine(CircuitUX *ux, HMM_Vec2 worldMousePos) {
         }
         break;
 
+      case STATE_CLICK_ENDPOINT:
+        for (size_t i = 0; i < arrlen(ux->view.hovered); i++) {
+          ID id = ux->view.hovered[i];
+          if (id_type(id) == ID_ENDPOINT) {
+            ux_continue_wire(ux, id);
+            break;
+          }
+        }
+        break;
+
       case STATE_CLICK_PORT:
         for (size_t i = 0; i < arrlen(ux->view.hovered); i++) {
           ID id = ux->view.hovered[i];
@@ -305,11 +339,23 @@ static void ux_mouse_down_state_machine(CircuitUX *ux, HMM_Vec2 worldMousePos) {
           ID id = ux->view.hovered[i];
           if (id_type(id) == ID_PORT) {
             ux_connect_wire(ux, id);
+            ux_route(ux);
             break;
           }
         }
         break;
 
+      case STATE_CANCEL_WIRE:
+        ux_cancel_wire(ux);
+
+        // rebuild the BVH after removing things
+        ux_build_bvh(ux);
+
+        log_debug("routing after cancel");
+        ux_route(ux);
+        log_debug("cancelled wire, finished routing");
+        break;
+
       default:
         break;
       }
@@ -559,19 +605,48 @@ void ux_start_wire(CircuitUX *ux, PortID portID) {
     circuit_add_endpoint(&ux->view.circuit, netID, NO_PORT, HMM_V2(0, 0));
 }
 
+void ux_continue_wire(CircuitUX *ux, EndpointID endpointID) {
+  ux->newNet = false;
+  ux->endpointStart = NO_ENDPOINT;
+  ux->endpointEnd = endpointID;
+  Endpoint *endpoint = circuit_endpoint_ptr(&ux->view.circuit, endpointID);
+  if (endpoint->port != NO_PORT) {
+    // disconnect endpoint from port
+    Port *port = circuit_port_ptr(&ux->view.circuit, endpoint->port);
+    port->endpoint = NO_ENDPOINT;
+    endpoint->port = NO_PORT;
+  }
+  Net *net = circuit_net_ptr(&ux->view.circuit, endpoint->net);
+  int count = 0;
+  EndpointID netEndpointID = net->endpointFirst;
+  EndpointID otherEndpointID = NO_ENDPOINT;
+  while (circuit_has(&ux->view.circuit, netEndpointID)) {
+    Endpoint *endpoint = circuit_endpoint_ptr(&ux->view.circuit, netEndpointID);
+    if (netEndpointID != endpointID) {
+      otherEndpointID = netEndpointID;
+    }
+    count++;
+    netEndpointID = endpoint->next;
+  }
+  if (count <= 2) {
+    ux->newNet = true;
+    ux->endpointStart = otherEndpointID;
+  }
+}
+
 void ux_cancel_wire(CircuitUX *ux) {
+  NetID netID = circuit_endpoint_ptr(&ux->view.circuit, ux->endpointEnd)->net;
   circuit_del(&ux->view.circuit, ux->endpointEnd);
   if (ux->newNet) {
-    Endpoint *endpoint =
-      circuit_endpoint_ptr(&ux->view.circuit, ux->endpointStart);
-    NetID netID = endpoint->net;
-    circuit_del(&ux->view.circuit, ux->endpointStart);
+    if (circuit_has(&ux->view.circuit, ux->endpointStart)) {
+      circuit_del(&ux->view.circuit, ux->endpointStart);
+    }
     circuit_del(&ux->view.circuit, netID);
   }
+
   ux->newNet = false;
   ux->endpointStart = NO_ENDPOINT;
   ux->endpointEnd = NO_ENDPOINT;
-  ux_route(ux);
 }
 
 void ux_connect_wire(CircuitUX *ux, PortID portID) {
@@ -583,7 +658,6 @@ void ux_connect_wire(CircuitUX *ux, PortID portID) {
   }
 
   circuit_endpoint_connect(&ux->view.circuit, ux->endpointEnd, portID);
-  ux_route(ux);
 
   ux->newNet = false;
   ux->endpointStart = NO_ENDPOINT;
diff --git a/src/ux/ux.h b/src/ux/ux.h
@@ -166,11 +166,13 @@ typedef enum MouseDownState {
   STATE_SELECT_AREA,
   STATE_SELECT_ONE,
   STATE_MOVE_SELECTION,
+  STATE_CLICK_ENDPOINT,
   STATE_CLICK_PORT,
   STATE_DRAG_WIRING,
   STATE_START_CLICK_WIRING,
   STATE_CLICK_WIRING,
   STATE_CONNECT_PORT,
+  STATE_CANCEL_WIRE,
   STATE_FLOATING_WIRE,
   STATE_ADDING_COMPONENT,
   STATE_ADD_COMPONENT,
@@ -355,6 +357,7 @@ void ux_stop_adding_component(CircuitUX *ux);
 void ux_change_adding_component(CircuitUX *ux, ComponentDescID descID);
 
 void ux_start_wire(CircuitUX *ux, PortID portID);
+void ux_continue_wire(CircuitUX *ux, EndpointID endpointID);
 void ux_cancel_wire(CircuitUX *ux);
 void ux_connect_wire(CircuitUX *ux, PortID portID);
 

Original file line number	Diff line number	Diff line change
`@@ -218,8 +218,8 @@ static void circuit_port_deleted(void user, ID id, void ptr) {`
`218`	`218`
`219`	`219`	`if (circuit_has(circuit, port->endpoint)) {`
`220`	`220`	`Endpoint *endpoint = circuit_endpoint_ptr(circuit, port->endpoint);`
`221`		`- circuit_update_id(circuit, port->endpoint);`
`222`	`221`	`endpoint->port = NO_PORT;`
	`222`	`+ circuit_update_id(circuit, port->endpoint);`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`circuit_del(circuit, port->label);`