kneesox/NAK_CVR_Mods
1
0
Fork 0
mirror of https://github.com/NotAKidoS/NAK_CVR_Mods.git synced 2025-09-06 00:09:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

RCCVirtualSteeringWheel: tuning & prepare for release

Browse source
This commit is contained in:
NotAKidoS 2025-01-07 13:40:32 -06:00
parent 5d77eb61a5
commit 1282b2ca48
5 changed files with 57 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

20
RCCVirtualSteeringWheel/RCCVirtualSteeringWheel/Components/SteeringWheelPickup.cs
View file

@ -1,12 +1,16 @@
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.InteractionSystem.Base;
using ABI_RC.Core.Savior;
using UnityEngine;
namespace NAK.RCCVirtualSteeringWheel;
public class SteeringWheelPickup : Pickupable
{
#region Public Properties
internal SteeringWheelRoot root;
#region Pickupable Properties
public override bool DisallowTheft => true;
public override float MaxGrabDistance => 0.8f;
public override float MaxPushDistance => 0f;
@ -14,11 +18,12 @@ public class SteeringWheelPickup : Pickupable
public override bool IsObjectRotationAllowed => false;
public override bool IsObjectPushPullAllowed => false;
public override bool IsObjectUseAllowed => false;
public override bool CanPickup => IsPickupable && !IsPickedUp;
internal SteeringWheelRoot root;
#endregion
#region Public Methods
public override bool CanPickup => IsPickupable && !IsPickedUp && MetaPort.Instance.isUsingVr;
#endregion Pickupable Properties
#region Pickupable Methods
public override void OnUseDown(InteractionContext context) { }
public override void OnUseUp(InteractionContext context) { }
public override void OnFlingTowardsTarget(Vector3 target) { }
@ -32,5 +37,6 @@ public class SteeringWheelPickup : Pickupable
if (ControllerRay?.transform != null)
root.StopTrackingTransform(ControllerRay.transform);
}
#endregion
#endregion Pickupable Methods
}

80
RCCVirtualSteeringWheel/RCCVirtualSteeringWheel/Components/SteeringWheelRoot.cs
View file

