fix(playcanvas): correct usage of fromEulerYXZ

basics · Sep 29, 2019 · 7d33e4b · 7d33e4b
1 parent 431901f
commit 7d33e4b
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/adapter/playcanvas.js b/src/adapter/playcanvas.js
@@ -73,21 +73,26 @@ export function hijackPlayCanvas(pc) {
     return new Quat().setFromMat4(new Mat4().setLookAt(Vec3.ZERO, x, y || Vec3.UP));
   });
 
+  Quat.prototype.multiplyQuaternion = function (other) {
+    return this.clone().mul(other);
+  };
+
   const LEFT90 = pc.quat(Vec3.LEFT, 90);
 
   Quat.prototype.setFromOrientation = function ({ alpha, beta, gamma }, orientation) {
     const x = beta * math.DEG_TO_RAD;
     const y = alpha * math.DEG_TO_RAD;
     const z = -gamma * math.DEG_TO_RAD;
-    let rot = pc.quat(fromEulerYXZ(x, y, z));
-    rot.mul(LEFT90);
+    let rot = pc.quat(...fromEulerYXZ(x, y, z));
+    rot = rot.multiplyQuaternion(LEFT90);
 
     if (orientation) {
       const { dir } = rot;
       const local = pc.quat(dir, orientation);
-      rot = local.mul(rot);
+      rot = local.multiplyQuaternion(rot);
     }
     this.copy(rot);
+    return this;
   };
 }