From bf3919d3b1b130f9d4f8b64c5f42be75bb62715e Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 22 May 2019 10:21:35 +0200 Subject: [PATCH] detaching physics corrected --- FloatingSpace/StrategyPart.js | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js index 140686c63..576da26ba 100644 --- a/FloatingSpace/StrategyPart.js +++ b/FloatingSpace/StrategyPart.js @@ -48,7 +48,6 @@ function newStrategyPart () { let highlightCounter = 0 let previousDistance - let detachFuse = 100 return thisObject function finalize () { @@ -142,25 +141,21 @@ function newStrategyPart () { } function detachingPhysics () { - let THRESHOLD - if (thisObject.payload.floatingObject.isPinned === true) { - THRESHOLD = 1.10 - } else { - THRESHOLD = 2.00 - } + if (thisObject.isOnFocus !== true) { return } - detachFuse-- - if (detachFuse < 0) { - detachFuse = 0 - if (thisObject.payload.chainParent !== undefined) { - let distanceToChainParent = Math.sqrt(Math.pow(thisObject.payload.position.x - thisObject.payload.targetPosition.x, 2) + Math.pow(thisObject.payload.position.y - thisObject.payload.targetPosition.y, 2)) - if (previousDistance !== undefined) { - if (distanceToChainParent / previousDistance > 1.25) { - canvas.strategySpace.workspace.detachNode(thisObject.payload.node) + let THRESHOLD = 1.15 + if (thisObject.payload.chainParent !== undefined) { + let distanceToChainParent = Math.sqrt(Math.pow(thisObject.payload.position.x - thisObject.payload.targetPosition.x, 2) + Math.pow(thisObject.payload.position.y - thisObject.payload.targetPosition.y, 2)) + if (previousDistance !== undefined) { + if (distanceToChainParent / previousDistance > THRESHOLD) { + canvas.strategySpace.workspace.detachNode(thisObject.payload.node) + } else { + if (distanceToChainParent / previousDistance > 1) { + console.log(distanceToChainParent / previousDistance) } } - previousDistance = distanceToChainParent } + previousDistance = distanceToChainParent } }