@willcgage/module-schematic 0.91.0 → 0.92.1

package/dist/index.cjs

@@ -5,6 +5,8 @@ var FREEMO_ENDPLATE_WIDTH_MIN_INCHES = 12;
 var FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES = 24;
 var FREEMO_TRACK_SPACING_INCHES = 1.125;
 var FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES = 4;
+var FREEMO_MAIN_MIN_RADIUS_INCHES = 22;
+var FREEMO_REVERSE_CURVE_STRAIGHT_INCHES = 6;
 var PINCH_EASE_INCHES = 3;
 function laneOffsetAt(lane, pos, pinches, spacingInches = FREEMO_TRACK_SPACING_INCHES) {
   const base = (lane ?? 0) * spacingInches;
@@ -2268,8 +2270,16 @@ function pieceRoutePaths(piece, library = BUILT_IN_TRACK_PARTS) {
     const b = at(route[1]);
     if (!a || !b) continue;
     const ends = [{ x: a.x, y: a.y }, { x: b.x, y: b.y }];
+    if (part.kind === "flex") {
+      const pts2 = flexRunPoints(piece.lengthInches ?? 0, piece.radiusInches).map(
+        (q) => place(q.x, q.y)
+      );
+      pts2[pts2.length - 1] = { x: b.x, y: b.y };
+      out.push({ route, points: pts2 });
+      continue;
+    }
     const diverging = route.some((r) => r === "diverge" || r === "legA" || r === "legB");
-    if (!diverging || part.kind === "flex") {
+    if (!diverging) {
       out.push({ route, points: ends });
       continue;
     }
@@ -2308,6 +2318,25 @@ function partsPlaceable(library = BUILT_IN_TRACK_PARTS) {
   return { placeable, blocked };
 }
 var JOINT_SNAP_INCHES = 0.01;
+function flexRunEnd(lengthInches, radiusInches) {
+  const L = lengthInches;
+  const R = radiusInches;
+  if (!R || !Number.isFinite(R) || Math.abs(R) < 1e-6)
+    return { x: L, y: 0, headingDeg: 0 };
+  const theta = L / R;
+  return {
+    x: Math.abs(R) * Math.sin(Math.abs(theta)) * Math.sign(L || 1),
+    y: R * (1 - Math.cos(theta)),
+    headingDeg: theta * 180 / Math.PI
+  };
+}
+function flexRunPoints(lengthInches, radiusInches, steps = 16) {
+  if (!radiusInches || !Number.isFinite(radiusInches) || Math.abs(radiusInches) < 1e-6)
+    return [{ x: 0, y: 0 }, { x: lengthInches, y: 0 }];
+  const out = [];
+  for (let i = 0; i <= steps; i++) out.push(flexRunEnd(lengthInches * i / steps, radiusInches));
+  return out.map((p) => ({ x: p.x, y: p.y }));
+}
 function placedJoints(pieces, library = BUILT_IN_TRACK_PARTS) {
   const out = [];
   const RAD = Math.PI / 180;
@@ -2318,10 +2347,13 @@ function placedJoints(pieces, library = BUILT_IN_TRACK_PARTS) {
     if (!geo) continue;
     const c = Math.cos(p.rotationDeg * RAD);
     const s = Math.sin(p.rotationDeg * RAD);
+    const run = part.kind === "flex" ? flexRunEnd(p.lengthInches ?? 0, p.radiusInches) : null;
     for (const j of geo.joints) {
-      const lx = part.kind === "flex" && j.id === "b" ? p.lengthInches ?? 0 : j.x;
-      const ly = p.flipped ? -j.y : j.y;
-      const h = (p.flipped ? -j.angleDeg : j.angleDeg) + p.rotationDeg;
+      const far = run && j.id === "b";
+      const lx = far ? run.x : j.x;
+      const ly = p.flipped ? -(far ? run.y : j.y) : far ? run.y : j.y;
+      const local = far ? run.headingDeg : j.angleDeg;
+      const h = (p.flipped ? -local : local) + p.rotationDeg;
       out.push({
         key: `${p.id}.${j.id}`,
         piece: p.id,
@@ -2427,7 +2459,15 @@ function walkTrackGraph(graph, pieces, startAt, library = BUILT_IN_TRACK_PARTS)
     const part = partOf(pid);
     return part ? partGeometry(part, library) : null;
   };
-  const gap = (a, b) => a && b ? Math.hypot(a.x - b.x, a.y - b.y) : 0;
+  const gap = (a, b) => {
+    if (!a || !b) return 0;
+    if (a.piece === b.piece) {
+      const piece = pieceById.get(a.piece);
+      const part = piece ? partOf(a.piece) : void 0;
+      if (piece && part?.kind === "flex") return piece.lengthInches ?? 0;
+    }
+    return Math.hypot(a.x - b.x, a.y - b.y);
+  };
   const routes = [];
   const turnouts = [];
   const warnings = [];
@@ -3340,6 +3380,8 @@ exports.FLEX_TRACK_PARTS = FLEX_TRACK_PARTS;
 exports.FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES = FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES;
 exports.FREEMO_ENDPLATE_WIDTH_MIN_INCHES = FREEMO_ENDPLATE_WIDTH_MIN_INCHES;
 exports.FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES = FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES;
+exports.FREEMO_MAIN_MIN_RADIUS_INCHES = FREEMO_MAIN_MIN_RADIUS_INCHES;
+exports.FREEMO_REVERSE_CURVE_STRAIGHT_INCHES = FREEMO_REVERSE_CURVE_STRAIGHT_INCHES;
 exports.FREEMO_TRACK_SPACING_INCHES = FREEMO_TRACK_SPACING_INCHES;
 exports.JOINT_SNAP_INCHES = JOINT_SNAP_INCHES;
 exports.MAIN2_TRACK_ID = MAIN2_TRACK_ID;
@@ -3378,6 +3420,7 @@ exports.endplateWidthInches = endplateWidthInches;
 exports.flexPartFor = flexPartFor;
 exports.flexParts = flexParts;
 exports.flexPieces = flexPieces;
+exports.flexRunEnd = flexRunEnd;
 exports.flexUsage = flexUsage;
 exports.frogCasting = frogCasting;
 exports.frogNumberFromName = frogNumberFromName;