started update of hinge joint to better refelect the newer prismatic joint style

Author: micahpearlman

Runtime/Scripts/Physics/ZOHingeJoint.cs

@@ -6,6 +6,7 @@
 using Newtonsoft.Json.Linq;
 using ZO.Util.Extensions;
 using ZO.Document;
+using ZO.Util;
 
 
 namespace ZO.Physics {
@@ -23,7 +24,11 @@ namespace ZO.Physics {
     [ExecuteAlways]
     public class ZOHingeJoint : MonoBehaviour, ZOSerializationInterface, ZOJointInterface {
 
-        [SerializeField] public UnityEngine.HingeJoint _hingeJoint;
+        public Rigidbody _connectedBody;
+        public Vector3 _anchor = Vector3.zero;
+        public Vector3 _axis = Vector3.forward;
+
+        [SerializeField] [ZOReadOnlyAttribute] public UnityEngine.HingeJoint _hingeJoint;
 
         /// <summary>
         /// The Unity hinge joint linked to this ZOSim hinge joint.
@@ -67,6 +72,39 @@ public Vector3 ConnectedAnchor {
             }
         }
 
+        /// <summary>
+        /// The connected rigid body.  If null then it is the world.
+        /// </summary>
+        /// <value></value>
+        public Rigidbody ConnectedBody {
+            get {
+                return UnityHingeJoint.connectedBody;
+            }
+            set {
+                if (UnityHingeJoint.connectedBody != value) {
+                    UnityHingeJoint.connectedBody = value;
+                }
+
+                // update the name
+                _name = Type;
+
+                ZOSimOccurrence occurrence = GetComponent<ZOSimOccurrence>();
+                if (occurrence) {
+                    _name = _name + "_from_" + occurrence.Name;
+                }
+
+                if (UnityHingeJoint.connectedBody) {
+                    ZOSimOccurrence connected_occurrence = UnityHingeJoint.connectedBody.gameObject.GetComponent<ZOSimOccurrence>();
+
+                    if (connected_occurrence) {
+                        _name = _name + "_to_" + connected_occurrence.Name;
+                    }
+                }
+
+            }
+        }
+
+
         public bool _debug = false;
 
 
@@ -123,18 +161,6 @@ public float Effort {
             }
         }
 
-        /// <summary>
-        /// The connected rigid body.  If null then it is the world.
-        /// </summary>
-        /// <value></value>
-        public Rigidbody ConnectedBody {
-            get {
-                return UnityHingeJoint.connectedBody;
-            }
-            set {
-                UnityHingeJoint.connectedBody = value;
-            }
-        }
 
         /// <summary>
         /// The connected ZOSim Occurrence.  Being null does not necessarily mean anything.
@@ -193,12 +219,18 @@ private void OnGUI() {
                 // Quaternion r = Quaternion.Inverse(this.transform.rotation) * ConnectedBody.transform.rotation;
                 // float angle = ZO.Math.ZOMathUtil.FindQuaternionTwist(r, UnityHingeJoint.axis) * Mathf.Rad2Deg;
 
-                GUI.TextField(new Rect(10, 10, 300, 22), this.Name + " Angle: " + (_currentAngleRadians * Mathf.Rad2Deg).ToString("R2")
+                GUI.TextField(new Rect(10, 10, 400, 22), this.Name + " Angle: " + (Position * Mathf.Rad2Deg).ToString("R2")
                                 + " Target: " + (UnityHingeJoint.spring.targetPosition * Mathf.Rad2Deg).ToString("R2"));
 
             }
         }
 
+        private void OnValidate() {
+            Axis = _axis;
+            ConnectedBody = _connectedBody;
+            Anchor = _anchor;
+        }
+
         #endregion
 
         // private void FixedUpdate() {

Runtime/Scripts/Physics/ZOPrismaticJoint.cs

@@ -288,11 +288,13 @@ protected void OnDrawGizmosSelected() {
 
                 Quaternion worldAxisRotation = Quaternion.LookRotation(transform.TransformDirection(Axis));
 
-                Vector3 lowerLimit = transform.TransformPoint(Anchor + (JointDirection * JointLimits.LowerLimit));
+                Vector3 lowerLimit = transform.TransformPoint(Anchor - (Axis * UnityConfigurableJoint.linearLimit.limit));
+                // Vector3 lowerLimit = transform.TransformPoint(Anchor + (JointDirection * JointLimits.LowerLimit));
                 Handles.color = Color.red;
                 Handles.CylinderHandleCap(0, lowerLimit, worldAxisRotation, HandleUtility.GetHandleSize(lowerLimit) * 0.2f, EventType.Repaint);
 
-                Vector3 upperLimit = transform.TransformPoint(Anchor + (JointDirection * JointLimits.UpperLimit));
+                // Vector3 upperLimit = transform.TransformPoint(Anchor + (JointDirection * JointLimits.UpperLimit));
+                Vector3 upperLimit = transform.TransformPoint(Anchor + (Axis * UnityConfigurableJoint.linearLimit.limit));
                 Handles.color = Color.blue;
                 Handles.CylinderHandleCap(0, upperLimit, worldAxisRotation, HandleUtility.GetHandleSize(lowerLimit) * 0.2f, EventType.Repaint);
 
@@ -324,12 +326,6 @@ private void Reset() {
         private void OnValidate() {
             SetupPrismaticJointFromConfigurableJoint();
         }
-        // private void OnDestroy() {
-        //     if ((Application.isEditor == true) && (Application.isPlaying == false) && (UnityConfigurableJoint != null) && (Application.isLoadingLevel == false)) {
-        //         DestroyImmediate(UnityConfigurableJoint);
-        //         UnityConfigurableJoint = null;
-        //     }
-        // }
 
 
 

Runtime/Scripts/Util/GameObject/ZOMouseOrbitCamera.cs

@@ -36,7 +36,7 @@ void Start() {
 
         void LateUpdate() {
             if (target) {
-                if (Input.GetMouseButton(0)) {
+                if (Input.GetMouseButton(0) && Input.GetKey(KeyCode.LeftShift) == false) {
                     x += Input.GetAxis("Mouse X") * _xSpeed * _distance * 0.02f;
                     y -= Input.GetAxis("Mouse Y") * _ySpeed * 0.02f;
                 }

Samples~/ZeroSimSamples/Scenes/PrismaticJoint_test.unity

@@ -1526,7 +1526,6 @@ GameObject:
   - component: {fileID: 1299972867}
   - component: {fileID: 1299972868}
   - component: {fileID: 1299972870}
-  - component: {fileID: 1299972869}
   - component: {fileID: 1299972876}
   - component: {fileID: 1299972875}
   - component: {fileID: 1299972874}
@@ -1572,102 +1571,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _documentRoot: {fileID: 526221475}
---- !u!153 &1299972869
-ConfigurableJoint:
-  m_ObjectHideFlags: 2
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1299972866}
-  m_ConnectedBody: {fileID: 1389040765}
-  m_ConnectedArticulationBody: {fileID: 0}
-  m_Anchor: {x: 0, y: 0.2, z: 0}
-  m_Axis: {x: -0, y: -0, z: -1}
-  m_AutoConfigureConnectedAnchor: 0
-  m_ConnectedAnchor: {x: 0, y: 0, z: 0.17500001}
-  serializedVersion: 2
-  m_SecondaryAxis: {x: 0, y: 1, z: 0}
-  m_XMotion: 1
-  m_YMotion: 0
-  m_ZMotion: 0
-  m_AngularXMotion: 0
-  m_AngularYMotion: 0
-  m_AngularZMotion: 0
-  m_LinearLimitSpring:
-    spring: 0
-    damper: 0
-  m_LinearLimit:
-    limit: 0.175
-    bounciness: 0
-    contactDistance: 0
-  m_AngularXLimitSpring:
-    spring: 0
-    damper: 0
-  m_LowAngularXLimit:
-    limit: 0
-    bounciness: 0
-    contactDistance: 0
-  m_HighAngularXLimit:
-    limit: 0
-    bounciness: 0
-    contactDistance: 0
-  m_AngularYZLimitSpring:
-    spring: 0
-    damper: 0
-  m_AngularYLimit:
-    limit: 0
-    bounciness: 0
-    contactDistance: 0
-  m_AngularZLimit:
-    limit: 0
-    bounciness: 0
-    contactDistance: 0
-  m_TargetPosition: {x: 0, y: 0, z: 0}
-  m_TargetVelocity: {x: 0, y: 0, z: 0}
-  m_XDrive:
-    serializedVersion: 3
-    positionSpring: 0
-    positionDamper: 0
-    maximumForce: 3.4028233e+38
-  m_YDrive:
-    serializedVersion: 3
-    positionSpring: 0
-    positionDamper: 0
-    maximumForce: 3.4028233e+38
-  m_ZDrive:
-    serializedVersion: 3
-    positionSpring: 0
-    positionDamper: 0
-    maximumForce: 3.4028233e+38
-  m_TargetRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_TargetAngularVelocity: {x: 0, y: 0, z: 0}
-  m_RotationDriveMode: 0
-  m_AngularXDrive:
-    serializedVersion: 3
-    positionSpring: 0
-    positionDamper: 0
-    maximumForce: 3.4028233e+38
-  m_AngularYZDrive:
-    serializedVersion: 3
-    positionSpring: 0
-    positionDamper: 0
-    maximumForce: 3.4028233e+38
-  m_SlerpDrive:
-    serializedVersion: 3
-    positionSpring: 0
-    positionDamper: 0
-    maximumForce: 3.4028233e+38
-  m_ProjectionMode: 0
-  m_ProjectionDistance: 0.1
-  m_ProjectionAngle: 180
-  m_ConfiguredInWorldSpace: 0
-  m_SwapBodies: 0
-  m_BreakForce: Infinity
-  m_BreakTorque: Infinity
-  m_EnableCollision: 1
-  m_EnablePreprocessing: 1
-  m_MassScale: 1
-  m_ConnectedMassScale: 1
 --- !u!54 &1299972870
 Rigidbody:
   m_ObjectHideFlags: 0