fix hex calculations in v12
This commit is contained in:
+5
-4
@@ -137,10 +137,11 @@ function onEntityLeftDragStart(wrapped, event) {
|
||||
const ruler = canvas.controls.ruler;
|
||||
ruler.draggedEntity = this;
|
||||
const entityCenter = getEntityCenter(this);
|
||||
ruler.rulerOffset = {
|
||||
x: entityCenter.x - event.interactionData.origin.x,
|
||||
y: entityCenter.y - event.interactionData.origin.y,
|
||||
};
|
||||
const isV11 = game.release.generation === 11;
|
||||
ruler.rulerOffset = {
|
||||
x: isV11 ? entityCenter.x - event.interactionData.origin.x : 0,
|
||||
y: isV11 ? entityCenter.y - event.interactionData.origin.y : 0,
|
||||
};
|
||||
if (game.settings.get(settingsKey, "autoStartMeasurement")) {
|
||||
let options = {};
|
||||
setSnapParameterOnOptions(ruler, options);
|
||||
|
||||
+3
-2
@@ -157,7 +157,8 @@ export function getAreaFromPositionAndShape(position, shape) {
|
||||
let y = position.y + space.y;
|
||||
if (isCanvasHex()) {
|
||||
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;
|
||||
if (canvas.grid.grid.columnar) {
|
||||
if (space.x % 2 !== 0 && position.x % 2 !== shiftedRow) {
|
||||
@@ -329,4 +330,4 @@ function isCanvasHex() {
|
||||
// isHexagonal is introduced in V12 (undefined in V11)
|
||||
// isHex is deprecated since V12
|
||||
return canvas.grid.isHexagonal ?? canvas.grid.isHex
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user