diff --git a/DesktopVRSwitch/Main.cs b/DesktopVRSwitch/Main.cs index 548df04..fe0b386 100644 --- a/DesktopVRSwitch/Main.cs +++ b/DesktopVRSwitch/Main.cs @@ -70,25 +70,21 @@ public class DesktopVRSwitch : MelonMod //CVR_MovementSystem.Instance.isVr = true; //MelonLogger.Msg("Set CVR_MovementSystem isVR to false."); - yield return new WaitForSeconds(0.5f); + yield return new WaitForSeconds(1); + CVRInputManager.Instance.reload = true; - //CVRInputManager.Instance.inputEnabled = true; - //CVRInputManager.Instance.blockedByUi = false; - //CVRInputManager.Instance.independentHeadToggle = false; - //MelonLogger.Msg("Set CVRInputManager reload to true. Input should reload next frame..."); + CVRInputManager.Instance.inputEnabled = true; + CVRInputManager.Instance.blockedByUi = false; + CVRInputManager.Instance.independentHeadToggle = false; + MelonLogger.Msg("Set CVRInputManager reload to true. Input should reload next frame..."); - yield return new WaitForSeconds(1f); - - CVRInputManager.Instance.reload = true; - - yield return new WaitForSeconds(0.5f); + yield return new WaitForSeconds(1); XRSettings.enabled = false; - PlayerSetup.Instance.Invoke("CalibrateAvatar", 0f); - MelonLogger.Msg("Invoked CalibrateAvatar() on PlayerSetup.Instance."); - //ViewManager.Instance.VrInputChanged(true); + PlayerSetup.Instance.ReCalibrateAvatar(); + MelonLogger.Msg("Called ReCalibrateAvatar() on PlayerSetup.Instance."); } else { @@ -131,22 +127,20 @@ public class DesktopVRSwitch : MelonMod //CVR_MovementSystem.Instance.isVr = true; //MelonLogger.Msg("Set CVR_MovementSystem isVR to false."); - yield return new WaitForSeconds(0.5f); + yield return new WaitForSeconds(1); CVRInputManager.Instance.reload = true; - //CVRInputManager.Instance.inputEnabled = true; - //CVRInputManager.Instance.blockedByUi = false; - //CVRInputManager.Instance.independentHeadToggle = false; - //MelonLogger.Msg("Set CVRInputManager reload to true. Input should reload next frame..."); + CVRInputManager.Instance.inputEnabled = true; + CVRInputManager.Instance.blockedByUi = false; + CVRInputManager.Instance.independentHeadToggle = false; + MelonLogger.Msg("Set CVRInputManager reload to true. Input should reload next frame..."); yield return new WaitForSeconds(1f); CVRInputManager.Instance.reload = true; - //PlayerSetup.Instance.Invoke("CalibrateAvatar", 0f); - //MelonLogger.Msg("Invoked CalibrateAvatar() on PlayerSetup.Instance."); - - //ViewManager.Instance.VrInputChanged(true); + PlayerSetup.Instance.ReCalibrateAvatar(); + MelonLogger.Msg("Called ReCalibrateAvatar() on PlayerSetup.Instance."); } yield return null; diff --git a/DesktopVRSwitch/format.json b/DesktopVRSwitch/format.json new file mode 100644 index 0000000..cca5e49 --- /dev/null +++ b/DesktopVRSwitch/format.json @@ -0,0 +1,23 @@ +{ + "_id": 95, + "name": "DesktopVRSwitch", + "modversion": "1.1.0", + "gameversion": "2022r168", + "loaderversion": "0.5.4", + "modtype": "Mod", + "author": "NotAKidoS", + "description": "Corrects MM and QM position when avatar is scaled.\nAdditional option to scale player collision.", + "searchtags": [ + "menu", + "scale", + "avatarscale", + "slider" + ], + "requirements": [ + "None" + ], + "downloadlink": "https://github.com/NotAKidOnSteam/DesktopVRSwitch/releases/download/r2/DesktopVRSwitch.dll", + "sourcelink": "https://github.com/NotAKidOnSteam/DesktopVRSwitch/", + "changelog": "Added option to scale player collision. Fixed some VR specific issues.", + "embedcolor": "804221" +} \ No newline at end of file