From c1b36b5e1ecbd5c20bf0829c5000e9c604c3740c Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 15 Mar 2020 11:32:55 +0100 Subject: [PATCH] image and radius resizing working --- FloatingSpace/UiObject.js | 6 +++++- Spaces/FloatingSpace.js | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js index 7b0cab182..94437d6f7 100644 --- a/FloatingSpace/UiObject.js +++ b/FloatingSpace/UiObject.js @@ -1295,6 +1295,8 @@ function newUiObject () { if (canvas.floatingSpace.inMapMode === true) { visiblePosition = canvas.floatingSpace.transformPointToMap(visiblePosition) + radius = canvas.floatingSpace.transformRadiusToMap(radius) + VISIBLE_RADIUS = canvas.floatingSpace.transformRadiusToMap(VISIBLE_RADIUS) } else { visiblePosition = thisObject.fitFunction(visiblePosition) } @@ -1488,7 +1490,9 @@ function newUiObject () { let additionalImageSize = 0 if (thisObject.isExecuting === true || isReadyToReferenceAttach === true || isReadyToChainAttach === true) { additionalImageSize = 20 } let totalImageSize = additionalImageSize + thisObject.payload.floatingObject.currentImageSize - + if (canvas.floatingSpace.inMapMode === true) { + totalImageSize = canvas.floatingSpace.transformImagesizeToMap(totalImageSize) + } browserCanvasContext.drawImage( icon, position.x - totalImageSize / 2, position.y - totalImageSize / 2, diff --git a/Spaces/FloatingSpace.js b/Spaces/FloatingSpace.js index 998d308ad..aaefa22a7 100644 --- a/Spaces/FloatingSpace.js +++ b/Spaces/FloatingSpace.js @@ -13,6 +13,8 @@ function newFloatingSpace () { container: undefined, inMapMode: false, transformPointToMap: transformPointToMap, + transformRadiusToMap: transformRadiusToMap, + transformImagesizeToMap: transformImagesizeToMap, oneScreenUp: oneScreenUp, oneScreenDown: oneScreenDown, oneScreenLeft: oneScreenLeft, @@ -92,10 +94,15 @@ function newFloatingSpace () { } function transformRadiusToMap (radius) { - const RADIUS_REDUCTION_FACTOR = 1 + const RADIUS_REDUCTION_FACTOR = 2 return radius / RADIUS_REDUCTION_FACTOR } + function transformImagesizeToMap (imageSize) { + const IMAGE_REDUCTION_FACTOR = 5 + return imageSize / IMAGE_REDUCTION_FACTOR + } + function onDoubleClick () { doubleClickCounter = 0