From 82bc086e924b23a3a2232d13440c462c7f841cc2 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 9 Feb 2020 10:52:48 +0100 Subject: [PATCH] No target lines fixed --- .../FloatingSpace/CircularProgressBar.js | 4 ++-- CanvasApp/FloatingSpace/FloatingLayer.js | 21 ------------------- CanvasApp/FloatingSpace/UiObject.js | 12 ++--------- 3 files changed, 4 insertions(+), 33 deletions(-) diff --git a/CanvasApp/FloatingSpace/CircularProgressBar.js b/CanvasApp/FloatingSpace/CircularProgressBar.js index c07977aef..0e59f3cf5 100644 --- a/CanvasApp/FloatingSpace/CircularProgressBar.js +++ b/CanvasApp/FloatingSpace/CircularProgressBar.js @@ -78,11 +78,11 @@ function newCircularProgressBar () { } } - function drawBackground (pFloatingObject) { + function drawForeground (pFloatingObject) { } - function drawForeground (pFloatingObject) { + function drawBackground (pFloatingObject) { const VISIBLE_RADIUS = thisObject.container.frame.radius * 2 let visiblePosition = { diff --git a/CanvasApp/FloatingSpace/FloatingLayer.js b/CanvasApp/FloatingSpace/FloatingLayer.js index 993581c8b..621404fbb 100644 --- a/CanvasApp/FloatingSpace/FloatingLayer.js +++ b/CanvasApp/FloatingSpace/FloatingLayer.js @@ -288,18 +288,6 @@ function newFloatingLayer () { } switch (floatingObject.type) { - - case 'Profile Ball': { - payload.targetPosition = floatingObject.payload.profile.position - payload.visible = floatingObject.payload.profile.visible - break - } - case 'Note': { - payload.targetPosition = floatingObject.payload.notes[floatingObject.payloadNoteIndex].position - payload.visible = floatingObject.payload.notes[floatingObject.payloadNoteIndex].visible - - break - } case 'UI Object': { payload.targetPosition = floatingObject.payload.targetPosition payload.visible = floatingObject.payload.visible @@ -559,15 +547,6 @@ function newFloatingLayer () { } switch (floatingObject2.type) { - - case 'Profile Ball': { - payload.targetPosition = floatingObject2.payload.profile.position - break - } - case 'Note': { - payload.targetPosition = floatingObject2.payload.notes[floatingObject2.payloadNoteIndex].position - break - } case 'UI Object': { payload.targetPosition = floatingObject2.payload.targetPosition break diff --git a/CanvasApp/FloatingSpace/UiObject.js b/CanvasApp/FloatingSpace/UiObject.js index daa0022bf..77996ee22 100644 --- a/CanvasApp/FloatingSpace/UiObject.js +++ b/CanvasApp/FloatingSpace/UiObject.js @@ -868,8 +868,8 @@ function newUiObject () { if (thisObject.payload.chainParent === undefined) { return } let targetPoint = { - x: thisObject.payload.targetPosition.x, - y: thisObject.payload.targetPosition.y + x: thisObject.payload.chainParent.payload.floatingObject.container.frame.position.x, + y: thisObject.payload.chainParent.payload.floatingObject.container.frame.position.y } let position = { @@ -881,8 +881,6 @@ function newUiObject () { position = thisObject.container.frame.frameThisPoint(position) if (thisObject.container.frame.radius > 1) { - /* Target Line */ - let LINE_STYLE = UI_COLOR.TITANIUM_YELLOW if (thisObject.payload.floatingObject.angleToParent !== ANGLE_TO_PARENT.NOT_FIXED) { LINE_STYLE = UI_COLOR.GOLDEN_ORANGE @@ -911,8 +909,6 @@ function newUiObject () { } if (thisObject.container.frame.radius > 0.5) { - /* Target Spot */ - let radius = 1 browserCanvasContext.beginPath() @@ -945,8 +941,6 @@ function newUiObject () { let LINE_STYLE = UI_COLOR.GREY if (thisObject.container.frame.radius > 1) { - /* Target Line */ - browserCanvasContext.beginPath() browserCanvasContext.moveTo(position.x, position.y) browserCanvasContext.lineTo(targetPoint.x, targetPoint.y) @@ -967,8 +961,6 @@ function newUiObject () { } if (thisObject.container.frame.radius > 0.5) { - /* Target Spot */ - let radius = 1 browserCanvasContext.beginPath()