Skip to content

Commit f7fbf82

Browse files
committed
Add InvertY option
1 parent f5f3582 commit f7fbf82

File tree

6 files changed

+17
-11
lines changed

6 files changed

+17
-11
lines changed

SiraUtil/Tools/FPFC/CameraController.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ internal class CameraController : MonoBehaviour
1515
{
1616
private readonly CameraState targetCameraState = new(new Vector3(0, 1.7f, 0), Quaternion.identity);
1717

18-
private readonly bool invertY = true;
19-
2018
private IFPFCManager? _fpfcManager;
2119
private List<IFPFCListener> _fpfcListeners = null!;
2220
private IMenuControllerAccessor? _menuControllerAccessor;
@@ -27,9 +25,9 @@ internal class CameraController : MonoBehaviour
2725

2826
private StereoTargetEyeMask _initialStereoTargetEyeMask;
2927

30-
public float MouseSensitivity { get; set; } = 5f;
31-
32-
public float MoveSensitivity { get; set; } = 3f;
28+
private float mouseSensitivity = 5f;
29+
private float moveSensitivity = 3f;
30+
private bool invertY = true;
3331

3432
[Inject]
3533
[UsedImplicitly]
@@ -85,7 +83,7 @@ private void OnBeforeUpdate()
8583
return;
8684
}
8785

88-
Vector2 mouseMovement = 0.05f * MouseSensitivity * GetInputLookRotation();
86+
Vector2 mouseMovement = 0.05f * mouseSensitivity * GetInputLookRotation();
8987

9088
if (invertY)
9189
{
@@ -95,7 +93,7 @@ private void OnBeforeUpdate()
9593
targetCameraState.Yaw += mouseMovement.x;
9694
targetCameraState.Pitch += mouseMovement.y;
9795

98-
Vector3 translation = Time.deltaTime * MoveSensitivity * GetInputTranslationDirection(targetCameraState.Rotation);
96+
Vector3 translation = Time.deltaTime * moveSensitivity * GetInputTranslationDirection(targetCameraState.Rotation);
9997
targetCameraState.Position += translation;
10098

10199
ApplyCameraState();
@@ -166,8 +164,9 @@ private void OnFpfcSettingsPropertyChanged(object sender, PropertyChangedEventAr
166164

167165
private void UpdateSettings()
168166
{
169-
MoveSensitivity = _fpfcManager!.MoveSensitivity;
170-
MouseSensitivity = _fpfcManager.MouseSensitivity * 0.75f;
167+
moveSensitivity = _fpfcManager!.MoveSensitivity;
168+
mouseSensitivity = _fpfcManager.MouseSensitivity * 0.75f;
169+
invertY = _fpfcManager.InvertY;
171170
}
172171

173172
private void UpdateState()

SiraUtil/Tools/FPFC/FPFCOptions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ internal class FPFCOptions
1818

1919
public virtual float MouseSensitivity { get; set; } = 5f;
2020

21+
public virtual bool InvertY { get; set; } = true;
22+
2123
[UseConverter(typeof(EnumConverter<KeyCode>))]
2224
public virtual KeyCode ToggleKeyCode { get; set; } = KeyCode.G;
2325

SiraUtil/Tools/FPFC/FPFCSettingsController.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ internal class FPFCSettingsController : IFPFCManager, IFPFCSettings, IInitializa
2525
public float FOV => _fpfcOptions.CameraFOV;
2626
public float MoveSensitivity => _fpfcOptions.MoveSensitivity;
2727
public float MouseSensitivity => _fpfcOptions.MouseSensitivity;
28+
public bool InvertY => _fpfcOptions.InvertY;
2829

2930
public bool Enabled
3031
{

SiraUtil/Tools/FPFC/IFPFCManager.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ internal interface IFPFCManager : IFPFCSettings
88

99
new float MouseSensitivity { get; }
1010

11+
bool InvertY { get; }
12+
1113
new bool LockViewOnDisable { get; }
1214

1315
new bool LimitFrameRate { get; }

SiraUtil/Tools/FPFC/IFPFCSettings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ public interface IFPFCSettings : INotifyPropertyChanged
2525
bool Active { get; }
2626

2727
/// <summary>
28-
/// The arbituary move sensitivity.
28+
/// The arbitrary move sensitivity.
2929
/// </summary>
3030
[Obsolete("To be removed with no alternative.")]
3131
float MoveSensitivity { get; }
3232

3333
/// <summary>
34-
/// The arbituary mouse sensitivity.
34+
/// The arbitrary mouse sensitivity.
3535
/// </summary>
3636
[Obsolete("To be removed with no alternative.")]
3737
float MouseSensitivity { get; }

SiraUtil/Tools/FPFC/NoFPFCSettings.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ public bool Enabled
1919

2020
public float MouseSensitivity => default;
2121

22+
public bool InvertY => default;
23+
2224
public bool Ignore => default;
2325

2426
public bool LockViewOnDisable => false;

0 commit comments

Comments
 (0)