From 150e1e98d1c6866e0d1fa2abf042f71cc766ed8e Mon Sep 17 00:00:00 2001 From: chai <215380520@qq.com> Date: Tue, 16 Apr 2024 18:16:59 +0800 Subject: *misc --- .../Assets/TABG/Scripts/Camera/CameraMovement.cs | 37 ++-------------------- 1 file changed, 3 insertions(+), 34 deletions(-) (limited to 'ActiveRagdoll/Assets/TABG/Scripts/Camera') diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraMovement.cs b/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraMovement.cs index dd21770..08e274a 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraMovement.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraMovement.cs @@ -9,16 +9,14 @@ namespace Rigging.Cameras public class CameraMovement : MonoBehaviour { + public Player player; + public Camera camera; public Transform positionTarget; - //public Transform headPosition; - public Transform rotationTarget; - //public Transform bobberTarget; - private StandingDataHandler standingData; private float fallingValue; @@ -29,22 +27,12 @@ namespace Rigging.Cameras public bool ADS; - //public DamageEffects effects; - - //private WeaponHandler weaponHandler; - private Rigidbody hip; - //private HasControl hasControl; - - //private HeadCollisionHandler headCollisionHandler; - private MovementDataHandler movementData; private Rigidbody torso; - //private PlayerDeath death; - private Strength str; private Vector3 cameraCurrentRelativeADSPosition = Vector3.zero; @@ -56,21 +44,15 @@ namespace Rigging.Cameras private void Start() { torso = base.transform.root.GetComponentInChildren().GetComponent(); - //headCollisionHandler = base.transform.root.GetComponentInChildren(); standingData = base.transform.root.GetComponentInChildren(); movementData = base.transform.root.GetComponentInChildren(); - //weaponHandler = base.transform.GetComponentInParent(); camera = GetComponentInChildren(); - hip = base.transform.root.GetComponentInChildren().GetComponentInChildren(); - //hasControl = base.transform.root.GetComponent(); - //death = base.transform.root.GetComponent(); + hip = player.body.hip.rigidbody; str = base.transform.root.GetComponentInChildren(); - //effects = base.transform.root.GetComponent(); } private void LateUpdate() { - //headCollisionHandler.collisionValue = 0f; if (standingData.sinceLanded > 1f) { fallingValue = Mathf.Clamp(standingData.sinceGrounded - 0.5f, 0f, 10f) * 0.5f; @@ -101,21 +83,8 @@ namespace Rigging.Cameras private void Update() { - //if (hasControl.hasControl) - //{ - // ADSMovementPosition += movementADSVelocity * Time.deltaTime; - //} } - //private float GetPhysicsValue() - //{ - // float result = fallingEffectValue * 0.3f + (1f - str.strength) + effects.damageValue; - // if (death.dead) - // { - // result = 1f; - // } - // return result; - //} } } \ No newline at end of file -- cgit v1.1-26-g67d0