pxt-common-packages 9.4.13 → 9.4.16

package/libs/game/sprite.ts

@@ -337,7 +337,7 @@ class Sprite extends sprites.BaseSprite {
     }
 
     calcDimensionalHash() {
-        return Fx.mul(Fx.mul(this._width, this._height), Fx8(this._image.revision()));
+        return this._image.revision() + Fx.toIntShifted(this._width, 8) + Fx.toIntShifted(this._height, 16);
     }
 
     resetHitbox() {
@@ -346,43 +346,10 @@ class Sprite extends sprites.BaseSprite {
     }
 
     setHitbox() {
-        const newHitBox = game.calculateHitBox(this);
-
-        if (!this._hitbox || this._hitbox.isValid()) {
-            this._hitbox = newHitBox;
-            return;
-        }
-
-        const oMinX = this._hitbox.ox;
-        const oMinY = this._hitbox.oy;
-        const oMaxX = Fx.add(oMinX, this._hitbox.width);
-        const oMaxY = Fx.add(oMinY, this._hitbox.height);
-
-        const nMinX = newHitBox.ox;
-        const nMinY = newHitBox.oy;
-        const nMaxX = Fx.add(nMinX, newHitBox.width);
-        const nMaxY = Fx.add(nMinY, newHitBox.height);
-
-        // total diff in x / y corners between the two hitboxes
-        const xDiff = Fx.add(
-            Fx.abs(Fx.sub(oMinX, nMinX)),
-            Fx.abs(Fx.sub(oMaxX, nMaxX))
-        );
-        const yDiff = Fx.add(
-            Fx.abs(Fx.sub(oMinY, nMinY)),
-            Fx.abs(Fx.sub(oMaxY, nMaxY))
-        );
-
-        // If it's just a small change to the hitbox on one axis,
-        // don't change the dimensions to avoid random clipping
-        this._hitbox = newHitBox;
-        if (xDiff <= Fx.twoFx8) {
-            this._hitbox.ox = oMinX;
-            this._hitbox.width = Fx.sub(oMaxX, oMinX);
-        }
-        if (yDiff <= Fx.twoFx8) {
-            this._hitbox.oy = oMinY;
-            this._hitbox.height = Fx.sub(oMaxY, oMinY);
+        if (this._hitbox) {
+            this._hitbox.updateIfInvalid();
+        } else {
+            this._hitbox = game.calculateHitBox(this);
         }
     }
 
@@ -394,7 +361,7 @@ class Sprite extends sprites.BaseSprite {
         return !(this.flags & SpriteFlag.Invisible);
     }
 
-    private recalcSize(): void {
+    protected recalcSize(): void {
         this._width = Fx8(this._image.width * this.sx);
         this._height = Fx8(this._image.height * this.sy);
         this.resetHitbox();
@@ -645,21 +612,7 @@ class Sprite extends sprites.BaseSprite {
     }
 
     __drawCore(camera: scene.Camera) {
-        if (this.sayRenderer) {
-            if (this.sayEndTime !== undefined) {
-                if (control.millis() < this.sayEndTime) {
-                    this.sayRenderer.draw(screen, camera, this);
-                }
-                else {
-                    this.sayRenderer.destroy();
-                    this.sayRenderer = undefined;
-                    this.sayEndTime = undefined;
-                }
-            }
-            else {
-                this.sayRenderer.draw(screen, camera, this)
-            }
-        }
+        this.drawSay(camera);
 
         if (this.isOutOfScreen(camera)) return;
 
@@ -669,47 +622,8 @@ class Sprite extends sprites.BaseSprite {
         const l = Math.floor(this.left - ox);
         const t = Math.floor(this.top - oy);
 
-        if (!this.isScaled())
-            screen.drawTransparentImage(this._image, l, t);
-        else
-            screen.blit(
-                // dst rect in screen
-                l, t,
-                this.width,
-                this.height,
-                // src rect in sprite image
-                this._image,
-                0, 0,
-                this._image.width, this._image.height,
-                true, false);
-
-        if (this.flags & SpriteFlag.ShowPhysics) {
-            const font = image.font5;
-            const margin = 2;
-            let tx = l;
-            let ty = t + this.height + margin;
-            screen.print(`${this.x >> 0},${this.y >> 0}`, tx, ty, 1, font);
-            tx -= font.charWidth;
-            if (this.vx || this.vy) {
-                ty += font.charHeight + margin;
-                screen.print(`v${this.vx >> 0},${this.vy >> 0}`, tx, ty, 1, font);
-            }
-            if (this.ax || this.ay) {
-                ty += font.charHeight + margin;
-                screen.print(`a${this.ax >> 0},${this.ay >> 0}`, tx, ty, 1, font);
-            }
-        }
-
-        // debug info
-        if (game.debug) {
-            screen.drawRect(
-                Fx.toInt(this._hitbox.left) - ox,
-                Fx.toInt(this._hitbox.top) - oy,
-                Fx.toInt(this._hitbox.width),
-                Fx.toInt(this._hitbox.height),
-                1
-            );
-        }
+        this.drawSprite(l, t);
+        this.drawDebug(l, t, ox, oy);
     }
 
     __update(camera: scene.Camera, dt: number) {
@@ -1170,4 +1084,68 @@ class Sprite extends sprites.BaseSprite {
     toString() {
         return `${this.id}(${this.x},${this.y})->(${this.vx},${this.vy})`;
     }
+
+    protected drawSay(camera: scene.Camera) {
+        if (this.sayRenderer) {
+            if (this.sayEndTime !== undefined) {
+                if (control.millis() < this.sayEndTime) {
+                    this.sayRenderer.draw(screen, camera, this);
+                }
+                else {
+                    this.sayRenderer.destroy();
+                    this.sayRenderer = undefined;
+                    this.sayEndTime = undefined;
+                }
+            }
+            else {
+                this.sayRenderer.draw(screen, camera, this)
+            }
+        }
+    }
+
+    protected drawDebug(left: number, top: number, offsetX: number, offsetY: number) {
+        if (this.flags & SpriteFlag.ShowPhysics) {
+            const font = image.font5;
+            const margin = 2;
+            let tx = left;
+            let ty = top + this.height + margin;
+            screen.print(`${this.x >> 0},${this.y >> 0}`, tx, ty, 1, font);
+            tx -= font.charWidth;
+            if (this.vx || this.vy) {
+                ty += font.charHeight + margin;
+                screen.print(`v${this.vx >> 0},${this.vy >> 0}`, tx, ty, 1, font);
+            }
+            if (this.ax || this.ay) {
+                ty += font.charHeight + margin;
+                screen.print(`a${this.ax >> 0},${this.ay >> 0}`, tx, ty, 1, font);
+            }
+        }
+
+        // debug info
+        if (game.debug) {
+            screen.drawRect(
+                Fx.toInt(this._hitbox.left) - offsetX,
+                Fx.toInt(this._hitbox.top) - offsetY,
+                Fx.toInt(this._hitbox.width),
+                Fx.toInt(this._hitbox.height),
+                1
+            );
+        }
+    }
+
+    protected drawSprite(drawLeft: number, drawTop: number) {
+        if (!this.isScaled())
+            screen.drawTransparentImage(this._image, drawLeft, drawTop);
+        else
+            screen.blit(
+                // dst rect in screen
+                drawLeft, drawTop,
+                this.width,
+                this.height,
+                // src rect in sprite image
+                this._image,
+                0, 0,
+                this._image.width, this._image.height,
+                true, false);
+    }
 }

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P48926(s) {
+function _main___P48208(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___49169 = (undefined);
-    globals._pollEventQueue___49182 = (undefined);
+    globals._intervals___48451 = (undefined);
+    globals._pollEventQueue___48464 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P48926.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
-_main___P48926.continuations = [  ]
+_main___P48208.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
+_main___P48208.continuations = [  ]
 
-function _main___P48926_mk(s) {
+function _main___P48208_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P48926, depth: s.depth + 1,
+        parent: s, fn: _main___P48208, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P48926_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P48926
+return _main___P48208
 })

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___P97394(s) {
+function _main___P96956(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___97637 = (undefined);
-    globals._pollEventQueue___97650 = (undefined);
+    globals._intervals___97199 = (undefined);
+    globals._pollEventQueue___97212 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P97394.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P97394.continuations = [  ]
+_main___P96956.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P96956.continuations = [  ]
 
-function _main___P97394_mk(s) {
+function _main___P96956_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P97394, depth: s.depth + 1,
+        parent: s, fn: _main___P96956, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P97394_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P97394
+return _main___P96956
 })

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P60228(s) {
+function _main___P59510(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___60471 = (undefined);
-    globals._pollEventQueue___60484 = (undefined);
+    globals._intervals___59753 = (undefined);
+    globals._pollEventQueue___59766 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P60228.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
-_main___P60228.continuations = [  ]
+_main___P59510.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
+_main___P59510.continuations = [  ]
 
-function _main___P60228_mk(s) {
+function _main___P59510_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P60228, depth: s.depth + 1,
+        parent: s, fn: _main___P59510, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P60228_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P60228
+return _main___P59510
 })

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P188708(s) {
+function _main___P187972(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___188951 = (undefined);
-    globals._pollEventQueue___188964 = (undefined);
+    globals._intervals___188215 = (undefined);
+    globals._pollEventQueue___188228 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P188708.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
-_main___P188708.continuations = [  ]
+_main___P187972.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
+_main___P187972.continuations = [  ]
 
-function _main___P188708_mk(s) {
+function _main___P187972_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P188708, depth: s.depth + 1,
+        parent: s, fn: _main___P187972, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P188708_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P188708
+return _main___P187972
 })