Merge branch 'develop'

.github/workflows/main.yml

@@ -9,6 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'true'
 
     # get part of the tag after the `v`
     - name: Extract tag version number

.gitignore

@@ -2,3 +2,4 @@
 .DS_Store
 
 sync_to_module.sh
+sync_module.sh

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "scripts/geometry"]
+	path = scripts/geometry
+	url = https://github.com/caewok/lib-geometry

Changelog.md

@@ -1,3 +1,7 @@
+## 0.6.1
+Add a shared geometry git submodule.
+Fix for prototype token error on save (issue #13). (Appears to be caused by a workaround for a Foundry bug that has since been addressed.)
+
 ## 0.6.0
 Refactor the configuration settings to use css "display:none," which is simpler than the previous approach for hiding/displaying sub-settings when a specific shape is chosen.
 

module.json

@@ -9,7 +9,7 @@
   "manifestPlusVersion": "1.0.0",
   "compatibility": {
     "minimum": "10.279",
-    "verified": "10.290"
+    "verified": "10.291"
   },
   "authors": [
     {

scripts/boundaryPolygon.js

@@ -6,12 +6,12 @@ canvas
 
 import { getFlag } from "./util.js";
 import { FLAGS } from "./const.js";
-import { Ellipse } from "./shapes/Ellipse.js";
-import { RegularPolygon } from "./shapes/RegularPolygon.js";
-import { RegularStar } from "./shapes/RegularStar.js";
-import { EquilateralTriangle } from "./shapes/EquilateralTriangle.js";
-import { Square } from "./shapes/Square.js";
-import { Hexagon } from "./shapes/Hexagon.js";
+import { Ellipse } from "./geometry/Ellipse.js";
+import { RegularPolygon } from "./geometry/RegularPolygon/RegularPolygon.js";
+import { RegularStar } from "./geometry/RegularPolygon/RegularStar.js";
+import { EquilateralTriangle } from "./geometry/RegularPolygon/EquilateralTriangle.js";
+import { Square } from "./geometry/RegularPolygon/Square.js";
+import { Hexagon } from "./geometry/RegularPolygon/Hexagon.js";
 
 /**
  * Method added to the light/sound AmbientLight class to create a custom boundary polygon.

scripts/module.js

@@ -11,9 +11,8 @@ isEmpty
 import { MODULE_ID, TEMPLATES, SHAPE, FLAGS } from "./const.js";
 import { log, getFlag, noFlag, setFlag } from "./util.js";
 import { registerLightMask } from "./patching.js";
-import { registerPIXIPolygonMethods } from "./shapes/PIXIPolygon.js";
-import { registerPIXIRectangleMethods } from "./shapes/PIXIRectangle.js";
-import { registerPIXICircleMethods } from "./shapes/PIXICircle.js";
+
+import { registerGeometry } from "./geometry/registration.js";
 
 import {
   injectAmbientLightConfiguration,
@@ -22,34 +21,20 @@ import {
 
 import { lightMaskPreUpdateAmbientLight } from "./preUpdate.js";
 
-// ----- WeilerAtherton ----- //
-import { WeilerAthertonClipper } from "./WeilerAtherton.js";
-
-// ----- Shapes ----- //
-import { RegularPolygon } from "./shapes/RegularPolygon.js";
-import { EquilateralTriangle } from "./shapes/EquilateralTriangle.js";
-import { Square } from "./shapes/Square.js";
-import { Hexagon } from "./shapes/Hexagon.js";
-import { RegularStar } from "./shapes/RegularStar.js";
-import { Ellipse } from "./shapes/Ellipse.js";
-
 // ----- ClockwiseSweep ----- //
 import { controlledWallIDs, TempWall } from "./customEdges.js";
 
 Hooks.once("init", async function() {
   log("Initializing...");
 
   registerLightMask();
-  registerPIXIPolygonMethods();
-  registerPIXIRectangleMethods();
-  registerPIXICircleMethods();
+
+  registerGeometry();
 
   Handlebars.registerHelper("max2", function(a, b) { return Math.max(a, b); });
 
   game.modules.get(MODULE_ID).api = {
     controlledWallIDs,
-    WeilerAthertonClipper,
-    shapes: { RegularPolygon, EquilateralTriangle, Square, Hexagon, RegularStar, Ellipse },
     TempWall
   };
 });

scripts/patching.js

@@ -53,7 +53,6 @@ export function registerLightMask() {
 
   // ------ TokenConfig ----- //
   libWrapper.register(MODULE_ID, "TokenConfig.prototype.activateListeners", lightMaskActivateListeners, libWrapper.WRAPPER);
-  libWrapper.register(MODULE_ID, "TokenConfig.prototype._updateObject", _updateObjectTokenConfig, libWrapper.WRAPPER);
 
   // ------ DefaultTokenConfig ----- //
   libWrapper.register(MODULE_ID, "DefaultTokenConfig.prototype.activateListeners", lightMaskActivateListeners, libWrapper.WRAPPER);
@@ -121,16 +120,3 @@ function _getPolygonConfigurationSoundSource(wrapper) {
 
   return cfg;
 }
-
-// ----- Token Source ----- //
-/**
- * Wrap TokenConfig.prototype._updateObject
- * If the flags are being updated, force those to be updated in advance so the token shape
- * updates correctly.
- * See https://ptb.discord.com/channels/170995199584108546/811676497965613117/1043909846526865429
- */
-async function _updateObjectTokenConfig(wrapper, event, formData) {
-  const out = await wrapper(event, formData);
-  this.token.object.updateLightSource();
-  return out;
-}