pxt-common-packages 9.5.6 → 9.5.7

package/libs/game/multiplayer.cpp

@@ -0,0 +1,25 @@
+#include "pxt.h"
+
+namespace multiplayer {
+    //%
+    void postImage(Image_ im, String goal) {
+        // no support >:(
+    }
+
+    //%
+    void setOrigin(String origin) {
+        // no
+    }
+
+    //%
+    Image_ getCurrentImage() {
+        // nah
+        return NULL;
+    }
+
+    //%
+    String getOrigin() {
+        return NULL;
+    }
+
+}

package/libs/game/multiplayer.ts

@@ -0,0 +1,24 @@
+namespace multiplayer {
+    //% shim=multiplayer::getCurrentImage
+    declare function getCurrentImage(): Image;
+
+    //% shim=multiplayer::setOrigin
+    declare function setOrigin(origin: string): void;
+
+    //% shim=multiplayer::getOrigin
+    declare function getOrigin(): string;
+
+    export function init() {
+        game.addScenePushHandler(() => {
+            game.eventContext().registerFrameHandler(scene.MULTIPLAYER_SCREEN_PRIORITY, () => {
+                if (getOrigin() === "client") {
+                    const im: Image = getCurrentImage();
+                    scene.setBackgroundImage(im);
+                    // clear default menu button behavior
+                    controller.menu.onEvent(ControllerButtonEvent.Pressed, () => { });
+                }
+            });
+        });
+        game.pushScene();
+    }
+}

package/libs/game/pxt.json

@@ -48,7 +48,9 @@
         "effects.ts",
         "texteffects.ts",
         "assetTemplates.ts",
-        "animation.ts"
+        "animation.ts",
+        "multiplayer.cpp",
+        "multiplayer.ts"
     ],
     "public": true,
     "dependencies": {

package/libs/game/scene.ts

@@ -63,6 +63,7 @@ namespace scene {
     export const RENDER_BACKGROUND_PRIORITY = 60;
     export const RENDER_SPRITES_PRIORITY = 90;
     export const RENDER_DIAGNOSTICS_PRIORITY = 150;
+    export const MULTIPLAYER_SCREEN_PRIORITY = 190;
     export const UPDATE_SCREEN_PRIORITY = 200;
 
     // default rendering z indices

package/libs/game/sim/multiplayer.ts

@@ -0,0 +1,132 @@
+namespace pxsim.multiplayer {
+    export function postImage(im: pxsim.RefImage, goal: string) {
+        const asBuf = pxsim.image.toBuffer(im);
+        getMultiplayerState().send(<MultiplayerImageMessage>{
+            content: "Image",
+            image: asBuf,
+            goal
+        });
+    }
+
+    export function getCurrentImage(): pxsim.RefImage {
+        return getMultiplayerState().backgroundImage;
+    }
+
+    export function setOrigin(origin: "client" | "server" | undefined) {
+        getMultiplayerState().origin = origin;
+    }
+
+    export function getOrigin(): string {
+        return getMultiplayerState().origin;
+    }
+}
+
+namespace pxsim {
+    export interface MultiplayerBoard extends EventBusBoard {
+        multiplayerState: MultiplayerState;
+    }
+
+    export function getMultiplayerState() {
+        return (board() as EventBusBoard as MultiplayerBoard).multiplayerState;
+    }
+
+    export interface SimulatorMultiplayerMessage extends SimulatorBroadcastMessage {
+        broadcast: true
+        type: "multiplayer";
+        content: string;
+        origin?: "server" | "client";
+        clientNumber?: number;
+        id?: number;
+    }
+
+    export interface MultiplayerImageMessage extends SimulatorMultiplayerMessage {
+        content: "Image";
+        goal: string; // goal of message; e.g. "broadcast-screen"
+        image: RefImage;
+    }
+
+    export interface MultiplayerButtonEvent extends SimulatorMultiplayerMessage {
+        content: "Button";
+        button: number; // pxsim.Key.A, ...
+        state: "Pressed" | "Released" | "Held";
+    }
+
+    export class MultiplayerState {
+        lastMessageId: number;
+        origin: string;
+        backgroundImage: RefImage;
+
+        constructor() {
+            this.lastMessageId = 0;
+        }
+
+        send(msg: SimulatorMultiplayerMessage) {
+            Runtime.postMessage(<SimulatorMultiplayerMessage>{
+                ...msg,
+                broadcast: true,
+                toParentIFrameOnly: true,
+                type: "multiplayer",
+                origin: this.origin,
+                id: this.lastMessageId++
+            });
+        }
+
+        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) {
+            if (this.origin === "client") {
+                this.send(<pxsim.MultiplayerButtonEvent>{
+                    content: "Button",
+                    button: key,
+                    state: isPressed ? "Pressed" : "Released"
+                })
+            }
+        }
+
+        protected messageHandler(msg: SimulatorMessage) {
+            if (!isMultiplayerMessage(msg)) {
+                return;
+            }
+
+            if (isImageMessage(msg)) {
+                if (this.origin === "client") {
+                    // HACK: peer js can convert Uint8Array into ArrayBuffer when transmitting; fix this.
+                    if (!ArrayBuffer.isView(msg.image.data)) {
+                        msg.image.data = new Uint8Array(msg.image.data);
+                    }
+                    this.backgroundImage = pxsim.image.ofBuffer(msg.image);
+                }
+            } else if (isButtonMessage(msg)) {
+                if (this.origin === "server") {
+                    (board() as any).setButton(
+                        msg.button + (7 * (msg.clientNumber || 1)), // + 7 to make it player 2 controls,
+                        msg.state === "Pressed" || msg.state === "Held"
+                    );
+                }
+            }
+        }
+    }
+
+    function isMultiplayerMessage(msg: SimulatorMessage): msg is SimulatorMultiplayerMessage {
+        return msg && msg.type === "multiplayer";
+    }
+
+    function isImageMessage(msg: SimulatorMultiplayerMessage): msg is MultiplayerImageMessage {
+        return msg && msg.content === "Image";
+    }
+
+    function isButtonMessage(msg: SimulatorMultiplayerMessage): msg is MultiplayerButtonEvent {
+        return msg && msg.content === "Button";
+    }
+}

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

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

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___P97400(s) {
+function _main___P96584(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___97643 = (undefined);
-    globals._pollEventQueue___97656 = (undefined);
+    globals._intervals___96827 = (undefined);
+    globals._pollEventQueue___96840 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P97400.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P97400.continuations = [  ]
+_main___P96584.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P96584.continuations = [  ]
 
-function _main___P97400_mk(s) {
+function _main___P96584_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P97400, depth: s.depth + 1,
+        parent: s, fn: _main___P96584, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P97400_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P97400
+return _main___P96584
 })

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

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

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

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