fix change callbacks

viamrobotics · Mar 6, 2024 · a835239 · a835239
1 parent dccb80a
commit a835239
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@viamrobotics/three",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "license": "Apache-2.0",
   "type": "module",
   "files": [

diff --git a/src/object-3d.ts b/src/object-3d.ts
@@ -19,30 +19,40 @@ export class ViamObject3D extends Object3D {
     super();
 
     const ov = new OrientationVector();
-    const ovChangeCallback = () => ov.setFromQuaternion(this.quaternion, false);
+
+    const ovChangeCallback = () => {
+      ov.setFromQuaternion(this.quaternion, false);
+    };
+
+    const onChange = () => {
+      this.quaternion._onChangeCallback = noop;
+      this.rotation._onChangeCallback = noop;
+
+      ov.toQuaternion(this.quaternion);
+      ov.toEuler(this.rotation);
+
+      this.quaternion._onChangeCallback = quatChangeCallback;
+      this.rotation._onChangeCallback = eulerChangeCallback;
+    };
+
     const eulerOldChangeCallback = this.rotation._onChangeCallback;
     const quatOldChangeCallback = this.quaternion._onChangeCallback;
 
     const quatChangeCallback = () => {
+      ov._onChange(noop);
       quatOldChangeCallback();
       ovChangeCallback();
+      ov._onChange(onChange);
     };
 
     const eulerChangeCallback = () => {
+      ov._onChange(noop);
       eulerOldChangeCallback();
       ovChangeCallback();
+      ov._onChange(onChange);
     };
 
-    ov._onChange(() => {
-      this.quaternion._onChangeCallback = noop;
-      this.rotation._onChangeCallback = noop;
-
-      ov.toQuaternion(this.quaternion);
-      ov.toEuler(this.rotation);
-
-      this.quaternion._onChangeCallback = quatChangeCallback;
-      this.rotation._onChangeCallback = eulerChangeCallback;
-    });
+    ov._onChange(onChange);
 
     this.quaternion._onChange(quatChangeCallback);
     this.rotation._onChange(eulerChangeCallback);