Fix right mouse button panning at far out zooms, and fix routing debu…

…g line transform

src/autoroute/autoroute.c

@@ -286,12 +286,7 @@ void draw_stroked_line(
   Context ctx, HMM_Vec2 start, HMM_Vec2 end, float line_thickness,
   HMM_Vec4 color);
 
-static HMM_Vec2 panZoom(RT_Point position, float zoom, HMM_Vec2 pan) {
-  return HMM_AddV2(HMM_MulV2F(HMM_V2(position.x, position.y), zoom), pan);
-}
-
-void autoroute_draw_debug_lines(
-  AutoRoute *ar, void *ctx, float zoom, HMM_Vec2 pan) {
+void autoroute_draw_debug_lines(AutoRoute *ar, void *ctx) {
   const RT_Node *nodes;
   size_t nodeCount;
 
@@ -311,26 +306,18 @@ void autoroute_draw_debug_lines(
       if (neighbors[j] < nodeCount) {
         RT_Point p2 = nodes[neighbors[j]].position;
         draw_stroked_line(
-          ctx, panZoom(p1, zoom, pan), panZoom(p2, zoom, pan), 1,
+          ctx, HMM_V2(p1.x, p1.y), HMM_V2(p2.x, p2.y), 1,
           HMM_V4(0.5f, 0.5f, 0.7f, 0.5f));
       }
     }
   }
 
   for (uint32_t i = 0; i < circuit_component_len(&ar->view->circuit); i++) {
     RT_BoundingBox *box = &ar->boxes[i];
-    HMM_Vec2 tl = panZoom(
-      (RT_Point){
-        .x = box->center.x - box->half_width,
-        .y = box->center.y - box->half_height,
-      },
-      zoom, pan);
-    HMM_Vec2 br = panZoom(
-      (RT_Point){
-        .x = box->center.x + box->half_width,
-        .y = box->center.y + box->half_height,
-      },
-      zoom, pan);
+    HMM_Vec2 tl =
+      HMM_V2(box->center.x - box->half_width, box->center.y - box->half_height);
+    HMM_Vec2 br =
+      HMM_V2(box->center.x + box->half_width, box->center.y + box->half_height);
     draw_stroked_line(
       ctx, tl, HMM_V2(br.X, tl.Y), 1, HMM_V4(0.7f, 0.5f, 0.5f, 0.5f));
     draw_stroked_line(

src/autoroute/autoroute.h

@@ -33,8 +33,7 @@ size_t autoroute_wire_vertices(
 void autoroute_get_junction_pos(
   AutoRoute *ar, JunctionID junctionID, float *x, float *y);
 
-void autoroute_draw_debug_lines(
-  AutoRoute *ar, void *ctx, float zoom, HMM_Vec2 pan);
+void autoroute_draw_debug_lines(AutoRoute *ar, void *ctx);
 void autoroute_dump_anchor_boxes(AutoRoute *ar);
 
 #endif // AUTOROUTE_H

src/main.c

@@ -340,7 +340,6 @@ void event(const sapp_event *event, void *user_data) {
   case SAPP_EVENTTYPE_MOUSE_SCROLL: {
     app->circuit.input.scroll = HMM_AddV2(
       app->circuit.input.scroll, HMM_V2(event->scroll_x, event->scroll_y));
-
     break;
   }
   default:

src/render/draw.c

@@ -118,8 +118,8 @@ float draw_get_zoom(DrawContext *draw) { return draw->zoom; }
 void draw_begin_frame(DrawContext *draw) {
   sgp_push_transform();
   sgp_reset_transform();
-  sgp_translate(draw->pan.X, draw->pan.Y);
   sgp_scale(draw->zoom, draw->zoom);
+  sgp_translate(draw->pan.X, draw->pan.Y);
 }
 
 void draw_end_frame(DrawContext *draw) { sgp_pop_transform(); }

src/ux/input.c

@@ -275,7 +275,6 @@ static void ux_mouse_down_state_machine(CircuitUX *ux, HMM_Vec2 worldMousePos) {
   }
   case STATE_PAN: {
     HMM_Vec2 delta = HMM_SubV2(worldMousePos, ux->downStart);
-    ux->downStart = HMM_SubV2(worldMousePos, delta);
     draw_add_pan(ux->view.drawCtx, delta);
     break;
   }
@@ -290,9 +289,8 @@ static void ux_handle_mouse(CircuitUX *ux) {
   ux->view.hovered = NO_ID;
   ux->view.hoveredPort = NO_PORT;
 
-  HMM_Vec2 worldMousePos = HMM_DivV2F(
-    HMM_SubV2(ux->input.mousePos, draw_get_pan(ux->view.drawCtx)),
-    draw_get_zoom(ux->view.drawCtx));
+  HMM_Vec2 worldMousePos =
+    draw_screen_to_world(ux->view.drawCtx, ux->input.mousePos);
 
   Box mouseBox = {
     .center = worldMousePos,
@@ -356,25 +354,24 @@ static void ux_zoom(CircuitUX *ux) {
 
   // figure out the correction to the pan so that the zoom is centred on the
   // mouse position
-  HMM_Vec2 correction =
-    HMM_MulV2F(HMM_SubV2(newMousePos, originalMousePos), newZoom);
+  HMM_Vec2 correction = HMM_SubV2(newMousePos, originalMousePos);
   draw_add_pan(ux->view.drawCtx, correction);
 }
 
 void ux_update(CircuitUX *ux) {
   float dt = (float)ux->input.frameDuration;
   HMM_Vec2 panDelta = HMM_V2(0, 0);
   if (bv_is_set(ux->input.keysDown, KEYCODE_W)) {
-    panDelta.Y += 600.0f * dt * draw_get_zoom(ux->view.drawCtx);
+    panDelta.Y += 600.0f * dt; // * (1 / draw_get_zoom(ux->view.drawCtx));
   }
   if (bv_is_set(ux->input.keysDown, KEYCODE_A)) {
-    panDelta.X += 600.0f * dt * draw_get_zoom(ux->view.drawCtx);
+    panDelta.X += 600.0f * dt; // * (1 / draw_get_zoom(ux->view.drawCtx));
   }
   if (bv_is_set(ux->input.keysDown, KEYCODE_S)) {
-    panDelta.Y -= 600.0f * dt * draw_get_zoom(ux->view.drawCtx);
+    panDelta.Y -= 600.0f * dt; // * (1 / draw_get_zoom(ux->view.drawCtx));
   }
   if (bv_is_set(ux->input.keysDown, KEYCODE_D)) {
-    panDelta.X -= 600.0f * dt * draw_get_zoom(ux->view.drawCtx);
+    panDelta.X -= 600.0f * dt; // * (1 / draw_get_zoom(ux->view.drawCtx));
   }
   if (panDelta.X != 0 || panDelta.Y != 0) {
     draw_add_pan(ux->view.drawCtx, panDelta);
@@ -427,8 +424,6 @@ void ux_draw(CircuitUX *ux) {
   view_draw(&ux->view);
 
   if (ux->debugLines) {
-    autoroute_draw_debug_lines(
-      ux->router, ux->view.drawCtx, draw_get_zoom(ux->view.drawCtx),
-      draw_get_pan(ux->view.drawCtx));
+    autoroute_draw_debug_lines(ux->router, ux->view.drawCtx);
   }
 }