[bluetooth] Switch OrientationEvent to use Quaternion for now.

cubing · Jul 3, 2020 · e1e6038 · e1e6038
1 parent 69205a7
commit e1e6038
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/src/bluetooth/bluetooth-puzzle.ts b/src/bluetooth/bluetooth-puzzle.ts
@@ -1,6 +1,7 @@
 import { BlockMove } from "../alg";
 import { Transformation } from "../kpuzzle";
 import { BasicRotationTransformer, StreamTransformer } from "./transformer";
+import { Quaternion } from "three";
 
 /******** BluetoothPuzzle ********/
 
@@ -19,7 +20,7 @@ export interface MoveEvent {
 
 // TODO: Only use the `quaternion` field in the `MoveEvent`?
 export interface OrientationEvent {
-  quaternion: { x: number; y: number; z: number; w: number };
+  quaternion: Quaternion;
   timeStamp: number;
   debug?: object;
 }

diff --git a/src/bluetooth/gan.ts b/src/bluetooth/gan.ts
@@ -406,10 +406,9 @@ export class GanCube extends BluetoothPuzzle {
         // quaternion: physicalState.rotQuat(),
       });
     }
-    const { x, y, z, w } = physicalState.rotQuat();
     this.dispatchOrientation({
       timeStamp: physicalState.timeStamp,
-      quaternion: { x, y, z, w },
+      quaternion: physicalState.rotQuat(),
     });
     this.lastMoveCounter = physicalState.moveCounter();
   }

diff --git a/src/bluetooth/gocube.ts b/src/bluetooth/gocube.ts
@@ -147,9 +147,8 @@ export class GoCube extends BluetoothPuzzle {
       this.lastTarget.slerp(targetQuat, 0.5);
       this.currentQuat.rotateTowards(this.lastTarget, rotateTowardsRate);
 
-      const { x, y, z, w } = this.currentQuat;
       this.dispatchOrientation({
-        quaternion: { x, y, z, w },
+        quaternion: this.currentQuat,
         timeStamp: event.timeStamp,
       });
     }

diff --git a/src/bluetooth/transformer.ts b/src/bluetooth/transformer.ts
@@ -63,12 +63,7 @@ export class BasicRotationTransformer implements StreamTransformer {
     // console.log(maxAxis(U.applyQuaternion(quat)), maxAxis(F.applyQuaternion(quat)));
     console.log(q2);
 
-    orientationEvent.quaternion = {
-      x: q2.x,
-      y: q2.y,
-      z: q2.z,
-      w: q2.w,
-    };
+    orientationEvent.quaternion = quat;
 
     console.log(orientationEvent.quaternion);
   }