pxt-common-packages 12.2.5 → 12.2.7

package/libs/game/physics.ts

@@ -189,7 +189,7 @@ class ArcadePhysicsEngine extends PhysicsEngine {
                 s._x = Fx.add(s._x, stepX);
                 s._y = Fx.add(s._y, stepY);
 
-                if (!(s.flags & SPRITE_NO_SPRITE_OVERLAPS)) {
+                if (!(s.flags & SPRITE_NO_SPRITE_OVERLAPS) && s._kindsOverlappedWith.length) {
                     this.map.insertAABB(s);
                 }
                 if (tileMap && tileMap.enabled) {
@@ -311,43 +311,62 @@ class ArcadePhysicsEngine extends PhysicsEngine {
         control.enablePerfCounter("phys_collisions");
         if (!handlers.length) return;
 
-        // sprites that have moved this step
-        for (const ms of movedSprites) {
-            const sprite = ms.sprite;
-            if (sprite.flags & SPRITE_NO_SPRITE_OVERLAPS) continue;
-            const overSprites = this.map.overlaps(ms.sprite);
-
-            for (const overlapper of overSprites) {
-                if (overlapper.flags & SPRITE_NO_SPRITE_OVERLAPS) continue;
-                const thisKind = sprite.kind();
-                const otherKind = overlapper.kind();
-
-                // skip if no overlap event between these two kinds of sprites
-                if (sprite._kindsOverlappedWith.indexOf(otherKind) === -1) continue;
-
-                // Maintaining invariant that the sprite with the higher ID has the other sprite as an overlapper
-                const higher = sprite.id > overlapper.id ? sprite : overlapper;
-                const lower = higher === sprite ? overlapper : sprite;
-
-                // if the two sprites are not currently engaged in an overlap event,
-                // apply all matching overlap events
-                if (higher._overlappers.indexOf(lower.id) === -1) {
-                    handlers
-                        .filter(h => (h.kind === thisKind && h.otherKind === otherKind)
-                            || (h.kind === otherKind && h.otherKind === thisKind)
-                        )
-                        .forEach(h => {
+        // clear the overlap lists on all sprites
+        for (const sprite of this.sprites) {
+            sprite._alreadyChecked = undefined;
+        }
+
+        for (const bucket of this.map.filledBuckets) {
+            if (bucket.length === 1) continue;
+
+            for (const sprite of bucket) {
+                if (sprite.flags & SPRITE_NO_SPRITE_OVERLAPS) continue;
+
+                for (const overlapper of bucket) {
+                    if (overlapper === sprite) continue;
+                    const thisKind = sprite.kind();
+                    const otherKind = overlapper.kind();
+
+                    // the sprite with the higher id maintains the overlap lists
+                    const higher = sprite.id > overlapper.id ? sprite : overlapper;
+                    const lower = higher === sprite ? overlapper : sprite;
+
+                    if (!higher._alreadyChecked) {
+                        higher._alreadyChecked = [];
+                    }
+
+                    // skip if we already compared these two
+                    if (higher._alreadyChecked.indexOf(lower.id) !== -1) continue;
+
+                    higher._alreadyChecked.push(lower.id);
+
+                    // skip if already overlapping
+                    if (higher._overlappers.indexOf(lower.id) !== -1) continue;
+
+                    // skip if there is no overlap event between these two kinds of sprites
+                    if (sprite._kindsOverlappedWith.indexOf(otherKind) === -1) continue;
+
+                    // perform the actual overlap check
+                    if (!higher.overlapsWith(lower)) continue;
+
+                    // invoke all matching overlap event handlers
+                    for (const h of handlers) {
+                        if ((h.kind === thisKind && h.otherKind === otherKind)
+                            || (h.kind === otherKind && h.otherKind === thisKind)) {
                             higher._overlappers.push(lower.id);
                             control.runInParallel(() => {
                                 if (!((sprite.flags | overlapper.flags) & SPRITE_NO_SPRITE_OVERLAPS)) {
-                                    h.handler(
-                                        thisKind === h.kind ? sprite : overlapper,
-                                        thisKind === h.kind ? overlapper : sprite
-                                    );
+                                    if (thisKind === h.kind) {
+                                        h.handler(sprite, overlapper)
+                                    }
+                                    else {
+                                        h.handler(overlapper, sprite)
+                                    }
                                 }
                                 higher._overlappers.removeElement(lower.id);
                             });
-                        });
+                        }
+                    }
                 }
             }
         }

package/libs/game/sprite.ts

@@ -270,6 +270,7 @@ class Sprite extends sprites.BaseSprite {
 
     _hitbox: game.Hitbox;
     _overlappers: number[];
+    _alreadyChecked: number[];
     _kindsOverlappedWith: number[];
 
     flags: number

package/libs/game/spritemap.ts

@@ -5,6 +5,7 @@ namespace sprites {
         private rowCount: number;
         private columnCount: number;
         private buckets: Sprite[][];
+        filledBuckets: Sprite[][];
 
         constructor() {
             this.buckets = [];
@@ -64,14 +65,15 @@ namespace sprites {
             const areaWidth = tMap ? tMap.areaWidth() : screen.width;
             const areaHeight = tMap ? tMap.areaHeight() : screen.height;
 
-            this.cellWidth = Math.clamp(8, areaWidth >> 2, maxWidth * 2);
-            this.cellHeight = Math.clamp(8, areaHeight >> 2, maxHeight * 2);
+            this.cellWidth = Math.clamp(8, areaWidth >> 2, maxWidth << 1);
+            this.cellHeight = Math.clamp(8, areaHeight >> 2, maxHeight << 1);
             this.rowCount = Math.idiv(areaHeight, this.cellHeight);
             this.columnCount = Math.idiv(areaWidth, this.cellWidth);
         }
 
         clear() {
             this.buckets = [];
+            this.filledBuckets = [];
         }
 
         private key(x: number, y: number): number {
@@ -83,8 +85,10 @@ namespace sprites {
         private insertAtKey(x: number, y: number, sprite: Sprite) {
             const k = this.key(x, y);
             let bucket = this.buckets[k];
-            if (!bucket)
+            if (!bucket) {
                 bucket = this.buckets[k] = [];
+                this.filledBuckets.push(bucket);
+            }
             if (bucket.indexOf(sprite) < 0)
                 bucket.push(sprite);
         }

package/libs/game/sprites.ts

@@ -56,6 +56,7 @@ namespace sprites {
     //% blockAliasFor="sprites.create"
     //% expandableArgumentMode=toggle
     //% weight=99 help=sprites/create
+    //% duplicateShadowOnDrag
     export function __create(img: Image, kind?: number): Sprite {
         return sprites.create(img, kind);
     }

package/libs/game/spritesay.ts

@@ -251,7 +251,7 @@ namespace sprites {
 
             if (sayLeft + width < 0 || sayTop + height < 0 || sayLeft > screen.width || sayTop > screen.height) return;
 
-            SpriteSayRenderer.drawSayFrame(sayLeft, sayTop, width, height, owner.x, owner.y, this.bgColor, screen);
+            SpriteSayRenderer.drawSayFrame(sayLeft, sayTop, width, height, owner.x - ox, owner.y - oy, this.bgColor, screen);
 
             if (height) {
                 if (this.animation) {
@@ -287,7 +287,6 @@ namespace sprites {
 
             // sets the default scroll speed in pixels per second
             let speed = 45;
-            const currentScene = game.currentScene();
 
             // Calculates the speed of the scroll if scrolling is needed and a time is specified
             if (timeOnScreen && maxOffset > 0) {
@@ -298,7 +297,7 @@ namespace sprites {
             }
 
             if (timeOnScreen) {
-                timeOnScreen = timeOnScreen + currentScene.millis();
+                timeOnScreen = timeOnScreen + game.runtime();
             }
 
             if (bubbleWidth > maxTextWidth + bubblePadding) {
@@ -328,7 +327,7 @@ namespace sprites {
                 this.sayBubbleSprite.z = owner.z + 1;
 
                 // Update box stuff as long as timeOnScreen doesn't exist or it can still be on the screen
-                if (!timeOnScreen || timeOnScreen > currentScene.millis()) {
+                if (!timeOnScreen || timeOnScreen > game.runtime()) {
                     // move bubble
                     if (!owner.isOutOfScreen(camera)) {
                         const ox = camera.offsetX;
@@ -396,7 +395,7 @@ namespace sprites {
                     this.sayBubbleSprite = undefined;
                 }
             }
-            this.updateSay(0, currentScene.camera);
+            this.updateSay(0, game.currentScene().camera);
         }
 
         update(dt: number, camera: scene.Camera, owner: Sprite) {
@@ -406,7 +405,7 @@ namespace sprites {
 
             this.sayBubbleSprite.setFlag(SpriteFlag.RelativeToCamera, !!(owner.flags & SpriteFlag.RelativeToCamera));
 
-            if (owner.flags && Flag.Destroyed) this.destroy();
+            if (owner.flags & Flag.Destroyed) this.destroy();
         }
 
         destroy() {

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

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

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___P98758(s) {
+function _main___P98602(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___99001 = (undefined);
-    globals._pollEventQueue___99014 = (undefined);
+    globals._intervals___98845 = (undefined);
+    globals._pollEventQueue___98858 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P98758.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P98758.continuations = [  ]
+_main___P98602.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P98602.continuations = [  ]
 
-function _main___P98758_mk(s) {
+function _main___P98602_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P98758, depth: s.depth + 1,
+        parent: s, fn: _main___P98602, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P98758_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P98758
+return _main___P98602
 })

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

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

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

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