From 0271e38dbc96f99a307a94cec048bb2372a0c059 Mon Sep 17 00:00:00 2001 From: "A.Olokhtonov" Date: Mon, 24 Apr 2023 16:20:39 +0300 Subject: [PATCH] Fix wrong buffered points --- client/client_recv.js | 2 +- client/index.html | 24 ++++++++++++------------ client/index.js | 2 -- client/webgl_listeners.js | 4 ++-- client/websocket.js | 2 +- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/client/client_recv.js b/client/client_recv.js index 2713df5..4ff729f 100644 --- a/client/client_recv.js +++ b/client/client_recv.js @@ -240,7 +240,7 @@ function handle_event(state, context, event, relax = false) { case EVENT.IMAGE_MOVE: { // Already moved due to local prediction - if (event.user_id !== state.me.id) { + if (event.user_id !== state.me) { const image_id = event.image_id; const image_event = find_image(state, image_id); diff --git a/client/index.html b/client/index.html index 5a2ec3e..1b637dc 100644 --- a/client/index.html +++ b/client/index.html @@ -7,20 +7,20 @@ - + - - - - - - - - + + + + + + + + - - - + + +
diff --git a/client/index.js b/client/index.js index ed10a9d..ef6dabc 100644 --- a/client/index.js +++ b/client/index.js @@ -1,5 +1,3 @@ -// NEXT: fire events for brush changes - document.addEventListener('DOMContentLoaded', main); const config = { diff --git a/client/webgl_listeners.js b/client/webgl_listeners.js index 3e96b98..3cde261 100644 --- a/client/webgl_listeners.js +++ b/client/webgl_listeners.js @@ -283,10 +283,10 @@ function touchmove(e, state, context) { if (state.touch.buffered.length > 0) { clear_dynamic_stroke(state, context, state.me); - // BUG: can't see these on other clients!! + // NEXT: BUG: can't see these on other clients!! for (const p of state.touch.buffered) { update_dynamic_stroke(state, context, state.me, p); - fire_event(state, predraw_event(canvasp.x, canvasp.y)); + fire_event(state, predraw_event(p.x, p.y)); } state.touch.buffered.length = 0; diff --git a/client/websocket.js b/client/websocket.js index fadc567..01c50ac 100644 --- a/client/websocket.js +++ b/client/websocket.js @@ -28,7 +28,7 @@ async function ws_connect(state, context, first_connect = false) { } } } catch (e) { - console.log('Could not ping the server:', e); + // console.log('Could not ping the server:', e); } state.timers.offline_toast = setTimeout(() => ws_connect(state, context, first_connect), config.ws_reconnect_timeout);