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

Remove redundant & broken code path in _computeDistance (fixes #280)

Browse Source
This commit is contained in:
Manuel Vögele
2023-06-12 21:39:50 +02:00
parent 844df150a6
commit 8101381cc4
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ruler.js
+16 -22
View File
@@ -262,29 +262,23 @@ export function extendRuler() {
if (!this.isDragRuler) { if (!this.isDragRuler) {
return super._computeDistance(gridSpaces); return super._computeDistance(gridSpaces);
} }
if (!this.dragRulerEnableTerrainRuler) { const shape = this.draggedEntity ? getTokenShape(this.draggedEntity) : null;
if (!this.dragRulerIgnoreGrid) { const options = {
gridSpaces = true; ignoreGrid: this.dragRulerIgnoreGrid,
} gridSpaces,
super._computeDistance(gridSpaces); enableTerrainRuler: this.dragRulerEnableTerrainRuler,
} else { };
const shape = this.draggedEntity ? getTokenShape(this.draggedEntity) : null; const distances = measureDistances(this.segments, this.draggedEntity, shape, options);
const options = { let totalDistance = 0;
ignoreGrid: this.dragRulerIgnoreGrid, for (const [i, d] of distances.entries()) {
gridSpaces, let s = this.segments[i];
enableTerrainRuler: this.dragRulerEnableTerrainRuler, s.startDistance = totalDistance;
}; totalDistance += d;
const distances = measureDistances(this.segments, this.draggedEntity, shape, options); s.last = i === this.segments.length - 1;
let totalDistance = 0; s.distance = d;
for (const [i, d] of distances.entries()) { s.text = this._getSegmentLabel(s, totalDistance);
let s = this.segments[i];
s.startDistance = totalDistance;
totalDistance += d;
s.last = i === this.segments.length - 1;
s.distance = d;
s.text = this._getSegmentLabel(s, totalDistance);
}
} }
for (const [i, segment] of this.segments.entries()) { for (const [i, segment] of this.segments.entries()) {
const unsnappedSegment = this.dragRulerUnsnappedSegments[i]; const unsnappedSegment = this.dragRulerUnsnappedSegments[i];
unsnappedSegment.startDistance = segment.startDistance; unsnappedSegment.startDistance = segment.startDistance;