First Version of Bubbles Appearing
This commit is contained in:
1 parent
22e193a045
commit
e033942081
4 files changed
+11
-10
No files matched your search
Binary file not shown.
@@ -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) {
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
|
||||
@@ -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: {
|
||||
|
||||
Reference in new issue
Block a user