From 08c39b56835289b97ad5f60626b45680d1a59246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Fri, 30 Sep 2022 14:08:38 +0200 Subject: [PATCH] Fix references to the Ruler class --- js/api.js | 8 ++++---- js/main.js | 16 +++++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/js/api.js b/js/api.js index 84d8e65..dd20a82 100644 --- a/js/api.js +++ b/js/api.js @@ -145,11 +145,11 @@ export function getColorForDistanceAndToken(distance, token, ranges = null) { export function getMovedDistanceFromToken(token) { const terrainRulerAvailable = game.modules.get("terrain-ruler")?.active; const history = getMovementHistory(token); - const segments = Ruler.dragRulerGetRaysFromWaypoints(history, {x: token.x, y: token.y}).map( - ray => { + const segments = CONFIG.Canvas.rulerClass + .dragRulerGetRaysFromWaypoints(history, {x: token.x, y: token.y}) + .map(ray => { return {ray}; - }, - ); + }); const shape = getTokenShape(token); const distances = measureDistances(segments, token, shape, { enableTerrainRuler: terrainRulerAvailable, diff --git a/js/main.js b/js/main.js index 7135732..d3c462d 100644 --- a/js/main.js +++ b/js/main.js @@ -243,9 +243,11 @@ function applyGridlessSnapping(event) { const terrainRulerAvailable = game.modules.get("terrain-ruler")?.active; if (terrainRulerAvailable) { - const segments = Ruler.dragRulerGetRaysFromWaypoints(ruler.waypoints, destination).map(ray => { - return {ray}; - }); + const segments = ruler.constructor + .dragRulerGetRaysFromWaypoints(ruler.waypoints, destination) + .map(ray => { + return {ray}; + }); const pinpointDistances = new Map(); for (const range of ranges) { pinpointDistances.set(range.range, null); @@ -268,11 +270,11 @@ function applyGridlessSnapping(event) { let waypointDistance = 0; let origin = event.data.origin; if (ruler.waypoints.length > 1) { - const segments = Ruler.dragRulerGetRaysFromWaypoints(ruler.waypoints, destination).map( - ray => { + const segments = ruler.constructor + .dragRulerGetRaysFromWaypoints(ruler.waypoints, destination) + .map(ray => { return {ray}; - }, - ); + }); origin = segments.pop().ray.A; waypointDistance = canvas.grid.measureDistances(segments).reduce((a, b) => a + b); origin = {x: origin.x - ruler.rulerOffset.x, y: origin.y - ruler.rulerOffset.y};