pxt-common-packages 9.4.15 → 9.4.16

package/libs/game/hitbox.ts

@@ -1,6 +1,6 @@
 namespace game {
     export class Hitbox {
-        hash: Fx8;
+        hash: number;
         parent: Sprite;
         ox: Fx8;
         oy: Fx8;
@@ -46,7 +46,48 @@ namespace game {
             return (x >= this.left) && (x <= this.right) && (y >= this.top) && (y <= this.bottom);
         }
 
+        updateIfInvalid() {
+            if (this.isValid())
+                return;
+
+            const newHitBox = game.calculateHitBox(this.parent);
+
+            const oMinX = this.ox;
+            const oMinY = this.oy;
+            const oMaxX = Fx.add(oMinX, this.width);
+            const oMaxY = Fx.add(oMinY, this.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
+            if (xDiff > Fx.twoFx8) {
+                this.ox = nMinX;
+                this.width = newHitBox.width;
+            }
+            if (yDiff > Fx.twoFx8) {
+                this.oy = nMinY;
+                this.height = newHitBox.height;
+            }
+            this.hash = newHitBox.hash;
+        }
+
         overlapsWith(other: Hitbox): boolean {
+            this.updateIfInvalid();
+            other.updateIfInvalid();
             if (this.contains(other.left, other.top)) return true;
             if (this.contains(other.left, other.bottom)) return true;
             if (this.contains(other.right, other.top)) return true;

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

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P48209(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___48452 = (undefined);
-    globals._pollEventQueue___48465 = (undefined);
+    globals._intervals___48451 = (undefined);
+    globals._pollEventQueue___48464 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P48209.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
-_main___P48209.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___P48209_mk(s) {
+function _main___P48208_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P48209, 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___P48209_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P48209
+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___P96959(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___97202 = (undefined);
-    globals._pollEventQueue___97215 = (undefined);
+    globals._intervals___97199 = (undefined);
+    globals._pollEventQueue___97212 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P96959.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P96959.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___P96959_mk(s) {
+function _main___P96956_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P96959, 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___P96959_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P96959
+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___P59511(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___59754 = (undefined);
-    globals._pollEventQueue___59767 = (undefined);
+    globals._intervals___59753 = (undefined);
+    globals._pollEventQueue___59766 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P59511.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
-_main___P59511.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___P59511_mk(s) {
+function _main___P59510_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P59511, 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___P59511_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P59511
+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___P187979(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___188222 = (undefined);
-    globals._pollEventQueue___188235 = (undefined);
+    globals._intervals___188215 = (undefined);
+    globals._pollEventQueue___188228 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P187979.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
-_main___P187979.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___P187979_mk(s) {
+function _main___P187972_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P187979, 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___P187979_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P187979
+return _main___P187972
 })