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

[DesktopVRSwitch] Further cleanup

Browse source
This commit is contained in:
NotAKidoS 2023-06-21 14:25:56 -05:00
parent 6774c3ff6d
commit f89a41772b
5 changed files with 14 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

17
DesktopVRSwitch/VRModeSwitchManager.cs
View file

@ -44,10 +44,9 @@ public class VRModeSwitchManager : MonoBehaviour
}
// Settings
public bool _useWorldTransition = true;
public bool _reloadLocalAvatar = true;
// Info
public bool UseWorldTransition = true;
public bool ReloadLocalAvatar = true;
public bool SwitchInProgress { get; private set; }
void Awake()
@ -75,12 +74,12 @@ public class VRModeSwitchManager : MonoBehaviour
yield return null;
if (_useWorldTransition)
if (UseWorldTransition)
{ // start visual transition and wait for it to complete
WorldTransitionSystem.Instance.StartTransition();
yield return new WaitForSeconds(WorldTransitionSystem.Instance.CurrentInLength);
}
// Check if OpenVR is running
bool isUsingVr = IsInVR();
@ -100,7 +99,7 @@ public class VRModeSwitchManager : MonoBehaviour
if (isUsingVr != IsInVR())
{
// reload the local avatar
if (_reloadLocalAvatar)
if (ReloadLocalAvatar)
{
Utils.ClearLocalAvatar();
Utils.ReloadLocalAvatar();
@ -113,9 +112,9 @@ public class VRModeSwitchManager : MonoBehaviour
InvokeOnFailedSwitch(!isUsingVr);
}
if (_useWorldTransition)
if (UseWorldTransition)
{ // would be cool to have out length
WorldTransitionSystem.Instance.ContinueTransitionCoroutine();
WorldTransitionSystem.Instance.ContinueTransition();
yield return new WaitForSeconds(WorldTransitionSystem.Instance.CurrentInLength);
}

2
DesktopVRSwitch/VRModeTrackers/CVRWorldTracker.cs
View file

@ -25,7 +25,7 @@ public class CVRWorldTracker : VRModeTracker
CVRWorld.Instance.UpdatePostProcessing();
UpdateCVRDesktopCameraController();
}
private void UpdateCVRDesktopCameraController()
{
// Just making sure- Starting in VR will not call Start() as rig is disabled

10
DesktopVRSwitch/VRModeTrackers/CheckVRTracker.cs
View file

@ -16,14 +16,6 @@ public class CheckVRTracker : VRModeTracker
private void OnPostSwitch(bool intoVR)
{
CheckVR _checkVR = CheckVR.Instance;
if (_checkVR == null)
{
DesktopVRSwitch.Logger.Error("Error while getting CheckVR!");
return;
}
DesktopVRSwitch.Logger.Msg($"Setting CheckVR hasVrDeviceLoaded to {intoVR}.");
_checkVR.hasVrDeviceLoaded = intoVR;
CheckVR.Instance.hasVrDeviceLoaded = intoVR;
}
}

2
DesktopVRSwitch/VRModeTrackers/IKSystemTracker.cs
View file

@ -52,7 +52,7 @@ public class IKSystemTracker : VRModeTracker
BodySystem.isCalibratedAsFullBody = false;
BodySystem.isCalibrating = false;
BodySystem.isRecalibration = false;
// Make it so you don't instantly end up in FBT from Desktop
IKSystem.firstAvatarLoaded = DesktopVRSwitch.EntryEnterCalibrationOnSwitch.Value;

6
DesktopVRSwitch/VRModeTrackers/MovementSystemTracker.cs
View file

@ -35,7 +35,7 @@ public class MovementSystemTracker : VRModeTracker
MovementSystem.Instance.ChangeCrouch(false);
MovementSystem.Instance.ChangeProne(false);
MovementSystem.Instance.SetImmobilized(true);
}
private void OnFailedSwitch(bool intoVR)
@ -50,7 +50,7 @@ public class MovementSystemTracker : VRModeTracker
// Lazy
MelonLoader.MelonCoroutines.Start(TeleportFrameAfter(intoVR));
}
private IEnumerator TeleportFrameAfter(bool intoVR)
{
yield return null; // need to wait a frame
@ -66,7 +66,7 @@ public class MovementSystemTracker : VRModeTracker
MovementSystem.Instance.ChangeCrouch(false);
MovementSystem.Instance.ChangeProne(false);
MovementSystem.Instance.SetImmobilized(false);
yield break;
}
}