crovaxon/foundryvtt-drag-ruler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix references to the Ruler class

Browse Source
This commit is contained in:
Manuel Vögele
2022-09-30 14:08:38 +02:00
parent 2e2353e1d1
commit 08c39b5683
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/api.js
+4 -4
View File
@@ -145,11 +145,11 @@ export function getColorForDistanceAndToken(distance, token, ranges = null) {
export function getMovedDistanceFromToken(token) { export function getMovedDistanceFromToken(token) {
const terrainRulerAvailable = game.modules.get("terrain-ruler")?.active; const terrainRulerAvailable = game.modules.get("terrain-ruler")?.active;
const history = getMovementHistory(token); const history = getMovementHistory(token);
const segments = Ruler.dragRulerGetRaysFromWaypoints(history, {x: token.x, y: token.y}).map( const segments = CONFIG.Canvas.rulerClass
ray => { .dragRulerGetRaysFromWaypoints(history, {x: token.x, y: token.y})
.map(ray => {
return {ray}; return {ray};
}, });
);
const shape = getTokenShape(token); const shape = getTokenShape(token);
const distances = measureDistances(segments, token, shape, { const distances = measureDistances(segments, token, shape, {
enableTerrainRuler: terrainRulerAvailable, enableTerrainRuler: terrainRulerAvailable,
js/main.js
+9 -7
View File
@@ -243,9 +243,11 @@ function applyGridlessSnapping(event) {
const terrainRulerAvailable = game.modules.get("terrain-ruler")?.active; const terrainRulerAvailable = game.modules.get("terrain-ruler")?.active;
if (terrainRulerAvailable) { if (terrainRulerAvailable) {
const segments = Ruler.dragRulerGetRaysFromWaypoints(ruler.waypoints, destination).map(ray => { const segments = ruler.constructor
return {ray}; .dragRulerGetRaysFromWaypoints(ruler.waypoints, destination)
}); .map(ray => {
return {ray};
});
const pinpointDistances = new Map(); const pinpointDistances = new Map();
for (const range of ranges) { for (const range of ranges) {
pinpointDistances.set(range.range, null); pinpointDistances.set(range.range, null);
@@ -268,11 +270,11 @@ function applyGridlessSnapping(event) {
let waypointDistance = 0; let waypointDistance = 0;
let origin = event.data.origin; let origin = event.data.origin;
if (ruler.waypoints.length > 1) { if (ruler.waypoints.length > 1) {
const segments = Ruler.dragRulerGetRaysFromWaypoints(ruler.waypoints, destination).map( const segments = ruler.constructor
ray => { .dragRulerGetRaysFromWaypoints(ruler.waypoints, destination)
.map(ray => {
return {ray}; return {ray};
}, });
);
origin = segments.pop().ray.A; origin = segments.pop().ray.A;
waypointDistance = canvas.grid.measureDistances(segments).reduce((a, b) => a + b); waypointDistance = canvas.grid.measureDistances(segments).reduce((a, b) => a + b);
origin = {x: origin.x - ruler.rulerOffset.x, y: origin.y - ruler.rulerOffset.y}; origin = {x: origin.x - ruler.rulerOffset.x, y: origin.y - ruler.rulerOffset.y};