From bcd50304567df00e166dcb2ca93eb530c36b38e1 Mon Sep 17 00:00:00 2001 From: Eyal Gruss Date: Mon, 30 Sep 2024 19:00:24 +0300 Subject: [PATCH] add readme anchors, prevent rightclick action in ruttetra, fix broken youtube logic and tests --- README.md | 6 +- models/ruttetraizer.js | 2 +- utils/videoloader.js | 5 +- utils/videoloader_tests/test.js | 98 ++++++++++++++++----------------- 4 files changed, 57 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index ecc92db..f73d876 100644 --- a/README.md +++ b/README.md @@ -17,14 +17,16 @@ The code demos usages with Wasm ([MediaPipe](https://ai.google.dev/edge/mediapip WebGPU ([TensorFlow.js](https://www.tensorflow.org/js), [ONNX Runtime Web](https://onnxruntime.ai/docs/get-started/with-javascript/web.html), [Transformers.js](https://huggingface.co/docs/transformers.js/index)), WebGL ([Three.js](https://threejs.org/), [SwissGL](https://google.github.io/swissgl/)), and VanillaJS. -Known issues: +#### Known issues: 1. Resolution of captured media is doubled for smaller frames: https://github.com/screen-share/element-capture/issues/44
+#### Demo Video: + [Demo video](https://github.com/eyaler/LordTubeMaster/assets/4436747/2352969c-889d-478e-b386-8bdf6452a797)
-High-level architecture and modules: +#### High-level architecture and modules: ![Architecture](media/LordTubeMaster.svg) diff --git a/models/ruttetraizer.js b/models/ruttetraizer.js index ed84872..e721413 100644 --- a/models/ruttetraizer.js +++ b/models/ruttetraizer.js @@ -31,7 +31,7 @@ export default class RuttEtraIzer { vertexColors: true, }) - canvas.addEventListener('pointerdown', e => {down_x = e.clientX; down_y = e.clientY}) + canvas.addEventListener('pointerdown', e => {if (!e.button) {down_x = e.clientX; down_y = e.clientY}}) document.addEventListener('pointerup', () => down_x = down_y = null) diff --git a/utils/videoloader.js b/utils/videoloader.js index 065028e..754b14f 100644 --- a/utils/videoloader.js +++ b/utils/videoloader.js @@ -32,9 +32,10 @@ export default function load_video(input, video_elem) { let url = 'about:blank' let hash = '' - if (host.includes('vimeo') || vid_id.match(/^\d+\/?\w*$/) || vid_id2.match(/^\d+\/?\w*$/)) { // Vimeo - if (!vid_id.match(/^\d+$/)) + if (host.includes('vimeo') || vid_id.match(/^\d+(\/\w+)?$/) || vid_id2.match(/^\d+(\/\w+)?$/)) { // Vimeo + if (!vid_id.match(/^\d+$/)) { vid_id = vid_id2 + } if (vid_id.includes('/')) { let secret [vid_id, secret] = vid_id.split('/') diff --git a/utils/videoloader_tests/test.js b/utils/videoloader_tests/test.js index d6128ea..e12e901 100644 --- a/utils/videoloader_tests/test.js +++ b/utils/videoloader_tests/test.js @@ -2,58 +2,58 @@ import load_video from '../videoloader.js' const tests = { '': '', - 'KxGRhd_iWuE': ` -https://www.youtube.com/watch?v=KxGRhd_iWuE -https://www.youtube-nocookie.com/watch?v=KxGRhd_iWuE -https://www.youtube.com/embed/KxGRhd_iWuE -https://www.youtube-nocookie.com/embed/KxGRhd_iWuE -https://youtu.be/KxGRhd_iWuE -www.youtube.com/watch?v=KxGRhd_iWuE -www.youtube-nocookie.com/watch?v=KxGRhd_iWuE -www.youtube.com/embed/KxGRhd_iWuE -www.youtube-nocookie.com/embed/KxGRhd_iWuE -youtu.be/KxGRhd_iWuE -KxGRhd_iWuE -?v=KxGRhd_iWuE -&v=KxGRhd_iWuE -v=KxGRhd_iWuE + '59bH4FhOVkA': ` +https://www.youtube.com/watch?v=59bH4FhOVkA +https://www.youtube-nocookie.com/watch?v=59bH4FhOVkA +https://www.youtube.com/embed/59bH4FhOVkA +https://www.youtube-nocookie.com/embed/59bH4FhOVkA +https://youtu.be/59bH4FhOVkA +www.youtube.com/watch?v=59bH4FhOVkA +www.youtube-nocookie.com/watch?v=59bH4FhOVkA +www.youtube.com/embed/59bH4FhOVkA +www.youtube-nocookie.com/embed/59bH4FhOVkA +youtu.be/59bH4FhOVkA +59bH4FhOVkA +?v=59bH4FhOVkA +&v=59bH4FhOVkA +v=59bH4FhOVkA `, - 'KxGRhd_iWuE&playlist=KxGRhd_iWuE': ` -https://www.youtube.com/watch?v=KxGRhd_iWuE&playlist=KxGRhd_iWuE -https://www.youtube.com/watch?playlist=KxGRhd_iWuE&v=KxGRhd_iWuE -https://www.youtube.com/embed/KxGRhd_iWuE?playlist=KxGRhd_iWuE -www.youtube.com/watch?v=KxGRhd_iWuE&playlist=KxGRhd_iWuE -www.youtube.com/watch?playlist=KxGRhd_iWuE&v=KxGRhd_iWuE -www.youtube.com/embed/KxGRhd_iWuE?playlist=KxGRhd_iWuE -?v=KxGRhd_iWuE&playlist=KxGRhd_iWuE -&v=KxGRhd_iWuE&playlist=KxGRhd_iWuE -v=KxGRhd_iWuE&playlist=KxGRhd_iWuE -KxGRhd_iWuE&playlist=KxGRhd_iWuE -?playlist=KxGRhd_iWuE&v=KxGRhd_iWuE -&playlist=KxGRhd_iWuE&v=KxGRhd_iWuE -playlist=KxGRhd_iWuE&v=KxGRhd_iWuE + '59bH4FhOVkA&playlist=59bH4FhOVkA': ` +https://www.youtube.com/watch?v=59bH4FhOVkA&playlist=59bH4FhOVkA +https://www.youtube.com/watch?playlist=59bH4FhOVkA&v=59bH4FhOVkA +https://www.youtube.com/embed/59bH4FhOVkA?playlist=59bH4FhOVkA +www.youtube.com/watch?v=59bH4FhOVkA&playlist=59bH4FhOVkA +www.youtube.com/watch?playlist=59bH4FhOVkA&v=59bH4FhOVkA +www.youtube.com/embed/59bH4FhOVkA?playlist=59bH4FhOVkA +?v=59bH4FhOVkA&playlist=59bH4FhOVkA +&v=59bH4FhOVkA&playlist=59bH4FhOVkA +v=59bH4FhOVkA&playlist=59bH4FhOVkA +59bH4FhOVkA&playlist=59bH4FhOVkA +?playlist=59bH4FhOVkA&v=59bH4FhOVkA +&playlist=59bH4FhOVkA&v=59bH4FhOVkA +playlist=59bH4FhOVkA&v=59bH4FhOVkA `, - 'playlist=KxGRhd_iWuE': ` -https://www.youtube.com/embed/?playlist=KxGRhd_iWuE -www.youtube.com/embed/?playlist=KxGRhd_iWuE -?playlist=KxGRhd_iWuE -&playlist=KxGRhd_iWuE -playlist=KxGRhd_iWuE + 'playlist=59bH4FhOVkA': ` +https://www.youtube.com/embed/?playlist=59bH4FhOVkA +www.youtube.com/embed/?playlist=59bH4FhOVkA +?playlist=59bH4FhOVkA +&playlist=59bH4FhOVkA +playlist=59bH4FhOVkA `, - 'KxGRhd_iWuE&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS': ` -https://www.youtube.com/watch?v=KxGRhd_iWuE&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS -https://www.youtube.com/watch?list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS&v=KxGRhd_iWuE -https://www.youtube.com/embed/KxGRhd_iWuE?list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS -www.youtube.com/watch?v=KxGRhd_iWuE&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS -www.youtube.com/watch?list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS&v=KxGRhd_iWuE -www.youtube.com/embed/KxGRhd_iWuE?list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS -?v=KxGRhd_iWuE&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS -&v=KxGRhd_iWuE&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS -v=KxGRhd_iWuE&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS -KxGRhd_iWuE&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS -?list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS&v=KxGRhd_iWuE -&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS&v=KxGRhd_iWuE -list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS&v=KxGRhd_iWuE + '59bH4FhOVkA&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS': ` +https://www.youtube.com/watch?v=59bH4FhOVkA&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS +https://www.youtube.com/watch?list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS&v=59bH4FhOVkA +https://www.youtube.com/embed/59bH4FhOVkA?list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS +www.youtube.com/watch?v=59bH4FhOVkA&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS +www.youtube.com/watch?list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS&v=59bH4FhOVkA +www.youtube.com/embed/59bH4FhOVkA?list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS +?v=59bH4FhOVkA&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS +&v=59bH4FhOVkA&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS +v=59bH4FhOVkA&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS +59bH4FhOVkA&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS +?list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS&v=59bH4FhOVkA +&list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS&v=59bH4FhOVkA +list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS&v=59bH4FhOVkA `, 'list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS': ` https://www.youtube.com/embed/?list=PLZV8sKAO3LzbA18GxCub2j_2ZpwJENDAS