From 4daf6c2bc8c961ffb01a873cfc9b50ec6cc8584c Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Fri, 17 Feb 2023 06:55:15 -0600 Subject: [PATCH 1/5] Update README.md --- README.md | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 4137184..6e7bbc4 100644 --- a/README.md +++ b/README.md @@ -3,31 +3,20 @@ Allows you to switch between Desktop and VR with a keybind. Press Control + F6 to switch. -While this mod is a nice convienence feature to have access to, not every chillout system or mod is built to support it. Keep in mind there **will be issues**, so don't get mad if you do end up having to restart. **:stare:** +## There are two versions of this mod! +**DesktopVRSwitch** is built for the Stable branch of ChilloutVR. (OpenVR) -Please take a look at the table below for what may not function as intended after switch. A lot of them can be remedied by rejoining your current instance. +**DesktopXRSwitch** is built for the Experimental branch of ChilloutVR (OpenXR) -| Function | Working | Note | -| ------------- | ------------- | ------------- | -| Discord/Steam RPC | None | Rich Presence will report the first mode you launched in. (might correct on world change) | -| CVRPickupObject | None | Pickups will use the grip origin set during spawn. The game overrides the default VR origin with [Desktop] origin if available, so I cannot revert to VR origins when switching from Desktop. | -| CVRWorld UpdatePostProcessing | Not Implemented | GraphicsAO and other specific post processing settings are not currently set on switch. | -| SceneLoaded worldCamera | Not Implemented | World-set camera settings are not currently set for both Desktop & VR cameras. | -| ControllerRay vrActive | Not Sure | I haven't had any issues with this, so I haven't bothered looking into it. | -| CVRWorld CopyRefCamValues | Not Implemented | This may not cause issues, but farclip is not set on the opposite modes transition effects when you load a world. | -| CameraFacingObject | Maybe | All CameraFacingObject behaviors have their camera changed to the active main camera on switch. Not sure if this is a good solution, but required for nameplates to face your viewpoint. | -| CoHtmlHud | Yes | CoHtmlHud is parented to the active camera on switch. | -| HudOperations | Kind Of | HudOperations is set to use the correct gameobjects to show loading info on the bottom right of the hud, but it seems to not be placed correctly. | -| CheckVR | No | Not needed. We initialize SteamVR ourselves and MetaPort only checks it on Start. | -| MetaPort | Yes | This is the most important as everything checks here for VRMode. Some systems will cache VRMode on start though, which is where issues with switching occur. | -| PlayerSetup | Yes | Also highly important. PlayerSetup caches VRMode from MetaPort to run correct calibration. To prevent errors, a dummy VRIK component is created before running a quick calibration to prevent PlayerSetup from erroring when switching to VR. | -| MovementSystem | Yes | MovementSystem constantly checks MetaPort for VRMode each frame, so while it isn't directly needed I still set the cached VRMode to true. | -| CVRInputManager | Yes..? | We set CVRInputManager.reload to have input & menus reload next frame, but also set independentHeadToggle and others to false to prevent the game from locking head control. | -| GesturePlaneTest | Testing | GestureReconizer will use the original launch camera for reference, which means you cannot pull the camera out with gestures when switched. It is the only part of the game that makes a cached result from VRMode private, so I have to dick around with Traverse/Harmony. :stare: | +Once the Experimental branch of ChilloutVR hits Stable, the mod name will be changing from VR -> XR. -(an old clip from the first few tests, no longer using melonprefs as uiexpansionkit kinda gets nuked on menu reload) +--- -https://user-images.githubusercontent.com/37721153/192128515-5630f47b-63ed-45c5-b0eb-0aac46d23731.mp4 +There used to be a table here detailing what did and did not work after switching, but I have worked to make that list unnecessary. + +Almost all base game features & systems that differ when in VR are now updated after switch. There are still very likely small quirks that need ironing out still, but everything major is now fixed and accounted for. + +Desktop to VR to FBT. Restarting SteamVR without restarting ChilloutVR. Reconnecting to SteamVR with a different VR headset. --- From 5b68aedeb41c9aa84334003620e4e8a8c514cecf Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Fri, 17 Feb 2023 06:57:49 -0600 Subject: [PATCH 2/5] Update README.md --- README.md | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6e7bbc4..dd02c1b 100644 --- a/README.md +++ b/README.md @@ -3,20 +3,28 @@ Allows you to switch between Desktop and VR with a keybind. Press Control + F6 to switch. -## There are two versions of this mod! -**DesktopVRSwitch** is built for the Stable branch of ChilloutVR. (OpenVR) - -**DesktopXRSwitch** is built for the Experimental branch of ChilloutVR (OpenXR) - -Once the Experimental branch of ChilloutVR hits Stable, the mod name will be changing from VR -> XR. - --- There used to be a table here detailing what did and did not work after switching, but I have worked to make that list unnecessary. Almost all base game features & systems that differ when in VR are now updated after switch. There are still very likely small quirks that need ironing out still, but everything major is now fixed and accounted for. -Desktop to VR to FBT. Restarting SteamVR without restarting ChilloutVR. Reconnecting to SteamVR with a different VR headset. + +**Things that have been tested.** +* Desktop to VR to FBT to Desktop. +* Restarting SteamVR without restarting ChilloutVR. +* Reentering VR with different controllers. (Touch to Knuckles) + +**Things that have not been tested** +* Reconnecting to SteamVR with a different VR headset. + + +## There are two versions of this mod! +**DesktopVRSwitch** is built for the Stable branch of ChilloutVR. (OpenVR) + +**DesktopXRSwitch** is built for the Experimental branch of ChilloutVR (OpenXR) + +Once the Experimental branch of ChilloutVR hits Stable, the mod name will be changing from VR -> XR. --- From 1adc95c696417aa319c1454cb39a694b3448a321 Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Fri, 17 Feb 2023 06:58:56 -0600 Subject: [PATCH 3/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dd02c1b..df2dd8b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Press Control + F6 to switch. There used to be a table here detailing what did and did not work after switching, but I have worked to make that list unnecessary. -Almost all base game features & systems that differ when in VR are now updated after switch. There are still very likely small quirks that need ironing out still, but everything major is now fixed and accounted for. +Almost all base game features & systems that differ when in VR are now updated after switch. There are still very likely small quirks that need ironing out still, but everything major is now fixed and accounted for. If you attempt to switch, SteamVR should automatically be launched if an HMD is connected and not already running. **Things that have been tested.** From ae7daa203ec4f70881e516c970b533baee6f20a6 Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Fri, 17 Feb 2023 06:59:19 -0600 Subject: [PATCH 4/5] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index df2dd8b..83cf9d4 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,9 @@ Press Control + F6 to switch. There used to be a table here detailing what did and did not work after switching, but I have worked to make that list unnecessary. -Almost all base game features & systems that differ when in VR are now updated after switch. There are still very likely small quirks that need ironing out still, but everything major is now fixed and accounted for. If you attempt to switch, SteamVR should automatically be launched if an HMD is connected and not already running. +Almost all base game features & systems that differ when in VR are now updated after switch. There are still very likely small quirks that need ironing out still, but everything major is now fixed and accounted for. + +When you attempt to switch, SteamVR should automatically be launched if an HMD is connected and not already running. **Things that have been tested.** From 1ac61b1dd2dcd26deb7b79dcf236b44448287506 Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Fri, 17 Feb 2023 06:59:45 -0600 Subject: [PATCH 5/5] Update README.md --- README.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/README.md b/README.md index 83cf9d4..28c904b 100644 --- a/README.md +++ b/README.md @@ -9,18 +9,6 @@ There used to be a table here detailing what did and did not work after switchin Almost all base game features & systems that differ when in VR are now updated after switch. There are still very likely small quirks that need ironing out still, but everything major is now fixed and accounted for. -When you attempt to switch, SteamVR should automatically be launched if an HMD is connected and not already running. - - -**Things that have been tested.** -* Desktop to VR to FBT to Desktop. -* Restarting SteamVR without restarting ChilloutVR. -* Reentering VR with different controllers. (Touch to Knuckles) - -**Things that have not been tested** -* Reconnecting to SteamVR with a different VR headset. - - ## There are two versions of this mod! **DesktopVRSwitch** is built for the Stable branch of ChilloutVR. (OpenVR)