Make PoseManager an instance

Author: Avaer Kazmer

vrarmik/ArmTransforms.js

@@ -21,6 +21,8 @@ class ArmTransforms extends MonoBehavior
 			this.armLengthByScale = false;
 			this.scaleAxis = Vector3.one;
 			this.scaleHandFactor = .7;
+
+			this.poseManager = null;
 		}
 
 		get upperArmLength() {
@@ -51,7 +53,7 @@ class ArmTransforms extends MonoBehavior
 		updateArmLengths()
 		{
 			const shoulderWidth = new Vector3().subVectors(this.upperArm.position, this.lowerArm.position).magnitude;
-			const _armLength = (PoseManager.Instance.playerWidthWrist - shoulderWidth) / 2;
+			const _armLength = (this.poseManager.playerWidthWrist - shoulderWidth) / 2;
 			this.setArmLength(_armLength);
 		}
 

vrarmik/AvatarVRTrackingReferences.js

@@ -14,6 +14,7 @@ import StaticOffsetTransform from './StaticOffsetTransform.js';
 			this.rightHand = null;
 
 			this.unity = unity;
+			this.poseManager = null;
 		}
 
 		Awake()
@@ -77,10 +78,10 @@ import StaticOffsetTransform from './StaticOffsetTransform.js';
 				sot.reference = this.transform.parent;
 			} */
 
-			this.head.reference = this.head.reference !== null ? this.head.reference : PoseManager.Instance.vrTransforms.head;
-			// this.hmd.reference = this.hmd.reference !== null ? this.hmd.reference : PoseManager.Instance.vrTransforms.hmd;
-			this.leftHand.reference = this.leftHand.reference !== null ? this.leftHand.reference : PoseManager.Instance.vrTransforms.leftHand;
-			this.rightHand.reference = this.rightHand.reference !== null ? this.rightHand.reference : PoseManager.Instance.vrTransforms.rightHand;
+			this.head.reference = this.head.reference !== null ? this.head.reference : this.poseManager.vrTransforms.head;
+			// this.hmd.reference = this.hmd.reference !== null ? this.hmd.reference : this.poseManager.vrTransforms.hmd;
+			this.leftHand.reference = this.leftHand.reference !== null ? this.leftHand.reference : this.poseManager.vrTransforms.leftHand;
+			this.rightHand.reference = this.rightHand.reference !== null ? this.rightHand.reference : this.poseManager.vrTransforms.rightHand;
 		}
 	}
 

vrarmik/PoseManager.js

@@ -25,7 +25,7 @@ class PoseManager extends MonoBehavior
 
       this.flipY = false;
 
-      PoseManager.Instance = this;
+      // PoseManager.Instance = this;
     }
 
 		/* OnEnable()
@@ -91,6 +91,6 @@ class PoseManager extends MonoBehavior
 			this.playerWidthWrist = PlayerPrefs.GetFloat("VRArmIK_PlayerWidthWrist", this.referencePlayerWidthWrist);
 		}
 	}
-	PoseManager.Instance = null;
+	// PoseManager.Instance = null;
 
 export default PoseManager;

vrarmik/ShoulderPoser.js

@@ -54,10 +54,11 @@ class ShoulderPoser extends MonoBehavior
 			this.leftShoulderAnkerStartLocalPosition = new Vector3();
 			this.rightShoulderAnkerStartLocalPosition = new Vector3();
 
+      this.poseManager = this.GetOrAddComponent(PoseManager);
 			if (this.vrTrackingReferences === null)
-				this.vrTrackingReferences = PoseManager.Instance.vrTransforms;
+				this.vrTrackingReferences = this.poseManager.vrTransforms;
 			if (this.avatarTrackingReferences === null)
-				this.avatarTrackingReferences = PoseManager.Instance.avatarVrTransforms;
+				this.avatarTrackingReferences = this.poseManager.avatarVrTransforms;
 		}
 
 		Start() {
@@ -210,8 +211,8 @@ class ShoulderPoser extends MonoBehavior
 		rotateShoulderRightBase()
 		{
 
-			const heightDiff = this.vrTrackingReferences.head.position.y - PoseManager.Instance.vrSystemOffsetHeight;
-			const relativeHeightDiff = -heightDiff / PoseManager.Instance.playerHeightHmd;
+			const heightDiff = this.vrTrackingReferences.head.position.y - this.poseManager.vrSystemOffsetHeight;
+			const relativeHeightDiff = -heightDiff / this.poseManager.playerHeightHmd;
 
       const hmdRotation = this.vrTrackingReferences.head.rotation;
       hmdRotation.multiply(z180Quaternion);

vrarmik/ShoulderTransforms.js

@@ -34,8 +34,11 @@ class ShoulderTransforms extends MonoBehavior
 			this.rightShoulderAnchor = new Transform();
 			this.transform.AddChild(this.rightShoulderAnchor);
 
+      const poseManager = this.GetOrAddComponent(PoseManager);
 			this.leftArm = unity.makeGameObject().AddComponent(ArmTransforms);
+			this.leftArm.poseManager = poseManager;
 			this.rightArm = unity.makeGameObject().AddComponent(ArmTransforms);
+			this.rightArm.poseManager = poseManager;
 
 			this.leftShoulderAnchor.AddChild(this.leftArm.transform);
 			this.rightShoulderAnchor.AddChild(this.rightArm.transform);