@reekon-tools/boldr-cad 0.1.0 → 1.0.0

package/src/tools/registry.ts

@@ -2,7 +2,7 @@ import { tryAddConstraint } from '../app/edit';
 import { ed, type Snap } from '../app/state';
 import { hyp } from '../model/geom';
 import { settings } from '../model/settings';
-import { addPoint } from '../model/sketch';
+import { addPoint, WALL_THICK } from '../model/sketch';
 import { SK } from '../model/store';
 import type { Constraint, XY } from '../model/types';
 import { chip } from '../render/draw';
@@ -12,6 +12,7 @@ import { onSessionReset } from '../model/session';
 import { updateCtx, updateHint, updateRail } from '../editor/ports';
 import type { KeyIn } from '../editor/keys';
 import type { DrawCtx } from '../render/ctx';
+import { TH } from '../render/theme';
 
 /** Pointer event in canvas space. */
 export interface PEv {
@@ -65,7 +66,10 @@ export function commitPoint(s: Snap): { id: string; cons: Constraint[] } {
   if (s.kind === 'point') return { id: s.ref!, cons: [] };
   const id = addPoint(SK(), s.x, s.y);
   const cons: Constraint[] = [];
-  if (s.kind === 'mid') cons.push({ type: 'mid', p: id, l: s.ref! });
+  // the middle of a wall face's own edge (the wall's, a door's or window's): on that edge, free to slide along it —
+  // locked to its middle it couldn't move at all (the edge is fixed); the bar's Midpoint locks it there when wanted
+  if (s.kind === 'mid' && SK().lines[s.ref!]?.anchor) cons.push({ type: 'online', p: id, l: s.ref! });
+  else if (s.kind === 'mid') cons.push({ type: 'mid', p: id, l: s.ref! });
   else if (s.kind === 'online') cons.push({ type: 'online', p: id, l: s.ref! });
   else if (s.kind === 'oncircle') cons.push({ type: 'oncircle', p: id, c: s.ref! });
   else if (s.kind === 'inter' && s.refs) cons.push({ type: 'online', p: id, l: s.refs[0] }, { type: 'online', p: id, l: s.refs[1] });
@@ -87,3 +91,24 @@ export function lengthPreview(c: DrawCtx, T: Xform, a: XY, b: XY, col?: string):
   if (L * T.s < 6) return;
   chip(c, fmtLen(L), (x1 + x2) / 2, (y1 + y2) / 2 - 16, { bg: '#fff', fg: '#0066FF', border: [col || '#0066FF', 1.5] });
 }
+
+/**
+ * A point placed while drawing a Draft shape (a circle's centre, an arc's ends, a rectangle's corners): a crosshair and a
+ * dot, at screen x, y. On a touch screen nothing hovers between taps, so this is what shows what's placed and where.
+ * (Not markup: Annotate's shapes are drawn by a drag, and have no points to place.)
+ */
+export function anchorMark(c: DrawCtx, x: number, y: number): void {
+  c.save();
+  c.strokeStyle = TH.blue; c.fillStyle = TH.blue; c.lineWidth = 1.5; c.setLineDash([]);
+  c.beginPath(); c.moveTo(x - 9, y); c.lineTo(x + 9, y); c.moveTo(x, y - 9); c.lineTo(x, y + 9); c.stroke();
+  c.beginPath(); c.arc(x, y, 3.5, 0, Math.PI * 2); c.fill();
+  c.restore();
+}
+
+/** Under a shape being drawn as walls: the band the walls will fill. `trace` adds the shape's path (screen points). */
+export function wallBand(c: DrawCtx, T: Xform, trace: () => void): void {
+  c.save();
+  c.strokeStyle = 'rgba(0,102,255,.25)'; c.lineWidth = WALL_THICK * T.s; c.lineCap = 'butt'; c.lineJoin = 'miter'; c.setLineDash([]);
+  c.beginPath(); trace(); c.stroke();
+  c.restore();
+}