From e0339420810e8b477659a541cf5f508e18b7cec1 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 4 May 2018 15:14:18 +0200 Subject: [PATCH] First Version of Bubbles Appearing --- .vs/AAWeb/v15/.suo | Bin 73216 -> 70656 bytes FloatingSpace/Bubble.js | 8 ++++---- FloatingSpace/BubbleSets.js | 5 +++-- FloatingSpace/FloatingLayer.js | 8 ++++---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.vs/AAWeb/v15/.suo b/.vs/AAWeb/v15/.suo index 4db55183e6c7d350c68db01d18edbc8b68a8ee84..b5f3c38d06af954fef0789349ba6df036e8766c8 100644 GIT binary patch delta 2323 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 ULHaxTd6Ga*%SgYhqhE>gPak{182|tP diff --git a/FloatingSpace/Bubble.js b/FloatingSpace/Bubble.js index 86ad215af..e5864592c 100644 --- a/FloatingSpace/Bubble.js +++ b/FloatingSpace/Bubble.js @@ -25,7 +25,7 @@ function newBubble() { browserCanvasContext.beginPath(); browserCanvasContext.moveTo(pFloatingObject.currentPosition.x, pFloatingObject.currentPosition.y); - browserCanvasContext.lineTo(pFloatingObject.payload.bubbles[pFloatingObject.payload.bubbleIndex].position.x, pFloatingObject.payload.bubbles[pFloatingObject.payload.bubbleIndex].position.y); + browserCanvasContext.lineTo(pFloatingObject.payload.bubbles[pFloatingObject.payloadBubbleIndex].position.x, pFloatingObject.payload.bubbles[pFloatingObject.payloadBubbleIndex].position.y); browserCanvasContext.strokeStyle = 'rgba(204, 204, 204, 0.5)'; browserCanvasContext.setLineDash([4, 2]); browserCanvasContext.lineWidth = 1; @@ -41,7 +41,7 @@ function newBubble() { var radius = 1; browserCanvasContext.beginPath(); - browserCanvasContext.arc(pFloatingObject.payload.bubbles[pFloatingObject.payload.bubbleIndex].position.x, pFloatingObject.payload.bubbles[pFloatingObject.payload.bubbleIndex].position.y, radius, 0, Math.PI * 2, true); + browserCanvasContext.arc(pFloatingObject.payload.bubbles[pFloatingObject.payloadBubbleIndex].position.x, pFloatingObject.payload.bubbles[pFloatingObject.payloadBubbleIndex].position.y, radius, 0, Math.PI * 2, true); browserCanvasContext.closePath(); browserCanvasContext.fillStyle = 'rgba(30, 30, 30, 1)'; browserCanvasContext.fill(); @@ -114,7 +114,7 @@ function newBubble() { let label; - label = pFloatingObject.payload.bubbles[pFloatingObject.payload.bubbleIndex].title; + label = pFloatingObject.payload.bubbles[pFloatingObject.payloadBubbleIndex].title; if (label !== undefined) { @@ -129,7 +129,7 @@ function newBubble() { } - label = pFloatingObject.payload.bubbles[pFloatingObject.payload.bubbleIndex].body; + label = pFloatingObject.payload.bubbles[pFloatingObject.payloadBubbleIndex].body; if (label !== undefined) { diff --git a/FloatingSpace/BubbleSets.js b/FloatingSpace/BubbleSets.js index 770f2243a..7c1ae8f82 100644 --- a/FloatingSpace/BubbleSets.js +++ b/FloatingSpace/BubbleSets.js @@ -53,6 +53,7 @@ function newBubbleSets() { function onBubblesChanged(pEvent, pBubbleSetIndex) { let bubbleSet = bubbleSets[pBubbleSetIndex]; + let found = false; /* First we add the new bubbles. */ @@ -85,7 +86,7 @@ function newBubbleSets() { function onInitialized(err) { floatingObject.payload = bubbleSet.payload; - floatingObject.payload.bubbleIndex = i; + floatingObject.payloadBubbleIndex = i; floatingObject.payload.profile.imageId = bubbleSet.imageId; //floatingObject.container = pContainer; @@ -115,6 +116,7 @@ function newBubbleSets() { /* Second we remove the old bubbles. */ newFloatingBubbles = []; // We will create a new array of Floating Bubbles as a result of this operation. + found = false; for (let j = 0; j < bubbleSet.floatingBubbles.length; j++) { @@ -125,7 +127,6 @@ function newBubbleSets() { let plotterBubble = bubbleSet.payload.bubbles[i]; let plotterBubbleKey = plotterBubble.date.toString() + plotterBubble.rate.toString(); - let found = false; if (plotterBubbleKey === floatingBubbleKey) { diff --git a/FloatingSpace/FloatingLayer.js b/FloatingSpace/FloatingLayer.js index d3ca1a75c..9bda0b44a 100644 --- a/FloatingSpace/FloatingLayer.js +++ b/FloatingSpace/FloatingLayer.js @@ -94,8 +94,8 @@ function newFloatingLayer() { } case "Bubble": { - payload.position = floatingObject.payload.bubbles[floatingObject.payload.bubbleIndex].position; - payload.visible = floatingObject.payload.bubbles[floatingObject.payload.bubbleIndex].visible; + payload.position = floatingObject.payload.bubbles[floatingObject.payloadBubbleIndex].position; + payload.visible = floatingObject.payload.bubbles[floatingObject.payloadBubbleIndex].visible; break; } default: { @@ -204,8 +204,8 @@ function newFloatingLayer() { } case "Bubble": { - payload.position = floatingObject.payload.bubbles[floatingObject.payload.bubbleIndex].position; - payload.visible = floatingObject.payload.bubbles[floatingObject.payload.bubbleIndex].visible; + payload.position = floatingObject.payload.bubbles[floatingObject.payloadBubbleIndex].position; + payload.visible = floatingObject.payload.bubbles[floatingObject.payloadBubbleIndex].visible; break; } default: {