From 38d86ad717586f63ee4afdff0496f1f11c9e3775 Mon Sep 17 00:00:00 2001 From: Zhenyi He Date: Mon, 5 Jul 2021 01:12:53 +0800 Subject: [PATCH 1/2] :construction: handler the input event locally --- js/corelink_handler.js | 4 +++- js/render/core/renderListScene.js | 11 ++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/js/corelink_handler.js b/js/corelink_handler.js index a8792eb..8ef4481 100644 --- a/js/corelink_handler.js +++ b/js/corelink_handler.js @@ -1,3 +1,5 @@ +"use strict"; + import { initXR } from "../js/immersive-pre.js" import { ab2str, corelink_message } from "../js/util/corelink_sender.js" import { initSelfAvatar } from "../js/primitive/event.js" @@ -98,7 +100,7 @@ const run = async () => { } if (metaroomEventSender = await corelink.createSender({ - workspace, protocol, type: 'event', echo: true, alert: true, + workspace, protocol, type: 'event', echo: false, alert: true, }).catch((err) => { console.log(err) })) { console.log("ZH: metaroomEventSender", metaroomEventSender); // start webrtc signalling diff --git a/js/render/core/renderListScene.js b/js/render/core/renderListScene.js index add134d..f0f3c13 100644 --- a/js/render/core/renderListScene.js +++ b/js/render/core/renderListScene.js @@ -23,11 +23,12 @@ export let updateController = (avatar, buttonInfo) => { const b = buttonInfo.buttons; for (let i = 0; i < 7; i++) { - // if (b[i].pressed && !buttonState[h][i]) onPress(h, i); - // else - // if (b[i].pressed && buttonState[h][i]) onDrag(h, i); - // else - // if (!b[i].pressed && buttonState[h][i]) onRelease(h, i); + // allow local owner to react to the buttons + if (b[i].pressed && !buttonState[h][i]) onPress(h, i); + else + if (b[i].pressed && buttonState[h][i]) onDrag(h, i); + else + if (!b[i].pressed && buttonState[h][i]) onRelease(h, i); // Update buttonState[h][i] = b[i].pressed; From 9469e4ea185898af055d071e09ac965af4f86280 Mon Sep 17 00:00:00 2001 From: Zhenyi He Date: Mon, 5 Jul 2021 01:20:19 +0800 Subject: [PATCH 2/2] :bug: Let's run the python code to get webpages working --- run.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 run.py diff --git a/run.py b/run.py new file mode 100644 index 0000000..6334d2b --- /dev/null +++ b/run.py @@ -0,0 +1,13 @@ +#Use to create local host +import http.server +import socketserver + +PORT = 8000 + +Handler = http.server.SimpleHTTPRequestHandler +Handler.extensions_map.update({ + ".js": "application/javascript", +}) + +httpd = socketserver.TCPServer(("", PORT), Handler) +httpd.serve_forever() \ No newline at end of file