pxt-common-packages 9.4.4 → 9.4.8

package/libs/game/spritesay.ts

@@ -17,6 +17,206 @@ namespace sprites {
     }
 
     export class SpriteSayRenderer extends BaseSpriteSayRenderer {
+        static drawSayFrame(textLeft: number, textTop: number, textWidth: number, textHeight: number, speakerX: number, speakerY: number, color: number, canvas: Image) {
+            if (textLeft + textWidth < 0 || textTop + textHeight < 0 || textLeft > canvas.width || textTop > canvas.height) return;
+
+            if (textHeight) {
+                // Draw main rectangle
+                canvas.fillRect(
+                    textLeft,
+                    textTop,
+                    textWidth,
+                    textHeight,
+                    color
+                );
+
+                // Draw lines around the rectangle to give it a bubble shape
+                canvas.fillRect(
+                    textLeft - 1,
+                    textTop + 1,
+                    1,
+                    textHeight - 2,
+                    color
+                );
+                canvas.fillRect(
+                    textLeft + textWidth,
+                    textTop + 1,
+                    1,
+                    textHeight - 2,
+                    color
+                );
+                canvas.fillRect(
+                    textLeft + 1,
+                    textTop - 1,
+                    textWidth - 2,
+                    1,
+                    color
+                );
+                canvas.fillRect(
+                    textLeft + 1,
+                    textTop + textHeight,
+                    textWidth - 2,
+                    1,
+                    color
+                );
+
+                // If the speaker location is within the bubble, don't draw an arrow
+                if (speakerX > textLeft && speakerX < textLeft + textWidth && speakerY > textTop && speakerY < textTop + textHeight) return;
+
+                const xDiff = Math.max(
+                    Math.abs(speakerX - textLeft),
+                    Math.abs(speakerX - (textLeft + textWidth))
+                );
+
+                const yDiff = Math.max(
+                    Math.abs(speakerY - textHeight),
+                    Math.abs(speakerY - (textHeight + textHeight))
+                );
+
+                // Draw the arrow
+                if (xDiff > yDiff) {
+                    if (speakerX > textLeft + textWidth) {
+                        const anchorY = Math.max(Math.min(speakerY, textTop + textHeight - 4), textTop + 5);
+                        canvas.fillRect(
+                            textLeft + textWidth + 1,
+                            anchorY - 2,
+                            1,
+                            3,
+                            color
+                        );
+                        canvas.fillRect(
+                            textLeft + textWidth + 2,
+                            anchorY - 1,
+                            1,
+                            1,
+                            color
+                        );
+                    }
+                    else if (speakerX < textLeft) {
+                        const anchorY = Math.max(Math.min(speakerY, textTop + textHeight - 4), textTop + 5);
+                        canvas.fillRect(
+                            textLeft - 2,
+                            anchorY - 2,
+                            1,
+                            3,
+                            color
+                        );
+                        canvas.fillRect(
+                            textLeft - 3,
+                            anchorY - 1,
+                            1,
+                            1,
+                            color
+                        );
+                    }
+                    else if (speakerY > textTop + textHeight) {
+                        const anchorX = Math.max(Math.min(speakerX, textLeft + textWidth - 4), textLeft + 5);
+                        canvas.fillRect(
+                            anchorX - 2,
+                            textTop + textHeight + 1,
+                            3,
+                            1,
+                            color
+                        );
+                        canvas.fillRect(
+                            anchorX - 1,
+                            textTop + textHeight + 2,
+                            1,
+                            1,
+                            color
+                        );
+                    }
+                    else if (speakerY < textTop) {
+                        const anchorX = Math.max(Math.min(speakerX, textLeft + textWidth - 4), textLeft + 5);
+                        canvas.fillRect(
+                            anchorX - 2,
+                            textTop - 2,
+                            3,
+                            1,
+                            color
+                        );
+                        canvas.fillRect(
+                            anchorX - 1,
+                            textTop - 3,
+                            1,
+                            1,
+                            color
+                        );
+                    }
+                }
+                else {
+                    if (speakerY > textTop + textHeight) {
+                        const anchorX = Math.max(Math.min(speakerX, textLeft + textWidth - 4), textLeft + 5);
+                        canvas.fillRect(
+                            anchorX - 2,
+                            textTop + textHeight + 1,
+                            3,
+                            1,
+                            color
+                        );
+                        canvas.fillRect(
+                            anchorX - 1,
+                            textTop + textHeight + 2,
+                            1,
+                            1,
+                            color
+                        );
+                    }
+                    else if (speakerY < textTop) {
+                        const anchorX = Math.max(Math.min(speakerX, textLeft + textWidth - 4), textLeft + 5);
+                        canvas.fillRect(
+                            anchorX - 2,
+                            textTop - 2,
+                            3,
+                            1,
+                            color
+                        );
+                        canvas.fillRect(
+                            anchorX - 1,
+                            textTop - 3,
+                            1,
+                            1,
+                            color
+                        );
+                    }
+                    else if (speakerX > textLeft + textWidth) {
+                        const anchorY = Math.max(Math.min(speakerY, textTop + textHeight - 4), textTop + 5);
+                        canvas.fillRect(
+                            textLeft + textWidth + 1,
+                            anchorY - 2,
+                            1,
+                            3,
+                            color
+                        );
+                        canvas.fillRect(
+                            textLeft + textWidth + 2,
+                            anchorY - 1,
+                            1,
+                            1,
+                            color
+                        );
+                    }
+                    else if (speakerX < textLeft) {
+                        const anchorY = Math.max(Math.min(speakerY, textTop + textHeight - 4), textTop + 5);
+                        canvas.fillRect(
+                            textLeft - 2,
+                            anchorY - 2,
+                            1,
+                            3,
+                            color
+                        );
+                        canvas.fillRect(
+                            textLeft - 3,
+                            anchorY - 1,
+                            1,
+                            1,
+                            color
+                        );
+                    }
+                }
+            }
+        }
+
         protected renderText: RenderText;
         protected animation: RenderTextAnimation;
 
@@ -45,62 +245,15 @@ namespace sprites {
             const t = Math.floor(owner.top - oy);
 
             const height = this.animation ? this.animation.currentHeight() : this.renderText.height;
-            const sayLeft = l + (owner.width >> 1) - (this.renderText.width >> 1);
+            const width = this.animation ? this.animation.currentWidth() : this.renderText.width;
+            const sayLeft = l + (owner.width >> 1) - (width >> 1);
             const sayTop =  t - height - 4;
 
+            if (sayLeft + width < 0 || sayTop + height < 0 || sayLeft > screen.width || sayTop > screen.height) return;
 
-            if (sayLeft + this.renderText.width < 0 || sayTop + height < 0 || sayLeft > screen.width || sayTop > screen.height) return;
+            SpriteSayRenderer.drawSayFrame(sayLeft, sayTop, width, height, owner.x, owner.y, this.bgColor, screen);
 
             if (height) {
-                screen.fillRect(
-                    sayLeft,
-                    sayTop,
-                    this.renderText.width,
-                    height,
-                    this.bgColor
-                );
-                screen.fillRect(
-                    sayLeft - 1,
-                    sayTop + 1,
-                    1,
-                    height - 2,
-                    this.bgColor
-                );
-                screen.fillRect(
-                    sayLeft + this.renderText.width,
-                    sayTop + 1,
-                    1,
-                    height - 2,
-                    this.bgColor
-                );
-                screen.fillRect(
-                    sayLeft + 1,
-                    sayTop - 1,
-                    this.renderText.width - 2,
-                    1,
-                    this.bgColor
-                );
-                screen.fillRect(
-                    sayLeft + 1,
-                    sayTop + height,
-                    this.renderText.width - 2,
-                    1,
-                    this.bgColor
-                );
-                screen.fillRect(
-                    sayLeft + (this.renderText.width >> 1) - 2,
-                    sayTop + height + 1,
-                    3,
-                    1,
-                    this.bgColor
-                );
-                screen.fillRect(
-                    sayLeft + (this.renderText.width >> 1) - 1,
-                    sayTop + height + 2,
-                    1,
-                    1,
-                    this.bgColor
-                );
                 if (this.animation) {
                     this.animation.draw(screen, sayLeft, sayTop, this.fgColor);
                 }
@@ -157,8 +310,8 @@ namespace sprites {
             // reuse previous sprite if possible
             const imgh = font.charHeight + bubblePadding;
             if (!this.sayBubbleSprite
-                || this.sayBubbleSprite.image.width != bubbleWidth
-                || this.sayBubbleSprite.image.height != imgh) {
+                || this.sayBubbleSprite.width != bubbleWidth
+                || this.sayBubbleSprite.height != imgh) {
                 const sayImg = image.create(bubbleWidth, imgh);
                 if (this.sayBubbleSprite) // sprite with same image size, we can reuse it
                     this.sayBubbleSprite.setImage(sayImg);

package/libs/lcd/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P48418(s) {
+function _main___P48754(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___48659 = (undefined);
-    globals._pollEventQueue___48672 = (undefined);
+    globals._intervals___48995 = (undefined);
+    globals._pollEventQueue___49008 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P48418.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
-_main___P48418.continuations = [  ]
+_main___P48754.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
+_main___P48754.continuations = [  ]
 
-function _main___P48418_mk(s) {
+function _main___P48754_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P48418, depth: s.depth + 1,
+        parent: s, fn: _main___P48754, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P48418_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P48418
+return _main___P48754
 })

package/libs/light-spectrum-sensor/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P95928(s) {
+function _main___P96936(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___96169 = (undefined);
-    globals._pollEventQueue___96182 = (undefined);
+    globals._intervals___97177 = (undefined);
+    globals._pollEventQueue___97190 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P95928.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P95928.continuations = [  ]
+_main___P96936.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P96936.continuations = [  ]
 
-function _main___P95928_mk(s) {
+function _main___P96936_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P95928, depth: s.depth + 1,
+        parent: s, fn: _main___P96936, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P95928_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P95928
+return _main___P96936
 })

package/libs/lora/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P59708(s) {
+function _main___P60044(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___59949 = (undefined);
-    globals._pollEventQueue___59962 = (undefined);
+    globals._intervals___60285 = (undefined);
+    globals._pollEventQueue___60298 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P59708.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
-_main___P59708.continuations = [  ]
+_main___P60044.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
+_main___P60044.continuations = [  ]
 
-function _main___P59708_mk(s) {
+function _main___P60044_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P59708, depth: s.depth + 1,
+        parent: s, fn: _main___P60044, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P59708_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P59708
+return _main___P60044
 })

package/libs/matrix-keypad/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P185323(s) {
+function _main___P187680(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___185564 = (undefined);
-    globals._pollEventQueue___185577 = (undefined);
+    globals._intervals___187921 = (undefined);
+    globals._pollEventQueue___187934 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P185323.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
-_main___P185323.continuations = [  ]
+_main___P187680.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
+_main___P187680.continuations = [  ]
 
-function _main___P185323_mk(s) {
+function _main___P187680_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P185323, depth: s.depth + 1,
+        parent: s, fn: _main___P187680, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P185323_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P185323
+return _main___P187680
 })