Merge branch 'feature/terrain-mapper-cutaway-updates' into develop

caewok · Sep 17, 2024 · 5febb1f · 5febb1f
2 parents 769bc69 + 061a7cd
commit 5febb1f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/scripts/geometry b/scripts/geometry
diff --git a/scripts/measurement/MovePenalty.js b/scripts/measurement/MovePenalty.js
@@ -552,7 +552,10 @@ export class MovePenalty {
     const bottomElevationFn = _pt => bottomZ;
     const topElevationFn = _pt => MAX_ELEV;
     const centeredShape = CONFIG.GeometryLib.utils.centeredPolygonFromDrawing(drawing);
-    return centeredShape.cutawayIntersections(start, end, { bottomElevationFn, topElevationFn });
+
+    // Multiple cutaways are possible for polygons.
+    const cutaways = centeredShape.cutaway(start, end, { bottomElevationFn, topElevationFn });
+    return cutaways.flatMap(cutaway => cutaway.intersectSegment3d(start, end));
   }
 
   /**
@@ -564,9 +567,12 @@ export class MovePenalty {
    * @returns {PIXI.Polygon[]} Null if no intersection
    */
   static tokenCutawayIntersections(start, end, token) {
-    const bottomElevationFn = _pt => token.bottomZ;
-    const topElevationFn = _pt => token.topZ;
-    return token.constrainedTokenBorder.cutawayIntersections(start, end, { bottomElevationFn, topElevationFn });
+    const bottomElevationFn = () => token.bottomZ;
+    const topElevationFn = () => token.topZ;
+
+    // Multiple cutaways are possible if the token is constrained (e.g., inset edge).
+    const cutaways = token.constrainedTokenBorder.cutaway(start, end, { bottomElevationFn, topElevationFn });
+    return cutaways.flatMap(cutaway => cutaway.intersectSegment3d(start, end));
   }
 }
+277 −0		CutawayPolygon.js
+1 −18		Ellipse.js
+3 −9		PIXI/Circle.js
+81 −18		PIXI/Polygon.js
+2 −7		PIXI/Rectangle.js
+3 −0		registration.js
+0 −266		util.js