Fix dependency + camera control bugs

nerfstudio-project · Jun 5, 2023 · 030174d · 030174d
1 parent 15f98ba
commit 030174d
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git a/viser/_message_api.py b/viser/_message_api.py
@@ -31,9 +31,9 @@
 import imageio.v3 as iio
 import numpy as onp
 import numpy.typing as onpt
+import trimesh
 import trimesh.visual
 from typing_extensions import Literal, LiteralString, ParamSpec, TypeAlias, assert_never
-from yourdfpy.urdf import trimesh
 
 from . import _messages, infra
 from ._gui import (

diff --git a/viser/client/build/asset-manifest.json b/viser/client/build/asset-manifest.json
@@ -1,13 +1,13 @@
 {
   "files": {
     "main.css": "/static/css/main.82973013.css",
-    "main.js": "/static/js/main.7dbd4e75.js",
+    "main.js": "/static/js/main.0afdbdc2.js",
     "index.html": "/index.html",
     "main.82973013.css.map": "/static/css/main.82973013.css.map",
-    "main.7dbd4e75.js.map": "/static/js/main.7dbd4e75.js.map"
+    "main.0afdbdc2.js.map": "/static/js/main.0afdbdc2.js.map"
   },
   "entrypoints": [
     "static/css/main.82973013.css",
-    "static/js/main.7dbd4e75.js"
+    "static/js/main.0afdbdc2.js"
   ]
 }
diff --git a/viser/client/build/index.html b/viser/client/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.svg"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Viser</title><script defer="defer" src="/static/js/main.7dbd4e75.js"></script><link href="/static/css/main.82973013.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.svg"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Viser</title><script defer="defer" src="/static/js/main.0afdbdc2.js"></script><link href="/static/css/main.82973013.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/...r/client/build/static/js/main.7dbd4e75.js → ...r/client/build/static/js/main.0afdbdc2.js b/...r/client/build/static/js/main.7dbd4e75.js → ...r/client/build/static/js/main.0afdbdc2.js
diff --git a/...ld/static/js/main.7dbd4e75.js.LICENSE.txt → ...ld/static/js/main.0afdbdc2.js.LICENSE.txt b/...ld/static/js/main.7dbd4e75.js.LICENSE.txt → ...ld/static/js/main.0afdbdc2.js.LICENSE.txt
diff --git a/...ient/build/static/js/main.7dbd4e75.js.map → ...ient/build/static/js/main.0afdbdc2.js.map b/...ient/build/static/js/main.7dbd4e75.js.map → ...ient/build/static/js/main.0afdbdc2.js.map
diff --git a/viser/client/src/CameraControls.tsx b/viser/client/src/CameraControls.tsx
@@ -11,7 +11,6 @@ import { ViewerContext } from ".";
 export function SynchronizedCameraControls() {
   const viewer = useContext(ViewerContext)!;
   const camera = useThree((state) => state.camera as PerspectiveCamera);
-  const cameraControlRef = React.useRef<CameraControls>(null);
 
   const sendCameraThrottled = makeThrottledMessageSender(
     viewer.websocketRef,
@@ -21,7 +20,7 @@ export function SynchronizedCameraControls() {
   // Callback for sending cameras.
   const sendCamera = React.useCallback(() => {
     const three_camera = camera;
-    const camera_control = cameraControlRef.current;
+    const camera_control = viewer.cameraControlRef.current;
 
     if (camera_control === null) {
       // Camera controls not yet ready, let's re-try later.
@@ -96,7 +95,7 @@ export function SynchronizedCameraControls() {
       ARROW_RIGHT: 39,
       ARROW_DOWN: 40,
     };
-    const cameraControls = cameraControlRef.current!;
+    const cameraControls = viewer.cameraControlRef.current!;
 
     const wKey = new holdEvent.KeyboardKeyHold(KEYCODE.W, 20);
     const aKey = new holdEvent.KeyboardKeyHold(KEYCODE.A, 20);
@@ -120,7 +119,6 @@ export function SynchronizedCameraControls() {
     const upKey = new holdEvent.KeyboardKeyHold(KEYCODE.ARROW_UP, 20);
     const downKey = new holdEvent.KeyboardKeyHold(KEYCODE.ARROW_DOWN, 20);
     leftKey.addEventListener("holding", (event) => {
-      console.log(cameraControls);
       cameraControls.rotate(
         -0.1 * THREE.MathUtils.DEG2RAD * event!.deltaTime,
         0,
@@ -156,7 +154,7 @@ export function SynchronizedCameraControls() {
 
   return (
     <CameraControls
-      ref={cameraControlRef}
+      ref={viewer.cameraControlRef}
       minDistance={0.1}
       maxDistance={200.0}
       dollySpeed={0.3}

diff --git a/viser/client/src/index.tsx b/viser/client/src/index.tsx
@@ -113,8 +113,12 @@ function ViewerCanvas() {
 
 /** Component for helping us set the scene reference. */
 function SceneContextSetter() {
-  const { sceneRef } = React.useContext(ViewerContext)!;
-  sceneRef!.current = useThree((state) => state.scene);
+  const { sceneRef, cameraRef } = React.useContext(ViewerContext)!;
+  sceneRef.current = useThree((state) => state.scene);
+  cameraRef.current = useThree(
+    (state) => state.camera as THREE.PerspectiveCamera
+  );
+  console.log(cameraRef.current);
   return <></>;
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.svg"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Viser</title><script defer="defer" src="/static/js/main.7dbd4e75.js"></script><link href="/static/css/main.82973013.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.svg"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Viser</title><script defer="defer" src="/static/js/main.0afdbdc2.js"></script><link href="/static/css/main.82973013.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>