pxt-common-packages 9.5.9 → 9.5.10

package/libs/game/extendableSprite.ts

@@ -0,0 +1,80 @@
+namespace sprites {
+    /**
+     * A version of the Sprite class that is easier to extend.
+     * 
+     * Unlike the normal Sprite class, this class will automatically add
+     * itself to the physics engine and run all sprite created handlers
+     * in the constructor
+     */
+    export class ExtendableSprite extends Sprite {
+        protected hasCustomDimensions: boolean;
+
+        constructor(spriteImage: Image, kind?: number) {
+            super(spriteImage);
+
+            const scene = game.currentScene();
+            this.setKind(kind);
+            scene.physicsEngine.addSprite(this);
+    
+            // run on created handlers
+            scene.createdHandlers
+                .filter(h => h.kind == kind)
+                .forEach(h => h.handler(this));
+
+            this.hasCustomDimensions = false;
+        }
+
+        /**
+         * Override to change how the sprite is drawn to the screen
+         * 
+         * @param drawLeft The left position to draw the sprite at (already adjusted for camera)
+         * @param drawTop The top position to draw the sprite at (already adjusted for camera)
+         */
+        draw(drawLeft: number, drawTop: number) {
+            super.drawSprite(drawLeft, drawTop);
+        }
+
+        /**
+         * Override to add update logic for a sprite. This method runs once per frame
+         * 
+         * @param deltaTimeMillis The time that has elapsed since the last frame in milliseconds
+         */
+        update(deltaTimeMillis: number) {
+        }
+
+        /**
+         * Sets the width and height of this sprite. Once set, this will also prevent
+         * this width and height from automatically changing whenever scale or the image
+         * changes
+         */
+        setDimensions(width: number, height: number) {
+            this._width = Fx8(width);
+            this._height = Fx8(height);
+            this.hasCustomDimensions = true;
+            this.resetHitbox();
+        }
+        
+        __update(camera: scene.Camera, dt: number) {
+            super.__update(camera, dt);
+            this.update(game.currentScene().eventContext.deltaTimeMillis)
+        }
+
+        setHitbox() {
+            if (this.hasCustomDimensions) {
+                this._hitbox = new game.Hitbox(this, this._width, this._height, Fx.zeroFx8, Fx.zeroFx8)
+            }
+            else {
+                super.setHitbox();
+            }
+        }
+
+        protected drawSprite(drawLeft: number, drawTop: number): void {
+            this.draw(drawLeft, drawTop);
+        }
+
+        protected recalcSize() {
+            if (this.hasCustomDimensions) return;
+            super.recalcSize();
+        }
+    }
+}

package/libs/game/pxt.json

@@ -13,6 +13,7 @@
         "spritesay.ts",
         "sprites.ts",
         "sprite.ts",
+        "extendableSprite.ts",
         "sprite.d.ts",
         "spritemap.ts",
         "spriteevents.ts",

package/libs/game/sprite.ts

@@ -394,7 +394,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 +645,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 +655,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) {
@@ -1171,4 +1118,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___P48182(s) {
+function _main___P48216(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___48425 = (undefined);
-    globals._pollEventQueue___48438 = (undefined);
+    globals._intervals___48459 = (undefined);
+    globals._pollEventQueue___48472 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P48182.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
-_main___P48182.continuations = [  ]
+_main___P48216.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
+_main___P48216.continuations = [  ]
 
-function _main___P48182_mk(s) {
+function _main___P48216_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P48182, depth: s.depth + 1,
+        parent: s, fn: _main___P48216, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P48182_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P48182
+return _main___P48216
 })

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___P96878(s) {
+function _main___P96980(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___97121 = (undefined);
-    globals._pollEventQueue___97134 = (undefined);
+    globals._intervals___97223 = (undefined);
+    globals._pollEventQueue___97236 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P96878.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P96878.continuations = [  ]
+_main___P96980.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P96980.continuations = [  ]
 
-function _main___P96878_mk(s) {
+function _main___P96980_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P96878, depth: s.depth + 1,
+        parent: s, fn: _main___P96980, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P96878_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P96878
+return _main___P96980
 })

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

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

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

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