From 14ac81f2f2de2235608730ec9f11f2a2cf867ae5 Mon Sep 17 00:00:00 2001 From: Pascal Serrarens Date: Fri, 2 Jun 2023 12:45:53 +0200 Subject: [PATCH] Updated accessibility --- .../Scripts/HumanoidControl.cs | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/Runtime/HumanoidControl/Scripts/HumanoidControl.cs b/Runtime/HumanoidControl/Scripts/HumanoidControl.cs index d5aec28..60eb909 100644 --- a/Runtime/HumanoidControl/Scripts/HumanoidControl.cs +++ b/Runtime/HumanoidControl/Scripts/HumanoidControl.cs @@ -655,9 +655,9 @@ namespace Passer.Humanoid { return 0; } -#endregion + #endregion -#region Targets + #region Targets protected void NewTargetComponents() { #if pCEREBELLUM if (cerebellum == null) @@ -718,7 +718,7 @@ namespace Passer.Humanoid { rightFootTarget.MatchTargetsToAvatar(); } - private void UpdateTargetsAndMovements() { + protected void UpdateTargetsAndMovements() { CopyTargetsToRig(); UpdateTargets(); @@ -964,9 +964,9 @@ namespace Passer.Humanoid { }; } -#endregion + #endregion -#region Trackers + #region Trackers /// Use game controller input public bool gameControllerEnabled = true; @@ -1095,7 +1095,7 @@ namespace Passer.Humanoid { } } - private TraditionalDevice traditionalInput; + protected TraditionalDevice traditionalInput; protected void InitTrackers() { _trackers = new HumanoidTracker[] { @@ -1313,9 +1313,9 @@ namespace Passer.Humanoid { tracker.AdjustTracking(translation, rotation); } -#endregion + #endregion -#region Configuration + #region Configuration /// /// Scans the humanoid to retrieve all bones /// @@ -1328,9 +1328,9 @@ namespace Passer.Humanoid { leftFootTarget.RetrieveBones(); rightFootTarget.RetrieveBones(); } -#endregion + #endregion -#region Update + #region Update protected virtual void Update() { Controllers.Clear(); @@ -1365,9 +1365,9 @@ namespace Passer.Humanoid { Controllers.EndFrame(); } -#endregion + #endregion -#region Stop + #region Stop public void OnApplicationQuit() { #if hLEAP leap.StopTracker(); @@ -1391,11 +1391,11 @@ namespace Passer.Humanoid { optitrack.StopTracker(); #endif } -#endregion + #endregion -#region Destroy + #region Destroy -#endregion + #endregion public Vector3 up { get { @@ -1440,7 +1440,7 @@ namespace Passer.Humanoid { } } -#region Calibration + #region Calibration public void SetStartPosition() { } @@ -1469,9 +1469,9 @@ namespace Passer.Humanoid { } } -#endregion + #endregion -#region Pose + #region Pose protected virtual void UpdatePose() { if (pose != null) { @@ -1480,7 +1480,7 @@ namespace Passer.Humanoid { } } -#region Pose Event + #region Pose Event public delegate void OnHumanoidPose(HumanoidPose pose); public event OnHumanoidPose onHumanoidPose; @@ -1541,11 +1541,11 @@ namespace Passer.Humanoid { } } -#endregion + #endregion -#endregion + #endregion -#region Movement + #region Movement /// /// maximum forward speed in units(meters)/second @@ -1590,7 +1590,7 @@ namespace Passer.Humanoid { protected Vector3 inputMovement = Vector3.zero; -#region Input/API + #region Input/API /// /// maximum forward speed in units(meters)/second @@ -1811,9 +1811,9 @@ namespace Passer.Humanoid { } -#endregion + #endregion -#region Checks + #region Checks [HideInInspector] public Vector3 targetVelocity; @@ -1926,9 +1926,9 @@ namespace Passer.Humanoid { return distance * elapsedTime * elapsedTime + start; } -#endregion + #endregion -#region Collisions + #region Collisions public bool triggerEntered; public bool collided; @@ -2101,9 +2101,9 @@ namespace Passer.Humanoid { ); } -#endregion + #endregion -#region Ground + #region Ground /// /// The ground Transform on which the pawn is standing @@ -2264,9 +2264,9 @@ namespace Passer.Humanoid { lastGroundAngle = ground.eulerAngles.y; } -#endregion + #endregion -#region Body Pull + #region Body Pull protected virtual void CheckBodyPull() { if (!bodyPull) @@ -2305,12 +2305,12 @@ namespace Passer.Humanoid { transform.Translate(translation, Space.World); } -#endregion + #endregion [HideInInspector] private float lastTime; - private void CalculateVelocityAcceleration() { + protected virtual void CalculateVelocityAcceleration() { if (lastTime > 0) { float deltaTime = Time.time - lastTime; @@ -2344,7 +2344,7 @@ namespace Passer.Humanoid { lastHeadDirection = headTarget.neck.target.transform.eulerAngles.y; } -#region Animation + #region Animation private void PostAnimationCorrection() { @@ -2395,7 +2395,7 @@ namespace Passer.Humanoid { targetsRig.SetTrigger(parameterName); } -#endregion + #endregion [HideInInspector] private float lastLocalHipY; @@ -2416,7 +2416,7 @@ namespace Passer.Humanoid { lastLocalHipY = localHipY; } -#endregion Movement + #endregion Movement /// Gets the Real World GameObject for this Humanoid /// The root transform of the humanoid @@ -2484,7 +2484,7 @@ namespace Passer.Humanoid { // return footBase; //} -#region Networking + #region Networking /// Is true when this is a remote pawn /// Remote pawns are not controlled locally, but are controlled from another computer. @@ -2497,9 +2497,9 @@ namespace Passer.Humanoid { /// The local Id of this humanoid public int id = -1; -#endregion + #endregion -#region Humanoid store + #region Humanoid store private static HumanoidControl[] _allHumanoids = new HumanoidControl[0]; @@ -2606,7 +2606,7 @@ namespace Passer.Humanoid { screenPosition.y > 0 && screenPosition.y < camera.pixelHeight); } -#endregion + #endregion } }