Compare commits

...

11 Commits

Author SHA1 Message Date
Manuel Vögele c1b0e9d7fb Release v1.12.8 2022-04-12 00:13:34 +02:00
Manuel Vögele 9d227efcd1 Enusre that measurements to determine the highlight color are always done center to center (fixes #189) 2022-04-12 00:11:30 +02:00
Manuel Vögele a3d942c287 Apply wall height's bounds to the rays before doing colission checks (fixes #190) 2022-04-12 00:11:30 +02:00
Manuel Vögele 3afb1f30b7 Release v1.12.7 2022-04-01 18:06:46 +02:00
Manuel Vögele 654f8e3111 Fix a typo that caused measurement template snapping to be broken (fixes #185) 2022-04-01 18:04:25 +02:00
Manuel Vögele 5f6e348bf0 Release v1.12.6 2022-03-08 23:12:17 +01:00
Manuel Vögele 82f2a885fb getSnappedPosition cannot be used on gridless to calculate the snap point for measured templates 2022-03-08 23:09:06 +01:00
Manuel Vögele 5add0be393 Release v1.12.5 2022-03-08 22:06:14 +01:00
Manuel Vögele f77990420a Replace getSnapPointForMeasuredTemplate with foundry native function (fixes #181) 2022-03-08 20:17:25 +01:00
Manuel Vögele e84632c0d7 Release v1.12.4 2022-03-08 12:49:56 +01:00
Manuel Vögele 30bd3d33e0 If no dragged entity is being transmitted, unset it (fixes #179) 2022-03-08 12:48:17 +01:00
7 changed files with 43 additions and 23 deletions
+28
View File
@@ -1,3 +1,31 @@
## 1.12.8
### Bugfixes
- Fixed a bug that could cause grid cells to be highlighted in the wrong color
### Compatibility
- Fixed an interaction with the Wall Height module that could allow players to walk through walls
## 1.12.7
### Bugfixes
- Fixed a bug that caused measurement templates to only snap to the corners of the grid (this was a regression introduced in 1.12.5)
## 1.12.6
### Bugfixes
- Measured templates no longer snap to a virtual grid on gridless scenes (this was a regression introduced in 1.12.5)
## 1.12.5
### Compatibility
- Drag Ruler is now compatible with DF Template Enhancements
## 1.12.4
### Bugfixes
- Fixed a bug that could cause Drag Ruler to override the default ruler color on other player's clients
## 1.12.3 ## 1.12.3
### Bugfixes ### Bugfixes
- Fixed a bug that could cause foundry to freeze indefinitely when trying to pathfind to an unreachalbe location (thanks to JDCalvert) - Fixed a bug that could cause foundry to freeze indefinitely when trying to pathfind to an unreachalbe location (thanks to JDCalvert)
+7 -2
View File
@@ -28,6 +28,9 @@ export async function moveEntities(draggedEntity, selectedEntities) {
const hasCollision = selectedEntities.some(token => { const hasCollision = selectedEntities.some(token => {
const offset = calculateEntityOffset(token, draggedEntity); const offset = calculateEntityOffset(token, draggedEntity);
const offsetRays = rays.filter(ray => !ray.isPrevious).map(ray => applyOffsetToRay(ray, offset)) const offsetRays = rays.filter(ray => !ray.isPrevious).map(ray => applyOffsetToRay(ray, offset))
if (window.WallHeight) {
window.WallHeight.addBoundsToRays(offsetRays, draggedEntity);
}
return offsetRays.some(r => canvas.walls.checkCollision(r)); return offsetRays.some(r => canvas.walls.checkCollision(r));
}) })
if (hasCollision) { if (hasCollision) {
@@ -341,7 +344,8 @@ export function highlightMeasurementNative(ray, previousSegments, tokenShape=[{x
if ( x0 === x1 && y0 === y1 ) continue; if ( x0 === x1 && y0 === y1 ) continue;
// Highlight the grid position // Highlight the grid position
let [xg, yg] = canvas.grid.grid.getPixelsFromGridPosition(x1, y1); let [xgtl, ygtl] = canvas.grid.grid.getPixelsFromGridPosition(x1, y1);
let [xg, yg] = canvas.grid.grid.getCenter(xgtl, ygtl);
const pathUntilSpace = previousSegments.concat([{ray: new Ray(ray.A, {x: xg, y: yg})}]); const pathUntilSpace = previousSegments.concat([{ray: new Ray(ray.A, {x: xg, y: yg})}]);
const distance = sum(canvas.grid.measureDistances(pathUntilSpace, {gridSpaces: true})); const distance = sum(canvas.grid.measureDistances(pathUntilSpace, {gridSpaces: true}));
const color = this.dragRulerGetColorForDistance(distance); const color = this.dragRulerGetColorForDistance(distance);
@@ -355,7 +359,8 @@ export function highlightMeasurementNative(ray, previousSegments, tokenShape=[{x
let th = tMax[i - 1] - (0.5 / nMax); let th = tMax[i - 1] - (0.5 / nMax);
let {x, y} = ray.project(th); let {x, y} = ray.project(th);
let [x1h, y1h] = canvas.grid.grid.getGridPositionFromPixels(x, y); let [x1h, y1h] = canvas.grid.grid.getGridPositionFromPixels(x, y);
let [xgh, ygh] = canvas.grid.grid.getPixelsFromGridPosition(x1h, y1h); let [xghtl, yghtl] = canvas.grid.grid.getPixelsFromGridPosition(x1h, y1h);
let [xgh, ygh] = canvas.grid.grid.getCenter(xghtl, yghtl);
const pathUntilSpace = previousSegments.concat([{ray: new Ray(ray.A, {x: xgh, y: ygh})}]); const pathUntilSpace = previousSegments.concat([{ray: new Ray(ray.A, {x: xgh, y: ygh})}]);
const distance = sum(canvas.grid.measureDistances(pathUntilSpace, {gridSpaces: true})); const distance = sum(canvas.grid.measureDistances(pathUntilSpace, {gridSpaces: true}));
const color = this.dragRulerGetColorForDistance(distance); const color = this.dragRulerGetColorForDistance(distance);
+3
View File
@@ -54,6 +54,9 @@ export function extendRuler() {
else else
this.draggedEntity = canvas.templates.get(data.draggedEntity); this.draggedEntity = canvas.templates.get(data.draggedEntity);
} }
else {
this.draggedEntity = undefined;
}
super.update(data); super.update(data);
} }
+1 -17
View File
@@ -94,23 +94,7 @@ export function getSnapPointForMeasuredTemplate(x, y) {
if (canvas.grid.type === CONST.GRID_TYPES.GRIDLESS) { if (canvas.grid.type === CONST.GRID_TYPES.GRIDLESS) {
return new PIXI.Point(x, y); return new PIXI.Point(x, y);
} }
let subgridWidth, subgridHeight; return canvas.grid.grid.getSnappedPosition(x, y, canvas.templates.gridPrecision);
if (canvas.grid.type === CONST.GRID_TYPES.SQUARE) {
subgridWidth = subgridHeight = canvas.dimensions.size / 2;
}
else {
if (canvas.grid.grid.columns) {
subgridWidth = canvas.grid.w / 4;
subgridHeight = canvas.grid.h / 2;
}
else {
subgridWidth = canvas.grid.w / 2;
subgridHeight = canvas.grid.h / 4;
}
}
const snappedX = Math.round(x / subgridWidth) * subgridWidth;
const snappedY = Math.round(y / subgridHeight) * subgridHeight;
return new PIXI.Point(snappedX, snappedY);
} }
export function getSnapPointForEntity(x, y, entity) { export function getSnapPointForEntity(x, y, entity) {
+2 -2
View File
@@ -2,7 +2,7 @@
"name": "drag-ruler", "name": "drag-ruler",
"title": "Drag Ruler", "title": "Drag Ruler",
"description": "When dragging a token displays a ruler showing how far you've moved that token.", "description": "When dragging a token displays a ruler showing how far you've moved that token.",
"version": "1.12.3", "version": "1.12.8",
"minimumCoreVersion" : "9.245", "minimumCoreVersion" : "9.245",
"compatibleCoreVersion" : "9", "compatibleCoreVersion" : "9",
"authors": [ "authors": [
@@ -65,7 +65,7 @@
], ],
"socket": true, "socket": true,
"url": "https://github.com/manuelVo/foundryvtt-drag-ruler", "url": "https://github.com/manuelVo/foundryvtt-drag-ruler",
"download": "https://github.com/manuelVo/foundryvtt-drag-ruler/releases/download/v1.12.3/drag-ruler-1.12.3.zip", "download": "https://github.com/manuelVo/foundryvtt-drag-ruler/releases/download/v1.12.8/drag-ruler-1.12.8.zip",
"manifest": "https://raw.githubusercontent.com/manuelVo/foundryvtt-drag-ruler/master/module.json", "manifest": "https://raw.githubusercontent.com/manuelVo/foundryvtt-drag-ruler/master/module.json",
"readme": "https://github.com/manuelVo/foundryvtt-drag-ruler/blob/master/README.md", "readme": "https://github.com/manuelVo/foundryvtt-drag-ruler/blob/master/README.md",
"changelog": "https://github.com/manuelVo/foundryvtt-drag-ruler/blob/master/CHANGELOG.md", "changelog": "https://github.com/manuelVo/foundryvtt-drag-ruler/blob/master/CHANGELOG.md",
+1 -1
View File
@@ -26,7 +26,7 @@ dependencies = [
[[package]] [[package]]
name = "gridless-pathfinding" name = "gridless-pathfinding"
version = "1.12.3" version = "1.12.8"
dependencies = [ dependencies = [
"console_error_panic_hook", "console_error_panic_hook",
"js-sys", "js-sys",
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "gridless-pathfinding" name = "gridless-pathfinding"
version = "1.12.3" version = "1.12.8"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html