pxt-common-packages 11.1.1 → 11.1.4

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

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

package/libs/shader/pxt.json

@@ -0,0 +1,14 @@
+{
+    "name": "shader",
+    "description": "Utility methods for shading images",
+    "files": [
+        "shader.cpp",
+        "shader.ts",
+        "shims.d.ts"
+    ],
+    "public": true,
+    "dependencies": {
+        "core": "file:../core",
+        "screen": "file:../screen"
+    }
+}

package/libs/shader/shader.cpp

@@ -0,0 +1,140 @@
+#include "pxt.h"
+
+#define XX(v) (int)(((int16_t)(v)))
+#define YY(v) (int)(((int16_t)(((int32_t)(v)) >> 16)))
+
+namespace ShaderMethods {
+
+void mapImage(Image_ toShade, Image_ shadeLevels, int x, int y, Buffer map) {
+    if (x >= toShade->width() || y >= toShade->height())
+        return;
+
+    if (toShade->bpp() != 4 || shadeLevels->bpp() != 4 || map->length < 16 || map->length % 16 != 0)
+        return;
+
+    int maxShadeLevel = map->length >> 4;
+
+    int x2 = x + shadeLevels->width() - 1;
+    int y2 = y + shadeLevels->height() - 1;
+
+    if (x2 < 0 || y2 < 0)
+        return;
+
+    int x0 = x;
+    int y0 = y;
+
+    toShade->clamp(&x2, &y2);
+    toShade->clamp(&x, &y);
+    int w = x2 - x + 1;
+    int h = y2 - y + 1;
+
+    toShade->makeWritable();
+
+    auto mapData = map->data;
+
+    auto toShadeByteHeight = toShade->byteHeight();
+    uint8_t *toShadeAddr = toShade->pix(x, y);
+
+    auto shadeLevelsByteHeight = shadeLevels->byteHeight();
+    uint8_t *shadeLevelsAddr = shadeLevels->pix(x - x0, y - y0);
+
+    while (w-- > 0) {
+        auto ptr1 = toShadeAddr;
+        auto ptr2 = shadeLevelsAddr;
+        unsigned shift1 = y & 1;
+        unsigned shift2 = (y - y0) & 1;
+        uint8_t shadeLevel = 0;
+        for (int i = 0; i < h; i++) {
+            if (shift2) {
+                shadeLevel = min(*ptr2 >> 4, maxShadeLevel);
+                ptr2++;
+                shift2 = 0;
+            } else {
+                shadeLevel = min(*ptr2 & 0x0f, maxShadeLevel);
+                shift2 = 1;
+            }
+
+            if (shift1) {
+                *ptr1 = (mapData[(*ptr1 >> 4) + (shadeLevel << 4)] << 4) | (*ptr1 & 0x0f);
+                ptr1++;
+                shift1 = 0;
+            } else {
+                *ptr1 = (mapData[(*ptr1 & 0xf) + (shadeLevel << 4)] & 0xf) | (*ptr1 & 0xf0);
+                shift1 = 1;
+            }
+        }
+        toShadeAddr += toShadeByteHeight;
+        shadeLevelsAddr += shadeLevelsByteHeight;
+    }
+}
+
+void mergeImage(Image_ dst, Image_ src, int x, int y) {
+    if (x >= dst->width() || y >= dst->height())
+        return;
+
+    if (dst->bpp() != 4 || src->bpp() != 4)
+        return;
+
+    int x2 = x + src->width() - 1;
+    int y2 = y + src->height() - 1;
+
+    if (x2 < 0 || y2 < 0)
+        return;
+
+    int x0 = x;
+    int y0 = y;
+
+    dst->clamp(&x2, &y2);
+    dst->clamp(&x, &y);
+    int w = x2 - x + 1;
+    int h = y2 - y + 1;
+
+    dst->makeWritable();
+
+    auto dstByteHeight = dst->byteHeight();
+    uint8_t *dstAddr = dst->pix(x, y);
+
+    auto srcByteHeight = src->byteHeight();
+    uint8_t *srcAddr = src->pix(x - x0, y - y0);
+
+    while (w-- > 0) {
+        auto ptr1 = dstAddr;
+        auto ptr2 = srcAddr;
+        unsigned shift1 = y & 1;
+        unsigned shift2 = (y - y0) & 1;
+        int srcValue = 0;
+        for (int i = 0; i < h; i++) {
+            if (shift2) {
+                srcValue = *ptr2 >> 4;
+                ptr2++;
+                shift2 = 0;
+            } else {
+                srcValue = *ptr2 & 0x0f;
+                shift2 = 1;
+            }
+
+            if (shift1) {
+                *ptr1 = (min(*ptr1 >> 4, srcValue) << 4) | (*ptr1 & 0x0f);
+                ptr1++;
+                shift1 = 0;
+            } else {
+                *ptr1 = (min(*ptr1 & 0xf, srcValue) & 0xf) | (*ptr1 & 0xf0);
+                shift1 = 1;
+            }
+        }
+        dstAddr += dstByteHeight;
+        srcAddr += srcByteHeight;
+    }
+}
+
+//%
+void _mapImage(Image_ toShade, Image_ shadeLevels, int xy, Buffer c) {
+    mapImage(toShade, shadeLevels, XX(xy), YY(xy), c);
+}
+
+//%
+void _mergeImage(Image_ toShade, Image_ shadeLevels, int xy) {
+    mergeImage(toShade, shadeLevels, XX(xy), YY(xy));
+}
+
+}

