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

fix hex calculations in v12

Browse Source
This commit is contained in:
n0q
2024-07-27 10:22:35 -07:00
committed by Manuel Vögele
parent 0808f17ee3
commit 0e2ab35db7
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.js
+5 -4
View File
@@ -137,10 +137,11 @@ function onEntityLeftDragStart(wrapped, event) {
const ruler = canvas.controls.ruler; const ruler = canvas.controls.ruler;
ruler.draggedEntity = this; ruler.draggedEntity = this;
const entityCenter = getEntityCenter(this); const entityCenter = getEntityCenter(this);
ruler.rulerOffset = { const isV11 = game.release.generation === 11;
x: entityCenter.x - event.interactionData.origin.x, ruler.rulerOffset = {
y: entityCenter.y - event.interactionData.origin.y, x: isV11 ? entityCenter.x - event.interactionData.origin.x : 0,
}; y: isV11 ? entityCenter.y - event.interactionData.origin.y : 0,
};
if (game.settings.get(settingsKey, "autoStartMeasurement")) { if (game.settings.get(settingsKey, "autoStartMeasurement")) {
let options = {}; let options = {};
setSnapParameterOnOptions(ruler, options); setSnapParameterOnOptions(ruler, options);
src/util.js
+2 -1
View File
@@ -157,7 +157,8 @@ export function getAreaFromPositionAndShape(position, shape) {
let y = position.y + space.y; let y = position.y + space.y;
if (isCanvasHex()) { if (isCanvasHex()) {
let shiftedRow; let shiftedRow;
if (canvas.grid.grid.options.even) shiftedRow = 1; // v12 ?? v11
if (canvas.grid?.even ?? canvas.grid.grid.options.even) shiftedRow = 1;
else shiftedRow = 0; else shiftedRow = 0;
if (canvas.grid.grid.columnar) { if (canvas.grid.grid.columnar) {
if (space.x % 2 !== 0 && position.x % 2 !== shiftedRow) { if (space.x % 2 !== 0 && position.x % 2 !== shiftedRow) {