pxt-common-packages 10.1.8 → 10.1.9

package/libs/game/camera.ts

@@ -67,7 +67,7 @@ namespace scene {
             if (amplitude <= 0 || duration <= 0) {
                 this.shakeStartTime = undefined;
             } else {
-                // this overrides any existing shake operation            
+                // this overrides any existing shake operation
                 this.shakeStartTime = control.millis();
                 this.shakeAmplitude = amplitude;
                 this.shakeDuration = duration;
@@ -82,9 +82,8 @@ namespace scene {
                 this.offsetY = this.sprite.y - (screen.height >> 1);
             }
 
-            // normalize offset
-            this.offsetX |= 0;
-            this.offsetY |= 0;
+            this.offsetX = Math.floor(this.offsetX);
+            this.offsetY = Math.floor(this.offsetY);
 
             this.drawOffsetX = this.offsetX;
             this.drawOffsetY = this.offsetY;

package/libs/game/physics.ts

@@ -195,6 +195,13 @@ class ArcadePhysicsEngine extends PhysicsEngine {
                 if (tileMap && tileMap.enabled) {
                     this.tilemapCollisions(ms, tileMap);
                 }
+                
+                // check for screen edge collisions
+                const bounce = s.flags & sprites.Flag.BounceOnWall;
+                if (s.flags & sprites.Flag.StayInScreen || (bounce && !tileMap)) {
+                    this.screenEdgeCollisions(ms, bounce, scene.camera);
+                }
+
                 // if sprite still needs to move, add it to the next step of movements
                 if (Fx.abs(ms.dx) > MIN_MOVE_GAP || Fx.abs(ms.dy) > MIN_MOVE_GAP) {
                     remainingMovers.push(ms);
@@ -346,6 +353,29 @@ class ArcadePhysicsEngine extends PhysicsEngine {
         }
     }
 
+    protected screenEdgeCollisions(movingSprite: MovingSprite, bounce: number, camera: scene.Camera) {
+        let s = movingSprite.sprite;
+        if (!s.isStatic()) s.setHitbox();
+
+        let offset = Fx.toFloat(s._hitbox.left) - camera.offsetX;
+        if (offset < 0) {
+            s.left -= offset;
+            if (bounce) s.vx = -s.vx;
+        }
+        else if ((offset = Fx.toFloat(s._hitbox.right) - camera.offsetX - screen.width) > 0) {
+            s.right -= offset;
+            if (bounce) s.vx = -s.vx;
+        }
+        if ((offset = Fx.toFloat(s._hitbox.top) - camera.offsetY) < 0) {
+            s.top -= offset;
+            if (bounce) s.vy = -s.vy;
+        }
+        else if ((offset = Fx.toFloat(s._hitbox.bottom) - camera.offsetY - screen.height) > 0) {
+            s.bottom -= offset;
+            if (bounce) s.vy = -s.vy;
+        }
+    }
+
     protected tilemapCollisions(movingSprite: MovingSprite, tm: tiles.TileMap) {
         const s = movingSprite.sprite;
         // if the sprite is already clipping into a wall,

package/libs/game/sprite.ts

@@ -639,28 +639,6 @@ class Sprite extends sprites.BaseSprite {
             this.destroy()
         }
 
-        const bounce = this.flags & sprites.Flag.BounceOnWall;
-        const tm = game.currentScene().tileMap;
-        if (this.flags & sprites.Flag.StayInScreen || (bounce && !tm)) {
-            if (this.left < camera.offsetX) {
-                this.left = camera.offsetX;
-                if (bounce) this.vx = -this.vx;
-            }
-            else if (this.right > camera.offsetX + screen.width) {
-                this.right = camera.offsetX + screen.width;
-                if (bounce) this.vx = -this.vx;
-            }
-
-            if (this.top < camera.offsetY) {
-                this.top = camera.offsetY;
-                if (bounce) this.vy = -this.vy;
-            }
-            else if (this.bottom > camera.offsetY + screen.height) {
-                this.bottom = camera.offsetY + screen.height;
-                if (bounce) this.vy = -this.vy;
-            }
-        }
-
         if (this.sayRenderer) this.sayRenderer.update(dt, camera, this);
     }
 

package/libs/game---light/compat.ts

@@ -4,6 +4,10 @@ namespace scene.systemMenu {
     }
 }
 
+namespace power {
+    export function poke() {}
+}
+
 namespace scene {
     export const SCREEN_CLEAR_PRIORITY = 1;
     export const UPDATE_INTERVAL_PRIORITY = 19;
@@ -20,6 +24,12 @@ class Scene {
     millis() {
         return control.millis()
     }
+
+    constructor() {
+        this.buttonEventHandlers = []
+    }
+
+    buttonEventHandlers: controller.ButtonEventHandlerState[];
 }
 
 namespace game {

package/libs/game---light/pxt.json

@@ -17,8 +17,6 @@
     "additionalFilePath": "../game",
     "dependencies": {
         "settings": "file:../settings",
-        "screen": "file:../screen",
-        "mixer": "file:../mixer",
-        "power": "file:../power"
+        "screen": "file:../screen"
     }
 }

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

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

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___P97115(s) {
+function _main___P97286(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___97358 = (undefined);
-    globals._pollEventQueue___97371 = (undefined);
+    globals._intervals___97529 = (undefined);
+    globals._pollEventQueue___97542 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P97115.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P97115.continuations = [  ]
+_main___P97286.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P97286.continuations = [  ]
 
-function _main___P97115_mk(s) {
+function _main___P97286_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P97115, depth: s.depth + 1,
+        parent: s, fn: _main___P97286, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P97115_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P97115
+return _main___P97286
 })

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

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

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

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