pxt-common-packages 10.3.2 → 10.3.4

package/libs/game/camera.ts

@@ -8,6 +8,8 @@ namespace scene {
         drawOffsetX: number;
         drawOffsetY: number;
         sprite: Sprite;
+        protected _lastUpdatedSpriteX: number;
+        protected _lastUpdatedSpriteY: number;
 
         protected shakeStartTime: number;
         protected shakeDuration: number;
@@ -27,9 +29,9 @@ namespace scene {
         set offsetX(v: number) {
             const scene = game.currentScene();
             if (scene.tileMap && scene.tileMap.enabled) {
-                this._offsetX = scene.tileMap.offsetX(v);
+                this._offsetX = Math.floor(scene.tileMap.offsetX(v));
             } else {
-                this._offsetX = v;
+                this._offsetX = Math.floor(v);
             }
         }
         get offsetY() {
@@ -38,29 +40,29 @@ namespace scene {
         set offsetY(v: number) {
             const scene = game.currentScene();
             if (scene.tileMap && scene.tileMap.enabled) {
-                this._offsetY = scene.tileMap.offsetY(v);
+                this._offsetY = Math.floor(scene.tileMap.offsetY(v));
             } else {
-                this._offsetY = v;
+                this._offsetY = Math.floor(v);
             }
         }
 
         get x() {
-            return this.drawOffsetX + (screen.width >> 1);
+            return this.offsetX + (screen.width >> 1);
         }
         get y() {
-            return this.drawOffsetY + (screen.height >> 1);
+            return this.offsetY + (screen.height >> 1);
         }
         get left() {
-            return this.drawOffsetX;
+            return this.offsetX;
         }
         get right() {
-            return this.drawOffsetX + screen.width;
+            return this.offsetX + screen.width;
         }
         get top() {
-            return this.drawOffsetY;
+            return this.offsetY;
         }
         get bottom() {
-            return this.drawOffsetY + screen.height;
+            return this.offsetY + screen.height;
         }
 
         shake(amplitude: number = 4, duration: number = 1000) {
@@ -75,16 +77,19 @@ namespace scene {
             }
         }
 
+        isUpdated() {
+            return !this.sprite || (this.sprite.x === this._lastUpdatedSpriteX && this.sprite.y === this._lastUpdatedSpriteY);
+        }
+
         update() {
             // if sprite, follow sprite
             if (this.sprite) {
+                this._lastUpdatedSpriteX = this.sprite.x;
+                this._lastUpdatedSpriteY = this.sprite.y;
                 this.offsetX = this.sprite.x - (screen.width >> 1);
                 this.offsetY = this.sprite.y - (screen.height >> 1);
             }
 
-            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,7 +195,7 @@ 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)) {
@@ -356,6 +356,7 @@ class ArcadePhysicsEngine extends PhysicsEngine {
     protected screenEdgeCollisions(movingSprite: MovingSprite, bounce: number, camera: scene.Camera) {
         let s = movingSprite.sprite;
         if (!s.isStatic()) s.setHitbox();
+        if (!camera.isUpdated()) camera.update();
 
         let offset = Fx.toFloat(s._hitbox.left) - camera.offsetX;
         if (offset < 0) {

package/libs/game/scenes.ts

@@ -144,6 +144,7 @@ namespace scene {
     export function cameraFollowSprite(sprite: Sprite) {
         const scene = game.currentScene();
         scene.camera.sprite = sprite;
+        scene.camera.update();
     }
 
     /**
@@ -195,6 +196,8 @@ namespace scene {
     //% weight=70
     export function cameraProperty(property: CameraProperty): number {
         const scene = game.currentScene();
+        if (!scene.camera.isUpdated())
+            scene.camera.update();
         switch (property) {
             case CameraProperty.X: return scene.camera.x;
             case CameraProperty.Y: return scene.camera.y;

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

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

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___P97949(s) {
+function _main___P98048(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___98192 = (undefined);
-    globals._pollEventQueue___98205 = (undefined);
+    globals._intervals___98291 = (undefined);
+    globals._pollEventQueue___98304 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P97949.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P97949.continuations = [  ]
+_main___P98048.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P98048.continuations = [  ]
 
-function _main___P97949_mk(s) {
+function _main___P98048_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P97949, depth: s.depth + 1,
+        parent: s, fn: _main___P98048, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P97949_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P97949
+return _main___P98048
 })

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

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

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

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