From 28ca5287099caa32cc97d0095c57af224f7cf5b8 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 5 Feb 2020 11:43:23 +0100 Subject: [PATCH] better names --- FloatingSpace/FloatingObject.js | 32 ++++++++++++++++---------------- Globals.js | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/FloatingSpace/FloatingObject.js b/FloatingSpace/FloatingObject.js index 1ab90778f..9f711f886 100644 --- a/FloatingSpace/FloatingObject.js +++ b/FloatingSpace/FloatingObject.js @@ -23,7 +23,7 @@ function newFloatingObject () { isPinned: false, isFrozen: false, angleToParent: ANGLE_TO_PARENT.RANGE_90, - distanceToParent: DISTANCE_TO_PARENT.SAME, + distanceToParent: DISTANCE_TO_PARENT.PARENT_100X, isCollapsed: false, isParentCollapsed: false, frozenManually: false, @@ -196,21 +196,21 @@ function newFloatingObject () { function distanceToParentToggle () { switch (thisObject.distanceToParent) { case DISTANCE_TO_PARENT.NOT_FIXED: - thisObject.distanceToParent = DISTANCE_TO_PARENT.QUARTER + thisObject.distanceToParent = DISTANCE_TO_PARENT.PARENT_025X break - case DISTANCE_TO_PARENT.QUARTER: - thisObject.distanceToParent = DISTANCE_TO_PARENT.HALF + case DISTANCE_TO_PARENT.PARENT_025X: + thisObject.distanceToParent = DISTANCE_TO_PARENT.PARENT_050X break - case DISTANCE_TO_PARENT.HALF: - thisObject.distanceToParent = DISTANCE_TO_PARENT.SAME + case DISTANCE_TO_PARENT.PARENT_050X: + thisObject.distanceToParent = DISTANCE_TO_PARENT.PARENT_100X break - case DISTANCE_TO_PARENT.SAME: - thisObject.distanceToParent = DISTANCE_TO_PARENT.SAME_HALF + case DISTANCE_TO_PARENT.PARENT_100X: + thisObject.distanceToParent = DISTANCE_TO_PARENT.PARENT_150X break - case DISTANCE_TO_PARENT.SAME_HALF: - thisObject.distanceToParent = DISTANCE_TO_PARENT.DOUBLE + case DISTANCE_TO_PARENT.PARENT_150X: + thisObject.distanceToParent = DISTANCE_TO_PARENT.PARENT_200X break - case DISTANCE_TO_PARENT.DOUBLE: + case DISTANCE_TO_PARENT.PARENT_200X: thisObject.distanceToParent = DISTANCE_TO_PARENT.NOT_FIXED break } @@ -268,19 +268,19 @@ function newFloatingObject () { if (parent.payload.distance !== undefined) { switch (thisObject.distanceToParent) { - case DISTANCE_TO_PARENT.QUARTER: + case DISTANCE_TO_PARENT.PARENT_025X: distanceToParent = parent.payload.distance / 4 break - case DISTANCE_TO_PARENT.HALF: + case DISTANCE_TO_PARENT.PARENT_050X: distanceToParent = parent.payload.distance / 2 break - case DISTANCE_TO_PARENT.SAME: + case DISTANCE_TO_PARENT.PARENT_100X: distanceToParent = parent.payload.distance break - case DISTANCE_TO_PARENT.SAME_HALF: + case DISTANCE_TO_PARENT.PARENT_150X: distanceToParent = parent.payload.distance * 1.5 break - case DISTANCE_TO_PARENT.DOUBLE: + case DISTANCE_TO_PARENT.PARENT_200X: distanceToParent = parent.payload.distance * 2 break } diff --git a/Globals.js b/Globals.js index cdae47db0..22a3d5d2d 100644 --- a/Globals.js +++ b/Globals.js @@ -61,11 +61,11 @@ const ANGLE_TO_PARENT = { const DISTANCE_TO_PARENT = { NOT_FIXED: 0, - QUARTER: 1, - HALF: 2, - SAME: 3, - SAME_HALF: 4, - DOUBLE: 5 + PARENT_025X: 1, + PARENT_050X: 2, + PARENT_100X: 3, + PARENT_150X: 4, + PARENT_200X: 5 } /* User Interface Panels */