From 3d25f6c35b40816a3a738cfca8485fb8a0349f7e Mon Sep 17 00:00:00 2001 From: Gavin McDonald Date: Sun, 7 Oct 2018 11:17:48 -0400 Subject: [PATCH] update scale calculation for squares with center-to-corner scaling --- src/cartographerFlatXY.js | 4 ++-- src/cartographerPointyXY.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cartographerFlatXY.js b/src/cartographerFlatXY.js index ad522c0..13b194e 100644 --- a/src/cartographerFlatXY.js +++ b/src/cartographerFlatXY.js @@ -64,11 +64,11 @@ export default class CartographerFlatXY extends Cartographer { } calculateHorizontalScale(pixels, tiles) { - return pixels / tiles / 2; + return pixels / tiles / invSqrt2 / 2; } calculateVerticalScale(pixels, tiles) { - return pixels / tiles / 2; + return pixels / tiles / invSqrt2 / 2; } tileToPixel(square) { diff --git a/src/cartographerPointyXY.js b/src/cartographerPointyXY.js index 6ccf2ad..a5e1140 100644 --- a/src/cartographerPointyXY.js +++ b/src/cartographerPointyXY.js @@ -64,11 +64,11 @@ export default class CartographerPointyXY extends Cartographer { } calculateHorizontalScale(pixels, tiles) { - return pixels / sqrt2 / (tiles + 1); + return pixels / (tiles / 2) / 2; } calculateVerticalScale(pixels, tiles) { - return pixels / sqrt2 / (tiles + 1); + return pixels / (tiles / 2) / 2; } tileToPixel(square) {