package/libs/shader/shader.ts

@@ -0,0 +1,19 @@
+namespace helpers {
+    //% shim=ShaderMethods::_mapImage
+    function _mapImage(toShade: Image, shadeLevels: Image, xy: number, m: Buffer): void { }
+
+    export function mapImage(toShade: Image, shadeLevels: Image, x: number, y: number, m: Buffer) {
+        _mapImage(toShade, shadeLevels, pack(x, y), m);
+    }
+
+    //% shim=ShaderMethods::_mergeImage
+    function _mergeImage(dst: Image, src: Image, xy: number): void { }
+
+    export function mergeImage(dst: Image, src: Image, x: number, y: number) {
+        _mergeImage(dst, src, pack(x, y));
+    }
+
+    function pack(x: number, y: number) {
+        return (Math.clamp(-30000, 30000, x | 0) & 0xffff) | (Math.clamp(-30000, 30000, y | 0) << 16)
+    }
+}

package/libs/shader/sim/shader.ts

@@ -0,0 +1,37 @@
+/// <reference path="../../screen/sim/image.ts" />
+
+namespace pxsim.ShaderMethods {
+    export function _mergeImage(dst: RefImage, src: RefImage, xy: number) {
+        mergeImage(dst, src, pxsim.ImageMethods.XX(xy), pxsim.ImageMethods.YY(xy));
+    }
+
+    function mergeImage(dst: RefImage, src: RefImage, x0: number, y0: number) {
+        for (let x = 0; x < src._width; x++) {
+            for (let y = 0; y < src._height; y++) {
+                pxsim.ImageMethods.setPixel(
+                    dst,
+                    x0 + x,
+                    y0 + y,
+                    Math.min(pxsim.ImageMethods.getPixel(dst, x0 + x, y0 + y), pxsim.ImageMethods.getPixel(src, x, y))
+                )
+            }
+        }
+    }
+
+    export function _mapImage(dst: RefImage, src: RefImage, xy: number, buf: RefBuffer) {
+        mapImage(dst, src, pxsim.ImageMethods.XX(xy), pxsim.ImageMethods.YY(xy), buf);
+    }
+
+    function mapImage(dst: RefImage, src: RefImage, x0: number, y0: number, buf: RefBuffer) {
+        for (let x = 0; x < src._width; x++) {
+            for (let y = 0; y < src._height; y++) {
+                pxsim.ImageMethods.setPixel(
+                    dst,
+                    x0 + x,
+                    y0 + y,
+                    buf.data[pxsim.ImageMethods.getPixel(dst, x0 + x, y0 + y) + (pxsim.ImageMethods.getPixel(src, x, y) << 4)]
+                )
+            }
+        }
+    }
+}