diff options
4 files changed, 25 insertions, 94 deletions
diff --git a/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab b/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab index 56f37d8..60c25bb 100644 --- a/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab +++ b/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab @@ -41,7 +41,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 312893416} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -201,7 +201,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 679016040} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -291,7 +291,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 781237314} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -389,7 +389,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 984858210} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -526,7 +526,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1116313581} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -624,7 +624,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1130278581} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -783,7 +783,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1234205108} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -933,7 +933,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1325114489} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -1103,7 +1103,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1639162264} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -1209,7 +1209,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1642247840} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -1306,7 +1306,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1711133859} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -1788,7 +1788,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2047997612} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -2696,7 +2696,7 @@ MonoBehaviour: - {fileID: 781237318} - {fileID: 312893420} - {fileID: 1642247843} - draw: 1 + draw: 0 --- !u!1 &1515111015024255430 GameObject: m_ObjectHideFlags: 0 @@ -4732,8 +4732,8 @@ MonoBehaviour: forwardForce: {x: 0, y: 0, z: 0} backwardsForce: {x: 0, y: 0, z: 0} forceSpace: 0 - - forwardTorque: {x: -800, y: 0, z: 0} - backwardsTorque: {x: 800, y: 0, z: 0} + - forwardTorque: {x: -4000, y: 0, z: 0} + backwardsTorque: {x: 4000, y: 0, z: 0} torqueSpace: 0 forwardForce: {x: 0, y: 0, z: 0} backwardsForce: {x: 0, y: 0, z: 0} @@ -4975,8 +4975,8 @@ MonoBehaviour: forwardForce: {x: 0, y: 0, z: 0} backwardsForce: {x: 0, y: 0, z: 0} forceSpace: 0 - - forwardTorque: {x: -800, y: 0, z: 0} - backwardsTorque: {x: 800, y: 0, z: 0} + - forwardTorque: {x: -4000, y: 0, z: 0} + backwardsTorque: {x: 4000, y: 0, z: 0} torqueSpace: 0 forwardForce: {x: 0, y: 0, z: 0} backwardsForce: {x: 0, y: 0, z: 0} @@ -5790,7 +5790,7 @@ MonoBehaviour: hip: {fileID: 0} torso: {fileID: 0} head: {fileID: 0} - rotationTorque: 250 + rotationTorque: 500 clamp: 0 input: {fileID: 0} hipCorrectionAmount: 0 diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/MovementDataHandler.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/MovementDataHandler.cs index 073ecbd..431b659 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Data/MovementDataHandler.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/MovementDataHandler.cs @@ -50,7 +50,7 @@ namespace Rigging.Data left = -rotationTarget.right; slopeStrenght = Mathf.Lerp(slopeStrenght, 0f, Time.deltaTime * 1f); - GLHandle.DrawLine(hip.transform.position, hip.transform.position + groundedForward * 10f); + //GLHandle.DrawLine(hip.transform.position, hip.transform.position + groundedForward * 10f); } } diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs index 4e6ebed..600757a 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs @@ -46,9 +46,8 @@ namespace Rigging.Data } } else if ( counter > steps.current.minTime - //&& (steps.current.minAngle == 0f || steps.current.minAngle < Vector3.Angle(leftLeg.forward, rightLeg.forward)) - //&& (steps.current.minAngle == 0f || steps.current.minAngle < Vector3.Angle(leftLeg.forward, rightLeg.forward)) - //&& isLeft == hip.InverseTransformPoint(leftLeg.position + leftLeg.forward).z > hip.InverseTransformPoint(rightLeg.position + rightLeg.forward).z + && (steps.current.minAngle == 0f || steps.current.minAngle < Vector3.Angle(leftLeg.forward, rightLeg.forward)) + && isLeft == hip.InverseTransformPoint(leftLeg.position + leftLeg.forward).z > hip.InverseTransformPoint(rightLeg.position + rightLeg.forward).z ) { Switch(); diff --git a/ActiveRagdoll/Assets/TABG/Test.unity b/ActiveRagdoll/Assets/TABG/Test.unity index 3aa3326..56c93d1 100644 --- a/ActiveRagdoll/Assets/TABG/Test.unity +++ b/ActiveRagdoll/Assets/TABG/Test.unity @@ -374,7 +374,7 @@ Transform: m_GameObject: {fileID: 705806567} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 10, y: 1, z: 10} + m_LocalScale: {x: 100, y: 1, z: 100} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -895,57 +895,9 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 195317784, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: draw - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 312893420, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 679016043, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 781237318, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 984858214, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1116313584, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1130278584, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1234205112, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1325114492, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1639162268, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1642247843, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1711133862, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2047997616, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_Enabled - value: 0 + - target: {fileID: 336585837, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} + propertyPath: freezeUnusedAngles + value: 1 objectReference: {fileID: 0} - target: {fileID: 1666344766112317020, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} @@ -1007,26 +959,6 @@ PrefabInstance: propertyPath: m_Name value: human_rigging objectReference: {fileID: 0} - - target: {fileID: 7057859769783231887, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: animations.values.Array.data[1].forwardTorque.x - value: -4000 - objectReference: {fileID: 0} - - target: {fileID: 7057859769783231887, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: animations.values.Array.data[1].backwardsTorque.x - value: 4000 - objectReference: {fileID: 0} - - target: {fileID: 8659986707249222525, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: animations.values.Array.data[1].forwardTorque.x - value: -4000 - objectReference: {fileID: 0} - - target: {fileID: 8659986707249222525, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: animations.values.Array.data[1].backwardsTorque.x - value: 4000 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} --- !u!1001 &8277099497161960097 |