@ -65,6 +65,7 @@ public class SteeringWheelRoot : MonoBehaviour
#region Public Properties
private bool IsWheelBeingHeld => _pickups[0].IsPickedUp || _pickups[1].IsPickedUp;
private bool IsWheelInactive => !IsWheelBeingHeld && _averageAngle == 0f;
#endregion Public Properties
@ -75,6 +76,8 @@ public class SteeringWheelRoot : MonoBehaviour
private float _originalSteeringWheelAngleMultiplier;
private float _originalSteeringWheelSign;
private bool _originalCounterSteer;
private bool _originalSteerSmoothing;
private readonly List<Transform> _trackedTransforms = new();
private readonly List<Vector3> _lastPositions = new();
@ -84,6 +87,7 @@ public class SteeringWheelRoot : MonoBehaviour
private float _averageAngle;
private float _timeWheelReleased = -1f;
private const float RETURN_TO_CENTER_DURATION = 2f;
private const float RETURN_START_DELAY = 0.1f;
#endregion Private Variables
@ -115,21 +119,7 @@ public class SteeringWheelRoot : MonoBehaviour
{
if (trans == null) return;
var currentAngle = 0f;
if (_isTracking)
{
var sum = 0f;
var validTransforms = 0;
for (var i = 0; i < _trackedTransforms.Count; i++)
if (_trackedTransforms[i] != null)
{
sum += _totalAngles[i];
validTransforms++;
}
if (validTransforms > 0)
currentAngle = sum / validTransforms;
}
var currentAngle = _isTracking ? CalculateAverageAngle(_trackedTransforms, _totalAngles) : 0f;
_trackedTransforms.Add(trans);
_lastPositions.Add(GetLocalPositionWithoutRotation(transform.position));
@ -142,7 +132,7 @@ public class SteeringWheelRoot : MonoBehaviour
var index = _trackedTransforms.IndexOf(trans);
if (index == -1) return;
var currentAverage = CalculateCurrentAverage();
var currentAverage = CalculateAverageAngle(_trackedTransforms, _totalAngles);
_trackedTransforms.RemoveAt(index);
_lastPositions.RemoveAt(index);
_totalAngles.RemoveAt(index);
@ -153,21 +143,7 @@ public class SteeringWheelRoot : MonoBehaviour
for (var i = 0; i < _totalAngles.Count; i++)
_totalAngles[i] = currentAverage;
}
private float CalculateCurrentAverage()
{
var sum = 0f;
var validTransforms = 0;
for (var i = 0; i < _trackedTransforms.Count; i++)
if (_trackedTransforms[i] != null)
{
sum += _totalAngles[i];
validTransforms++;
}
return validTransforms > 0 ? sum / validTransforms : 0f;
}
#endregion Public Methods
#region Private Methods
@ -176,8 +152,8 @@ public class SteeringWheelRoot : MonoBehaviour
{
_originalSteeringWheelAngleMultiplier = _carController.steeringWheelAngleMultiplier;
_originalSteeringWheelSign = Mathf.Sign(_originalSteeringWheelAngleMultiplier);
_carController.useCounterSteering = false;
_carController.useSteeringSmoother = false;
_originalCounterSteer = _carController.useCounterSteering;
_originalSteerSmoothing = _carController.useSteeringSmoother;
}
private void UpdateWheelState()
@ -191,27 +167,34 @@ public class SteeringWheelRoot : MonoBehaviour
private void UpdateSteeringBehavior()
{
UpdateSteeringMultiplier();
SetSteeringAssistsState(!IsWheelInactive);
if (IsWheelBeingHeld)
UpdateRotationTracking();
else if (_timeWheelReleased >= 0f)
HandleWheelReturn();
}
private void UpdateSteeringMultiplier()
private void SetSteeringAssistsState(bool shouldOverride)
{
_carController.steeringWheelAngleMultiplier = ModSettings.EntryOverrideSteeringRange.Value
_carController.useCounterSteering = !shouldOverride && _originalCounterSteer;
_carController.useSteeringSmoother = !shouldOverride && _originalSteerSmoothing;
_carController.steeringWheelAngleMultiplier = ModSettings.EntryOverrideSteeringRange.Value && shouldOverride
? ModSettings.EntryCustomSteeringRange.Value * _originalSteeringWheelSign / _carController.steerAngle
: _originalSteeringWheelAngleMultiplier;
}
private void HandleWheelReturn()
{
var timeSinceRelease = Time.time - _timeWheelReleased;
if (timeSinceRelease < RETURN_TO_CENTER_DURATION)
if (timeSinceRelease < RETURN_START_DELAY)
return;
var returnTime = timeSinceRelease - RETURN_START_DELAY;
if (returnTime < RETURN_TO_CENTER_DURATION)
{
var t = timeSinceRelease / RETURN_TO_CENTER_DURATION;
var t = returnTime / RETURN_TO_CENTER_DURATION;
_averageAngle = Mathf.Lerp(_averageAngle, 0f, t);
for (var i = 0; i < _totalAngles.Count; i++)
@ -267,7 +250,7 @@ public class SteeringWheelRoot : MonoBehaviour
Vector3 trackingAxis = GetSteeringWheelLocalAxis();
UpdateTransformAngles(trackingAxis);
UpdateAverageAngle();
_averageAngle = CalculateAverageAngle(_trackedTransforms, _totalAngles);
}
private void UpdateTransformAngles(Vector3 trackingAxis)
@ -293,20 +276,19 @@ public class SteeringWheelRoot : MonoBehaviour
}
}
private void UpdateAverageAngle()
private static float CalculateAverageAngle(List<Transform> transforms, List<float> angles)
{
var sumAngles = 0f;
var sum = 0f;
var validTransforms = 0;
for (var i = 0; i < _trackedTransforms.Count; i++)
for (var i = 0; i < transforms.Count; i++)
{
if (_trackedTransforms[i] == null) continue;
sumAngles += _totalAngles[i];
if (transforms[i] == null) continue;
sum += angles[i];
validTransforms++;
}
if (validTransforms > 0)
_averageAngle = sumAngles / validTransforms;
return validTransforms > 0 ? sum / validTransforms : 0f;
}
#endregion Private Methods

2
RCCVirtualSteeringWheel/RCCVirtualSteeringWheel/Util/BoneVertexBoundsUtility.cs
View file

@ -52,7 +52,7 @@ public class BoneVertexBoundsUtility : MonoBehaviour
/// Calculates the bounds of a transform based on:
/// - Children Renderers
/// - Skinned Mesh Weights
/// - Constrained Child Renderers & Skinned Mesh Weights
/// - Constrained Child Renderers & Skinned Mesh Weights (thanks Fearless)
/// </summary>
public static void CalculateBoneWeightedBounds(Transform bone, float weightThreshold, BoundsCalculationFlags flags, Action<BoundsResult> onComplete)
=> Instance.StartCoroutine(Instance.CalculateBoundsCoroutine(bone, weightThreshold, flags, onComplete));