summaryrefslogtreecommitdiff
path: root/ActiveRagdoll/Assets/TABG/Scripts
diff options
context:
space:
mode:
Diffstat (limited to 'ActiveRagdoll/Assets/TABG/Scripts')
-rw-r--r--ActiveRagdoll/Assets/TABG/Scripts/Action/Movement.cs6
-rw-r--r--ActiveRagdoll/Assets/TABG/Scripts/Debug/AddTorque.cs25
-rw-r--r--ActiveRagdoll/Assets/TABG/Scripts/Debug/AddTorque.cs.meta11
3 files changed, 39 insertions, 3 deletions
diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Action/Movement.cs b/ActiveRagdoll/Assets/TABG/Scripts/Action/Movement.cs
index 67e9a05..dcd96a0 100644
--- a/ActiveRagdoll/Assets/TABG/Scripts/Action/Movement.cs
+++ b/ActiveRagdoll/Assets/TABG/Scripts/Action/Movement.cs
@@ -17,7 +17,7 @@ namespace Rigging.Action
public Vector3 movementVector;
- public AnimationParam<float> animationForceAmounts;
+ public AnimationParam<float> forceAmounts;
private RigidbodyHolder allRigs;
@@ -34,7 +34,7 @@ namespace Rigging.Action
protected override void OnStart()
{
- animationForceAmounts.SetPlayer(player);
+ forceAmounts.SetPlayer(player);
standingData = player.status.standingData;
inputHandler = player.input;
allRigs = player.status.body;
@@ -44,7 +44,7 @@ namespace Rigging.Action
private void FixedUpdate()
{
data.sinceJump += Time.fixedDeltaTime;
- movementVector += inputHandler.inputMovementDirection * animationForceAmounts.current;
+ movementVector += inputHandler.inputMovementDirection * forceAmounts.current;
movementVector *= friction;
allRigs.AddForceToAll(movementVector * multiplier, ForceMode.Acceleration);
diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Debug/AddTorque.cs b/ActiveRagdoll/Assets/TABG/Scripts/Debug/AddTorque.cs
new file mode 100644
index 0000000..3905920
--- /dev/null
+++ b/ActiveRagdoll/Assets/TABG/Scripts/Debug/AddTorque.cs
@@ -0,0 +1,25 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class AddTorque : MonoBehaviour
+{
+ public Vector3 torque;
+
+ public Rigidbody rigid;
+
+ public Transform hip;
+
+ // Start is called before the first frame update
+ void Start()
+ {
+ rigid = GetComponent<Rigidbody>();
+ }
+
+ // Update is called once per frame
+ void FixedUpdate()
+ {
+ Vector3 t = hip.TransformDirection(torque);
+ rigid.AddTorque(t, ForceMode.Acceleration);
+ }
+}
diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Debug/AddTorque.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Debug/AddTorque.cs.meta
new file mode 100644
index 0000000..05c8d47
--- /dev/null
+++ b/ActiveRagdoll/Assets/TABG/Scripts/Debug/AddTorque.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8e9bcfd8858bb43488466ff92689ce32
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant: