diff --git a/.gitignore b/.gitignore index 5d54bc9b5..d674f037c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ previous_static/ data.json web-ui/user_code/tmp/web_bg.wasm web-ui/user_code/tmp/webgpu-examples +200k_prs/client-sdk-js ObservableRobotRemote diff --git a/request.json b/request.json new file mode 100644 index 000000000..6846bf18a --- /dev/null +++ b/request.json @@ -0,0 +1,7 @@ +{ + "room_name": "room-name", + + "video": { + "name": "ingress-video" + } +} diff --git a/web-ui/views/TeleGuidance.tsx b/web-ui/views/TeleGuidance.tsx index 16260a8a6..299a8c507 100644 --- a/web-ui/views/TeleGuidance.tsx +++ b/web-ui/views/TeleGuidance.tsx @@ -161,9 +161,14 @@ function DiffusionVoxelPointCloud() { const runtime = new Runtime(); runtime.module(VoxelNotebook, (name) => { if (name === "NOTCH") return new Inspector(nOTCHRef.current); +<<<<<<< HEAD:web-ui/views/TeleGuidance.tsx if (name === "voxelPainter") return new Inspector(lOGORef.current); if (name === "voxelPainter") return new Inspector(idk.current); +======= + if (name === "LOGO") return new Inspector(lOGORef.current); + if (name === "render_the_cavas") return new Inspector(render_the_cavasRef.current); +>>>>>>> c2752e0 (cool):web-ui/js/views/odyssey/TeleGuidance.tsx }); return () => runtime.dispose(); }, []);