pxt-common-packages 9.4.4 → 9.4.5

package/libs/game/renderText.ts

@@ -61,6 +61,8 @@ namespace sprites {
         }
 
         calculatePartialHeight(startLine: number, lengthToDraw: number) {
+            if (this.linebreaks.length === 0) return this.font.charHeight;
+
             let current = 0;
 
             for (let i = startLine; i < this.linebreaks.length + 1; i++) {
@@ -93,9 +95,9 @@ namespace sprites {
             return total;
         }
 
-        protected lineEnd(index: number) {
-            const prevEnd = index > 0 ? this.linebreaks[index - 1] : 0;
-            let end = index < this.linebreaks.length ? this.linebreaks[index] : this.text.length;
+        lineEnd(lineIndex: number) {
+            const prevEnd = lineIndex > 0 ? this.linebreaks[lineIndex - 1] : 0;
+            let end = lineIndex < this.linebreaks.length ? this.linebreaks[lineIndex] : this.text.length;
             let didMove = false;
 
             // Trim trailing whitespace
@@ -115,8 +117,8 @@ namespace sprites {
             return didMove ? end + 1 : end;
         }
 
-        protected lineStart(index: number) {
-            let start = index > 0 ? this.linebreaks[index - 1] : 0;
+        lineStart(lineIndex: number) {
+            let start = lineIndex > 0 ? this.linebreaks[lineIndex - 1] : 0;
 
             // Trim leading whitespace
             while (start < this.text.length) {
@@ -133,6 +135,29 @@ namespace sprites {
 
             return start;
         }
+
+        widthOfLine(lineIndex: number, fullTextOffset?: number) {
+            if (fullTextOffset != undefined) {
+                return (Math.min(this.lineEnd(lineIndex), fullTextOffset + 1) - this.lineStart(lineIndex)) * this.font.charWidth;
+            }
+            return (this.lineEnd(lineIndex) - this.lineStart(lineIndex)) * this.font.charWidth;
+        }
+
+        widthOfLines(lineStartIndex: number, lineEndIndex: number, offset?: number) {
+            if (this.linebreaks.length === 0) return this.widthOfLine(0, offset);
+
+            let width = 0;
+            let fullTextOffset: number;
+            for (let i = lineStartIndex; i < Math.min(lineEndIndex, this.linebreaks.length + 1); i++) {
+                if (offset != undefined) {
+                    fullTextOffset = this.lineStart(i) + offset;
+                    offset -= this.lineEnd(i) - this.lineStart(i);
+                }
+                if (fullTextOffset !== undefined && this.lineStart(i) > fullTextOffset) break;
+                width = Math.max(width, this.widthOfLine(i, fullTextOffset));
+            }
+            return width;
+        }
     }
 
 
@@ -203,6 +228,9 @@ namespace sprites {
         protected pageLine: number;
         protected timer: number;
         protected pauseMillis: number;
+        protected onTickCB: () => void;
+        protected onEndCB: () => void;
+        protected prevOffset: number;
 
         constructor(public text: RenderText, public height: number) {
             this.state = RenderTextAnimationState.Idle;
@@ -232,17 +260,21 @@ namespace sprites {
         }
 
         currentHeight() {
-            const maxHeight = Math.min(
-                Math.idiv(this.height, this.text.lineHeight()) + 1,
-                this.text.linebreaks.length + 1 - this.pageLine
-            ) * this.text.lineHeight();
+            const minHeight = this.text.lineHeight();
+            const maxHeight = Math.max(
+                Math.min(
+                    Math.idiv(this.height, this.text.lineHeight()) + 1,
+                    this.text.linebreaks.length + 1 - this.pageLine
+                ) * this.text.lineHeight(),
+                minHeight
+            );
 
 
             if (this.state === RenderTextAnimationState.Printing) {
-                return Math.min(
+                return Math.max(Math.min(
                     this.text.calculatePartialHeight(this.pageLine, this.currentOffset()),
                     maxHeight
-                );
+                ), minHeight)
             }
             else if (this.state === RenderTextAnimationState.Pausing) {
                 return maxHeight
@@ -252,10 +284,34 @@ namespace sprites {
             }
         }
 
+        currentWidth() {
+            return this.text.widthOfLines(
+                this.pageLine,
+                this.pageLine + Math.idiv(this.currentHeight(), this.text.lineHeight()) + 1,
+                this.state === RenderTextAnimationState.Printing ? this.currentOffset() : undefined
+            );
+        }
+
         currentOffset() {
             return Math.idiv(control.millis() - this.timer, this.tickPeriod)
         }
 
+        isDone() {
+            return this.state === RenderTextAnimationState.Idle;
+        }
+
+        cancel() {
+            this.state = RenderTextAnimationState.Idle;
+        }
+
+        onCharacterPrinted(cb: () => void) {
+            this.onTickCB = cb;
+        }
+
+        onAnimationEnd(cb: () => void) {
+            this.onEndCB = cb;
+        }
+
         draw(canvas: Image, left: number, top: number, color: number) {
             if (this.state === RenderTextAnimationState.Idle) return;
             else if (this.state === RenderTextAnimationState.Printing) {
@@ -269,6 +325,10 @@ namespace sprites {
                     this.pageLine + Math.idiv(this.height, this.text.lineHeight()) + 1
                 );
 
+                if (this.onTickCB && this.prevOffset !== this.currentOffset()) {
+                    this.onTickCB();
+                }
+
                 if (pageFinished) {
                     this.state = RenderTextAnimationState.Pausing;
                     this.timer = this.pauseMillis
@@ -290,6 +350,7 @@ namespace sprites {
                     this.pageLine += Math.idiv(this.height, this.text.lineHeight()) + 1;
                     if (this.pageLine > this.text.linebreaks.length) {
                         this.state = RenderTextAnimationState.Idle;
+                        if (this.onEndCB) this.onEndCB();
                     }
                     else {
                         this.state = RenderTextAnimationState.Printing;
@@ -297,6 +358,8 @@ namespace sprites {
                     }
                 }
             }
+
+            this.prevOffset = this.currentOffset();
         }
     }
 }

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);
                 }

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___P48426(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___48667 = (undefined);
+    globals._pollEventQueue___48680 = (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___P48426.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
+_main___P48426.continuations = [  ]
 
-function _main___P48418_mk(s) {
+function _main___P48426_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P48418, depth: s.depth + 1,
+        parent: s, fn: _main___P48426, 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___P48426
 })

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___P95952(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___96193 = (undefined);
+    globals._pollEventQueue___96206 = (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___P95952.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P95952.continuations = [  ]
 
-function _main___P95928_mk(s) {
+function _main___P95952_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P95928, depth: s.depth + 1,
+        parent: s, fn: _main___P95952, 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___P95952
 })

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___P59716(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___59957 = (undefined);
+    globals._pollEventQueue___59970 = (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___P59716.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
+_main___P59716.continuations = [  ]
 
-function _main___P59708_mk(s) {
+function _main___P59716_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P59708, depth: s.depth + 1,
+        parent: s, fn: _main___P59716, 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___P59716
 })

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___P185379(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___185620 = (undefined);
+    globals._pollEventQueue___185633 = (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___P185379.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
+_main___P185379.continuations = [  ]
 
-function _main___P185323_mk(s) {
+function _main___P185379_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P185323, depth: s.depth + 1,
+        parent: s, fn: _main___P185379, 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___P185379
 })