pxt-common-packages 9.3.12 → 9.3.13

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P181457(s) {
+function _main___P181498(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___181698 = (undefined);
-    globals._pollEventQueue___181711 = (undefined);
+    globals._intervals___181739 = (undefined);
+    globals._pollEventQueue___181752 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P181457.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"targetoverrides.ts","functionName":"<main>","argumentNames":[]}
-_main___P181457.continuations = [  ]
+_main___P181498.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"targetoverrides.ts","functionName":"<main>","argumentNames":[]}
+_main___P181498.continuations = [  ]
 
-function _main___P181457_mk(s) {
+function _main___P181498_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P181457, depth: s.depth + 1,
+        parent: s, fn: _main___P181498, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P181457_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P181457
+return _main___P181498
 })

package/libs/radio-broadcast/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P183277(s) {
+function _main___P183318(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___183518 = (undefined);
-    globals._pollEventQueue___183531 = (undefined);
+    globals._intervals___183559 = (undefined);
+    globals._pollEventQueue___183572 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P183277.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"radio-broadcast.ts","functionName":"<main>","argumentNames":[]}
-_main___P183277.continuations = [  ]
+_main___P183318.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"radio-broadcast.ts","functionName":"<main>","argumentNames":[]}
+_main___P183318.continuations = [  ]
 
-function _main___P183277_mk(s) {
+function _main___P183318_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P183277, depth: s.depth + 1,
+        parent: s, fn: _main___P183318, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P183277_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P183277
+return _main___P183318
 })

package/libs/rotary-encoder/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P165361(s) {
+function _main___P165402(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___165602 = (undefined);
-    globals._pollEventQueue___165615 = (undefined);
+    globals._intervals___165643 = (undefined);
+    globals._pollEventQueue___165656 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P165361.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"targetoverrides.ts","functionName":"<main>","argumentNames":[]}
-_main___P165361.continuations = [  ]
+_main___P165402.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"targetoverrides.ts","functionName":"<main>","argumentNames":[]}
+_main___P165402.continuations = [  ]
 
-function _main___P165361_mk(s) {
+function _main___P165402_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P165361, depth: s.depth + 1,
+        parent: s, fn: _main___P165402, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P165361_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P165361
+return _main___P165402
 })

package/libs/screen/image.cpp

@@ -1086,19 +1086,21 @@ void blit(Image_ dst, Image_ src, pxt::RefCollection *args) {
     int hSrc = pxt::toInt(args->getAt(7));
     bool transparent = pxt::toBoolQuick(args->getAt(8));
 
-    int xDstStart = max(0, xDst);
-    int yDstStart = max(0, yDst);
+    int xSrcStep = (wSrc << 16) / wDst;
+    int ySrcStep = (hSrc << 16) / hDst;
+
+    int xDstClip = abs(min(0, xDst));
+    int yDstClip = abs(min(0, yDst));
+    int xDstStart = xDst + xDstClip;
+    int yDstStart = yDst + yDstClip;
     int xDstEnd = min(dst->width(), xDst + wDst);
     int yDstEnd = min(dst->height(), yDst + hDst);
 
-    int xSrcStart = max(0, xSrc) << 16;
-    int ySrcStart = max(0, ySrc) << 16;
+    int xSrcStart = max(0, (xSrc << 16) + xDstClip * xSrcStep);
+    int ySrcStart = max(0, (ySrc << 16) + yDstClip * ySrcStep);
     int xSrcEnd = min(src->width(), xSrc + wSrc) << 16;
     int ySrcEnd = min(src->height(), ySrc + hSrc) << 16;
 
-    int xSrcStep = (wSrc << 16) / wDst;
-    int ySrcStep = (hSrc << 16) / hDst;
-
     dst->makeWritable();
 
     for (int yDstCur = yDstStart, ySrcCur = ySrcStart; yDstCur < yDstEnd && ySrcCur < ySrcEnd; ++yDstCur, ySrcCur += ySrcStep) {

package/libs/screen/sim/image.ts

@@ -654,19 +654,21 @@ namespace pxsim.ImageMethods {
         const hSrc = args.getAt(7) as number;
         const transparent = args.getAt(8) as number;
 
-        const xDstStart = Math.max(0, xDst);
-        const yDstStart = Math.max(0, yDst);
+        const xSrcStep = ((wSrc << 16) / wDst) | 0;
+        const ySrcStep = ((hSrc << 16) / hDst) | 0;
+
+        const xDstClip = Math.abs(Math.min(0, xDst));
+        const yDstClip = Math.abs(Math.min(0, yDst));
+        const xDstStart = xDst + xDstClip;
+        const yDstStart = yDst + yDstClip;
         const xDstEnd = Math.min(dst._width, xDst + wDst);
         const yDstEnd = Math.min(dst._height, yDst + hDst);
 
-        const xSrcStart = Math.max(0, xSrc) << 16;
-        const ySrcStart = Math.max(0, ySrc) << 16;
+        const xSrcStart = Math.max(0, (xSrc << 16) + xDstClip * xSrcStep);
+        const ySrcStart = Math.max(0, (ySrc << 16) + yDstClip * ySrcStep);
         const xSrcEnd = Math.min(src._width, xSrc + wSrc) << 16;
         const ySrcEnd = Math.min(src._height, ySrc + hSrc) << 16;
 
-        const xSrcStep = ((wSrc << 16) / wDst) | 0;
-        const ySrcStep = ((hSrc << 16) / hDst) | 0;
-
         for (let yDstCur = yDstStart, ySrcCur = ySrcStart; yDstCur < yDstEnd && ySrcCur < ySrcEnd; ++yDstCur, ySrcCur += ySrcStep) {
             const ySrcCurI = ySrcCur >> 16;
             for (let xDstCur = xDstStart, xSrcCur = xSrcStart; xDstCur < xDstEnd && xSrcCur < xSrcEnd; ++xDstCur, xSrcCur += xSrcStep) {