diff --git a/.vs/AAWebPlatform/v15/.suo b/.vs/AAWebPlatform/v15/.suo index e31f36432..a4cbb8bd0 100644 Binary files a/.vs/AAWebPlatform/v15/.suo and b/.vs/AAWebPlatform/v15/.suo differ diff --git a/Animation.js b/Animation.js index 073bde721..de5aa8683 100644 --- a/Animation.js +++ b/Animation.js @@ -66,19 +66,16 @@ function newAnimation() { }); - /* We also draw this array of circles, that is used for debugging purposes. */ - - drawSmallBall(); - - /* We request the next frame to be drawn, and stablishing a loop */ - - animationLoopHandle = window.requestAnimationFrame(animationLoop); /* We animate the zoom of the viewPort */ viewPort.animate(); viewPort.draw(); + /* We request the next frame to be drawn, and stablishing a loop */ + + animationLoopHandle = window.requestAnimationFrame(animationLoop); + } } diff --git a/ProductCard.js b/ProductCard.js index daf9d49cb..3e35d49fb 100644 --- a/ProductCard.js +++ b/ProductCard.js @@ -284,9 +284,46 @@ function drawProductCard() { + /* + + Put image on the card. + + */ + + let teamImagePoint = { + x: 10, + y: 5 + }; + + teamImagePoint = thisObject.container.frame.frameThisPoint(teamImagePoint); + + let teamImage = document.getElementById("AAMasters"); + browserCanvasContext.drawImage(teamImage, teamImagePoint.x, teamImagePoint.y, 45, 45); + centerPoint = { - x: 7, - y: 7 + x: thisObject.container.frame.width - 10, + y: thisObject.container.frame.height / 2 + }; + + if (thisObject.bot.codeName === "AAOlivia") { + + let botImagePoint = { + x: thisObject.container.frame.width - 10 - 50, + y: 5 + }; + + botImagePoint = thisObject.container.frame.frameThisPoint(botImagePoint); + + let botImage = document.getElementById("AAOlivia"); + browserCanvasContext.drawImage(botImage, botImagePoint.x, botImagePoint.y, 45, 45); + + } + + /* Now the small circle */ + + centerPoint = { + x: thisObject.container.frame.width - 10, + y: thisObject.container.frame.height / 2 }; /* Now the transformations. */ @@ -336,18 +373,12 @@ let label; - let xOffset; - let yOffset; - /* devTeam */ label = "Dev Team: " + thisObject.devTeam.displayName; - xOffset = 0; - yOffset = 0; - labelPoint = { - x: 20, + x: 65, y: thisObject.container.frame.height - 45 }; @@ -361,7 +392,7 @@ label = "Bot: " + thisObject.bot.displayName; labelPoint = { - x: 20, + x: 65, y: thisObject.container.frame.height - 30 }; @@ -375,7 +406,7 @@ label = "Product: " + thisObject.product.displayName; labelPoint = { - x: 20, + x: 65, y: thisObject.container.frame.height - 15 }; diff --git a/index.html b/index.html index 592596d95..4f5434e25 100644 --- a/index.html +++ b/index.html @@ -74,8 +74,9 @@ } - - -> + + + + \ No newline at end of file