pxt-common-packages 10.2.3 → 10.2.5

package/libs/game/multiplayer.cpp

@@ -2,18 +2,15 @@
 
 namespace multiplayer {
     //%
-    void postImage(Image_ im, String goal) {
-        // no support >:(
+    void postImage(Image_ im) {
     }
 
     //%
     void setOrigin(String origin) {
-        // no
     }
 
     //%
     Image_ getCurrentImage() {
-        // nah
         return NULL;
     }
 

package/libs/game/multiplayer.ts

@@ -2,6 +2,9 @@ namespace multiplayer {
     //% shim=multiplayer::getCurrentImage
     declare function getCurrentImage(): Image;
 
+    //% shim=multiplayer::postImage
+    declare function postImage(im: Image): void;
+
     //% shim=multiplayer::setOrigin
     declare function setOrigin(origin: string): void;
 
@@ -21,4 +24,14 @@ namespace multiplayer {
         });
         game.pushScene();
     }
+
+    export function initServer() {
+        if (getOrigin() === "server") {
+            game.eventContext().registerFrameHandler(scene.MULTIPLAYER_POST_SCREEN_PRIORITY, () => {
+                if (getOrigin() === "server") {
+                    postImage(screen);
+                }
+            })
+        }
+    }
 }

package/libs/game/scene.ts

@@ -65,6 +65,7 @@ namespace scene {
     export const RENDER_DIAGNOSTICS_PRIORITY = 150;
     export const MULTIPLAYER_SCREEN_PRIORITY = 190;
     export const UPDATE_SCREEN_PRIORITY = 200;
+    export const MULTIPLAYER_POST_SCREEN_PRIORITY = 210;
 
     // default rendering z indices
     export const ON_PAINT_Z = -20;
@@ -179,6 +180,7 @@ namespace scene {
             });
             // update screen
             this.eventContext.registerFrameHandler(UPDATE_SCREEN_PRIORITY, control.__screen.update);
+            multiplayer.initServer();
             // register additional components
             Scene.initializers.forEach(f => f(this));
         }

package/libs/game/sim/keymap.ts

@@ -160,7 +160,7 @@ namespace pxsim {
 
         private clearMap(name: string) {
             const keyCodes = this.mappings[name];
-            keyCodes?.forEach(keyCode => delete this.keymap[keyCode]);
+            keyCodes && keyCodes.forEach(keyCode => delete this.keymap[keyCode]);
             delete this.mappings[name];
         }
     }

package/libs/game/sim/multiplayer.ts

@@ -1,19 +1,28 @@
 namespace pxsim.multiplayer {
-    export function postImage(im: pxsim.RefImage, goal: string) {
+    const throttledImgPost = pxsim.U.throttle((msg: MultiplayerImageMessage) =>{
+        getMultiplayerState().send(msg);
+    }, 50, true);
+
+    export function postImage(im: pxsim.RefImage) {
+        if (getMultiplayerState().origin !== "server")
+            return;
         const asBuf = pxsim.image.toBuffer(im);
-        getMultiplayerState().send(<MultiplayerImageMessage>{
+        const sb = board() as ScreenBoard;
+        throttledImgPost(<MultiplayerImageMessage>{
             content: "Image",
             image: asBuf,
-            goal
+            palette: sb?.screenState?.paletteToUint8Array(),
         });
     }
 
+
     export function getCurrentImage(): pxsim.RefImage {
         return getMultiplayerState().backgroundImage;
     }
 
     export function setOrigin(origin: "client" | "server" | undefined) {
         getMultiplayerState().origin = origin;
+
     }
 
     export function getOrigin(): string {
@@ -41,8 +50,9 @@ namespace pxsim {
 
     export interface MultiplayerImageMessage extends SimulatorMultiplayerMessage {
         content: "Image";
-        goal: string; // goal of message; e.g. "broadcast-screen"
-        image: RefImage;
+        image: RefBuffer;
+        // 48bytes, [r0,g0,b0,r1,g1,b1,...]
+        palette: Uint8Array;
     }
 
     export interface MultiplayerButtonEvent extends SimulatorMultiplayerMessage {
@@ -74,14 +84,6 @@ namespace pxsim {
         init(origin: string) {
             this.origin = origin;
             runtime.board.addMessageListener(msg => this.messageHandler(msg));
-            setInterval(() => {
-                if (this.origin === "server") {
-                    const b = board() as ScreenBoard;
-                    const screenState = b && b.screenState;
-                    const lastImage = screenState && screenState.lastImage;
-                    lastImage && pxsim.multiplayer.postImage(lastImage, "broadcast-screen");
-                }
-            }, 50);
         }
 
         setButton(key: number, isPressed: boolean) {
@@ -106,10 +108,14 @@ namespace pxsim {
                         msg.image.data = new Uint8Array(msg.image.data);
                     }
                     this.backgroundImage = pxsim.image.ofBuffer(msg.image);
+                    if (msg.palette?.length === 48) {
+                        const palBuffer = new pxsim.RefBuffer(msg.palette)
+                        pxsim.pxtcore.setPalette(palBuffer);
+                    }
                 }
             } else if (isButtonMessage(msg)) {
                 if (this.origin === "server") {
-                    (board() as any).setButton(
+                    (board() as any).handleKeyEvent(
                         msg.button + (7 * (msg.clientNumber || 1)), // + 7 to make it player 2 controls,
                         msg.state === "Pressed" || msg.state === "Held"
                     );

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

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

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___P97772(s) {
+function _main___P97826(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___98015 = (undefined);
-    globals._pollEventQueue___98028 = (undefined);
+    globals._intervals___98069 = (undefined);
+    globals._pollEventQueue___98082 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P97772.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P97772.continuations = [  ]
+_main___P97826.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P97826.continuations = [  ]
 
-function _main___P97772_mk(s) {
+function _main___P97826_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P97772, depth: s.depth + 1,
+        parent: s, fn: _main___P97826, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P97772_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P97772
+return _main___P97826
 })

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

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

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

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