Release 1.0.0

dev7355608 · Aug 7, 2023 · b8b2cfd · b8b2cfd
1 parent 7997475
commit b8b2cfd
Show file tree

Hide file tree

Showing 13 changed files with 196 additions and 175 deletions.
diff --git a/README.md b/README.md
@@ -5,11 +5,30 @@
 
 # Limits (Foundry VTT Module)
 
-Light, sight, and sound restrictions.
+This module allows you to define the maximum range of light, sight, and sound within the scene, drawings, templates, and tiles.
 
-## Installation
+![config](images/config.png)
 
-Manual installation:
-```
-https://github.com/dev7355608/limits/releases/latest/download/module.json
+```js
+token.document.setFlag("limits", {
+  light: {
+    enabled: true,
+    range: 0,
+  },
+  sight: {
+    basicSight: {
+      enabled: true,
+      range: 0,
+    },
+    seeAll: {
+      enabled: true,
+      range: 30,
+    },
+    // ...
+  },
+  sound: {
+    enabled: false,
+    range: null, // Infinity
+  },
+});
 ```
diff --git a/images/config.png b/images/config.png
diff --git a/module.json b/module.json
@@ -1,14 +1,14 @@
 {
   "id": "limits",
   "title": "Limits",
-  "description": "Light, sight, and sound restrictions",
+  "description": "Light, sight, and sound limits.",
   "authors": [
     {
       "name": "dev7355608",
       "email": "[email protected]"
     }
   ],
-  "version": "0.1.0",
+  "version": "1.0.0",
   "compatibility": {
     "minimum": "11",
     "verified": "11"
@@ -17,7 +17,7 @@
     "scripts/index.js"
   ],
   "styles": [
-    "styles/form.css"
+    "styles/config.css"
   ],
   "languages": [
     {
@@ -36,8 +36,8 @@
   },
   "url": "https://github.com/dev7355608/limits",
   "manifest": "https://github.com/dev7355608/limits/releases/latest/download/module.json",
-  "download": "https://github.com/dev7355608/limits/releases/download/v0.1.0/module.zip",
-  "changelog": "https://github.com/dev7355608/limits/releases/tag/v0.1.0",
+  "download": "https://github.com/dev7355608/limits/releases/download/v1.0.0/module.zip",
+  "changelog": "https://github.com/dev7355608/limits/releases/tag/v1.0.0",
   "bugs": "https://github.com/dev7355608/limits/issues",
   "readme": "https://raw.githubusercontent.com/dev7355608/limits/main/README.md",
   "license": "https://raw.githubusercontent.com/dev7355608/limits/main/LICENSE"

diff --git a/scripts/config.mjs b/scripts/config.mjs
@@ -38,7 +38,7 @@ export class LimitsConfig extends DocumentSheet {
            <div class="form-group">
                 <label>${game.i18n.localize("LIMITS.LimitsLabel")}</label>
                 <div class="form-fields">
-                    <button type="button" name="flags.${MODULE_ID}" class="${MODULE_ID}--button">
+                    <button type="button" name="flags.${MODULE_ID}" class="${MODULE_ID}--button" ${sheet.object.id ? "" : "disabled"}>
                         <i class="fas fa-eye"></i>
                         ${game.i18n.localize("LIMITS.ConfigureLimits")}
                     </button>

diff --git a/scripts/data/models.mjs b/scripts/data/models.mjs
@@ -9,6 +9,7 @@ export class FigureData extends foundry.abstract.DataModel {
         schema.y = new foundry.data.fields.NumberField({ required: true, nullable: false, initial: 0 });
         schema.rotation = new foundry.data.fields.AngleField({ required: true });
         schema.shape = new foundry.data.fields.EmbeddedDataField(foundry.data.ShapeData, { required: true });
+        schema.bezierFactor = new foundry.data.fields.AlphaField({ required: false, initial: 0, max: 0.5 });
         schema.texture = new foundry.data.TextureData({ required: true });
         schema.mask = new BitmaskField({ required: true, initial: -1 });
 

diff --git a/scripts/extensions/drawing.mjs b/scripts/extensions/drawing.mjs
@@ -3,22 +3,12 @@ import { Extension } from "../extension.mjs";
 export class DrawingExtension extends Extension {
     /** @override */
     registerHooks() {
-        Hooks.on("canvasReady", () => {
-            for (const object of canvas.drawings.placeables) {
-                if (object.isPreview) {
-                    continue;
-                }
-
-                this.updateVolume(object.document);
-            }
-        });
-
-        Hooks.on("createDrawing", (document) => {
-            if (!document.rendered) {
+        Hooks.on("drawDrawing", (object) => {
+            if (object.isPreview) {
                 return;
             }
 
-            this.updateVolume(document);
+            this.updateVolume(object.document);
         });
 
         Hooks.on("updateDrawing", (document) => {
@@ -29,11 +19,19 @@ export class DrawingExtension extends Extension {
             this.updateVolume(document);
         });
 
-        Hooks.on("deleteDrawing", (document) => {
-            this.updateVolume(document, true);
+        Hooks.on("destroyDrawing", (object) => {
+            if (object.isPreview) {
+                return;
+            }
+
+            this.updateVolume(object.document, true);
         });
 
         Hooks.on("renderDrawingConfig", (sheet) => {
+            if (sheet.options.configureDefault) {
+                return;
+            }
+
             this.injectConfig(sheet, [`.tab[data-tab="position"]`], "beforeend");
         });
     }
@@ -52,8 +50,7 @@ export class DrawingExtension extends Extension {
                         rotation: document.rotation,
                         shape: document.shape,
                         bezierFactor: document.bezierFactor,
-                    }],
-                    bottom: document.elevation * document.parent.dimensions.distancePixels
+                    }]
                 }
             }]
         });

diff --git a/scripts/extensions/template.mjs b/scripts/extensions/template.mjs
@@ -4,22 +4,12 @@ import { Extension } from "../extension.mjs";
 export class TemplateExtension extends Extension {
     /** @override */
     registerHooks() {
-        Hooks.on("canvasReady", () => {
-            for (const object of canvas.templates.placeables) {
-                if (object.isPreview) {
-                    continue;
-                }
-
-                this.updateVolume(object.document);
-            }
-        });
-
-        Hooks.on("createMeasuredTemplate", (document) => {
-            if (!document.rendered) {
+        Hooks.on("drawMeasuredTemplate", (object) => {
+            if (object.isPreview) {
                 return;
             }
 
-            this.updateVolume(document);
+            this.updateVolume(object.document);
         });
 
         Hooks.on("updateMeasuredTemplate", (document) => {
@@ -30,10 +20,6 @@ export class TemplateExtension extends Extension {
             this.updateVolume(document);
         });
 
-        Hooks.on("deleteMeasuredTemplate", (document) => {
-            this.updateVolume(document, true);
-        });
-
         Hooks.on("refreshMeasuredTemplate", (object, flags) => {
             if (object.isPreview || !flags.refreshShape) {
                 return;
@@ -42,6 +28,14 @@ export class TemplateExtension extends Extension {
             this.updateVolume(object.document);
         });
 
+        Hooks.on("destroyMeasuredTemplate", (object) => {
+            if (object.isPreview) {
+                return;
+            }
+
+            this.updateVolume(object.document, true);
+        });
+
         Hooks.on("renderMeasuredTemplateConfig", (sheet) => {
             this.injectConfig(sheet, [`button[type="submit"]`], "beforebegin");
         });
@@ -107,11 +101,7 @@ export class TemplateExtension extends Extension {
             mode: 4,
             boundaries: base ? [{
                 type: "cylinder",
-                data: {
-                    base: [base],
-                    bottom: null,
-                    top: null
-                }
+                data: { base: [base] }
             }] : []
         });
     }

diff --git a/scripts/extensions/tile.mjs b/scripts/extensions/tile.mjs
@@ -3,22 +3,12 @@ import { Extension } from "../extension.mjs";
 export class TileExtension extends Extension {
     /** @override */
     registerHooks() {
-        Hooks.on("canvasReady", () => {
-            for (const object of canvas.tiles.placeables) {
-                if (object.isPreview) {
-                    continue;
-                }
-
-                this.#updateVolume(object.document);
-            }
-        });
-
-        Hooks.on("createTile", (document) => {
-            if (!document.rendered) {
+        Hooks.on("drawTile", (object) => {
+            if (object.isPreview) {
                 return;
             }
 
-            this.#updateVolume(document);
+            this.updateVolume(object.document);
         });
 
         Hooks.on("updateTile", (document) => {
@@ -29,8 +19,12 @@ export class TileExtension extends Extension {
             this.#updateVolume(document);
         });
 
-        Hooks.on("deleteTile", (document) => {
-            this.#updateVolume(document, true);
+        Hooks.on("destroyTile", (object) => {
+            if (object.isPreview) {
+                return;
+            }
+
+            this.updateVolume(object.document, true);
         });
 
         Hooks.on("renderTileConfig", (sheet) => {
@@ -75,8 +69,7 @@ export class TileExtension extends Extension {
                             offsetX: document.texture.offsetX,
                             offsetY: document.texture.offsetY
                         }
-                    }],
-                    bottom: document.elevation * document.parent.dimensions.distancePixels
+                    }]
                 }
             }]
         });

diff --git a/scripts/patches/light.mjs b/scripts/patches/light.mjs
@@ -1,4 +1,5 @@
 import { MODULE_ID } from "../const.mjs";
+import { VolumeCollection } from "../volume.mjs";
 import { Constraint } from "./../constraint.mjs";
 
 Hooks.once("libWrapper.Ready", () => {
@@ -11,4 +12,29 @@ Hooks.once("libWrapper.Ready", () => {
         libWrapper.WRAPPER,
         { perf_mode: libWrapper.PERF_FAST }
     );
+
+    libWrapper.register(
+        MODULE_ID,
+        "GlobalLightSource.prototype._createPolygon",
+        function (wrapped, ...args) {
+            return new GlobalLightSourcePolygon(wrapped(...args).points);
+        },
+        libWrapper.WRAPPER,
+        { perf_mode: libWrapper.PERF_FAST }
+    );
 });
+
+class GlobalLightSourcePolygon extends PIXI.Polygon {
+    contains(x, y) {
+        if (!super.contains(x, y)) {
+            return false;
+        }
+
+        return VolumeCollection.instance.castRay(
+            "light",
+            0,
+            x, y, 1000000,
+            x, y, -1000000
+        ).targetHit;
+    }
+}
diff --git a/scripts/patches/sight.mjs b/scripts/patches/sight.mjs
@@ -34,7 +34,7 @@ Hooks.once("libWrapper.Ready", () => {
             function (wrapped, ...args) {
                 return Constraint.apply(
                     wrapped(...args),
-                    `sight.${this.visionMode.detectionMode?.id ?? DetectionMode.BASIC_MODE_ID}`,
+                    `sight.${this.detectionMode?.id ?? DetectionMode.BASIC_MODE_ID}`,
                     { scalingFactor: 100 }
                 );
             },