Bugfix ShoulderPoser flipZ handling

Author: Avaer Kazmer

vrarmik/ShoulderPoser.js

@@ -106,7 +106,12 @@ class ShoulderPoser extends MonoBehavior
 
 		updateHips() {
 		  const hmdPosition = this.vrTrackingReferences.head.position;
-		  const hmdRotation = this.vrTrackingReferences.head.rotation.multiply(z180Quaternion);
+		  const hmdRotation = this.vrTrackingReferences.head.rotation;
+		  if (PoseManager.Instance.flipZ) {
+		  	hmdRotation.premultiply(z180Quaternion);
+		  } else {
+		  	hmdRotation.multiply(z180Quaternion);
+		  }
       const hmdEuler = new THREE.Euler().setFromQuaternion(hmdRotation, 'YXZ');
       hmdEuler.x = 0;
       hmdEuler.z = 0;
@@ -126,7 +131,12 @@ class ShoulderPoser extends MonoBehavior
 
 		updateNeck() {
 			// const hmdPosition = this.vrTrackingReferences.head.position;
-		  const hmdRotation = this.vrTrackingReferences.head.rotation.multiply(z180Quaternion);
+			const hmdRotation = this.vrTrackingReferences.head.rotation;
+			if (PoseManager.Instance.flipZ) {
+		  	hmdRotation.premultiply(z180Quaternion);
+		  } else {
+		  	hmdRotation.multiply(z180Quaternion);
+		  }
       const hmdEuler = new THREE.Euler().setFromQuaternion(hmdRotation, 'YXZ');
       hmdEuler.x = 0;
       hmdEuler.z = 0;
@@ -211,8 +221,14 @@ class ShoulderPoser extends MonoBehavior
 			const heightDiff = this.vrTrackingReferences.head.position.y - PoseManager.Instance.vrSystemOffsetHeight;
 			const relativeHeightDiff = -heightDiff / PoseManager.Instance.playerHeightHmd;
 
+      const hmdRotation = this.vrTrackingReferences.head.rotation;
+			if (PoseManager.Instance.flipZ) {
+		  	hmdRotation.premultiply(z180Quaternion);
+		  } else {
+		  	hmdRotation.multiply(z180Quaternion);
+		  }
 			const headRightRotation = VectorHelpers.getAngleBetween(this.shoulder.transform.forward,
-										  new Vector3(0, 0, 1).applyQuaternion(this.avatarTrackingReferences.head.transform.rotation.multiply(z180Quaternion)),
+										  new Vector3(0, 0, 1).applyQuaternion(hmdRotation),
 										  Vector3.up, this.shoulder.transform.right) + this.rightRotationHeadRotationOffset;
 			const heightFactor = Mathf.Clamp(relativeHeightDiff - this.rightRotationStartHeight, 0, 1);
 			this.shoulderRightRotation = heightFactor * this.rightRotationHeightFactor;
@@ -276,7 +292,13 @@ class ShoulderPoser extends MonoBehavior
 
 		clampHeadRotationDeltaUp(targetRotation)
 		{
-			const headUpRotation = (Transform.eulerAngles(this.avatarTrackingReferences.head.transform.rotation.multiply(z180Quaternion)).y + 360) % 360;
+			const hmdRotation = this.vrTrackingReferences.head.rotation;
+			if (PoseManager.Instance.flipZ) {
+		  	hmdRotation.premultiply(z180Quaternion);
+		  } else {
+		  	hmdRotation.multiply(z180Quaternion);
+		  }
+			const headUpRotation = (Transform.eulerAngles(hmdRotation).y + 360) % 360;
 			const targetUpRotation = (targetRotation.y + 360) % 360;
 
 			const delta = headUpRotation - targetUpRotation;