Merge branch 'feature/0.3.4' into develop

Changelog.md

@@ -1,5 +1,14 @@
+## 0.3.4
+Handle Wall, Edge classes in Draw.segment.
+Add an internal PIXI.Point.invert that returns object, for non-keys.
+Fix for test if can convert polygon to rectangle.
+Add `ClipperPaths#union` method that unions polygons without filling.
+
 ## 0.3.3
 Switch to using TextureLoader.getTextureAlphaData.
+Fix the `fromOverheadTileAlpha` method given changes to `TextureLoader.getTextureAlphaData`.
+Use `wall.edge.a`.
+Change Tile overhead test.
 
 ## 0.3.2
 Use `token#getShape()` instead of `token#shape` in `token#tokenBorder` so it works even if the token shape is not yet defined.

ClipperPaths.js

@@ -67,8 +67,8 @@ export class ClipperPaths {
    */
   static polygonToRectangle(polygon) {
     const pts = polygon.points;
-    if ( !(polygon.isClosed && pts.length === 10)
-      || !(!polygon.isClosed && pts.length === 8) ) return polygon;
+    if ( (polygon.isClosed && pts.length !== 10)
+      || (!polygon.isClosed && pts.length !== 8) ) return polygon;
 
     // Layout must be clockwise.
     // Layout options:
@@ -318,6 +318,24 @@ export class ClipperPaths {
     return this._clipperClip(polygon, ClipperLib.ClipType.ctDifference);
   }
 
+  /**
+   * Union the paths.
+   * @returns {ClipperPaths}
+   */
+  union() {
+    if ( this.paths.length === 1 ) return this;
+    const c = new ClipperLib.Clipper();
+    const union = new ClipperPaths();
+    union.scalingFactor = this.scalingFactor;
+    c.AddPaths(this.paths, ClipperLib.PolyType.ptSubject, true);
+    c.Execute(ClipperLib.ClipType.ctUnion,
+      union.paths,
+      ClipperLib.PolyFillType.pftNonZero,
+      ClipperLib.PolyFillType.pftNonZero
+      );
+    return union;
+  }
+
   /**
    * Union the paths, using a positive fill.
    * This version uses a positive fill type so any overlap is filled.

Draw.js

@@ -116,9 +116,12 @@ export class Draw {
    * @param {Number}  width   Width of the line in pixels.
    */
   segment(s, { color = Draw.COLORS.blue, alpha = 1, width = 1 } = {}) {
+    // Handle Wall, Edge, other
+    const A = s.edge?.a ?? s.a ?? s.A;
+    const B = s.edge?.b ?? s.b ?? s.B;
     this.g.lineStyle(width, color, alpha)
-      .moveTo(s.A.x, s.A.y)
-      .lineTo(s.B.x, s.B.y);
+      .moveTo(A.x, A.y)
+      .lineTo(B.x, B.y);
   }
 
   /**

PIXI/Point.js

@@ -20,10 +20,15 @@ PIXI.Point._tmp3 = new PIXI.Point();
  * @param {number} key      Integer key
  * @returns {PIXI.Point} coordinates
  */
-function invertKey(key) {
+function invertKey(key, outPoint) {
+  outPoint ??= new this();
+  return outPoint.copyFrom(this._invertKey(key));
+}
+
+function _invertKey(key) {
   const x = Math.floor(key * MAX_TEXTURE_SIZE_INV);
   const y = key - (MAX_TEXTURE_SIZE * x);
-  return new PIXI.Point(x, y);
+  return { x, y };
 }
 
 /**
@@ -431,7 +436,8 @@ PATCHES.PIXI.STATIC_METHODS = {
   angleBetween,
   flatMapPoints,
   fromObject,
-  invertKey
+  invertKey,
+  _invertKey
 };
 
 PATCHES.PIXI.METHODS = {

registration.js

@@ -5,7 +5,7 @@ Hooks
 */
 "use strict";
 
-const VERSION = "0.3.3";
+const VERSION = "0.3.4";
 
 // Foundry utils
 import { registerFoundryUtilsMethods } from "./util.js";