Merge pull request DaXcess#149 from DaXcess/main-menu-whack

Fix invisible pause menu
Lakatrazz · Jan 18, 2024 · 803ffdb · 803ffdb
2 parents ab4e6b3 + 0d924f5
commit 803ffdb
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/Docs/controls.md b/Docs/controls.md
@@ -2,7 +2,7 @@
 
 This VR mod divides the controls into two categories: **Lethal Company Controls** and **VR Controls**. The reason behind this is how they are implemented. **LC Controls** are replacing the built in controls of the game, by overriding the player input controller with them. The **VR Controls** however are exclusively used within the mod, and are not injected into the game's built in controls.
 
-## Default Lethal Company Inputs
+## Default LC Controls
 
 |      Action      | PC               | VR                | Notes                                                               |
 | :--------------: | ---------------- | ----------------- | ------------------------------------------------------------------- |

diff --git a/LCVR/OpenXR.cs b/LCVR/OpenXR.cs
@@ -42,7 +42,7 @@ public static bool GetDiagnosticReport(out OpenXRReport report)
 
             var sectionRegex = new Regex("^==== ([A-z0-9-_ ]+) ====$", RegexOptions.Multiline);
             var errorRegex = new Regex("^\\[FAILURE\\] [A-z]+: ([A-Z_]+) \\(\\d+x\\)$");
-            
+
             string raw = GenerateReport();
 
             var rawSections = sectionRegex.Split(raw).Skip(1).Select(v => v.Trim()).ToArray();
@@ -76,7 +76,7 @@ public static bool GetDiagnosticReport(out OpenXRReport report)
             var match = errorRegex.Match(section.Split('\n')[0].Trim());
             if (match == null)
                 return false;
-            
+
             var error = match.Groups[1].Value;
 
             report = new OpenXRReport(runtimeName, runtimeVersion, error);
@@ -119,7 +119,7 @@ public static string[] DetectOpenXRRuntimes()
                     var cbValueName = maxValueNameLength + 1;
 
                     int result = Native.RegEnumValue(hKey, i, valueName, ref cbValueName, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
-                    
+
                     if (result != 0)
                         return null;
 
@@ -171,6 +171,7 @@ public class OpenXRReport(string runtimeName, string runtimeVersion, string erro
             public string Error { get; } = error;
         }
 
+#pragma warning disable 0649
         [Serializable]
         private struct OpenXRRuntime
         {
@@ -182,5 +183,6 @@ private struct RuntimeInfo
         {
             public string name;
         }
+#pragma warning restore 0649
     }
 }
diff --git a/Patches/UIPatches.cs b/Patches/UIPatches.cs
@@ -119,6 +119,7 @@ private static void InitMenuScene()
 
             var canvasFollow = canvas.gameObject.AddComponent<CanvasTransformFollow>();
             canvasFollow.sourceTransform = uiCamera.transform;
+            canvasFollow.heightOffset = 1;
 
             // Allow canvas interactions using XR raycaster
 

diff --git a/Player/VRPlayer.cs b/Player/VRPlayer.cs
@@ -14,6 +14,7 @@
 using Microsoft.MixedReality.Toolkit.Experimental.UI;
 using LCVR.Patches;
 using HarmonyLib;
+using LCVR.UI;
 
 namespace LCVR.Player
 {
@@ -239,8 +240,8 @@ private IEnumerator RebuildRig()
 
             // Set up rigging
             var model = Find("ScavengerModel/metarig/ScavengerModelArmsOnly", true).gameObject;
-            var modelMetarig = Find("ScavengerModel/metarig/ScavengerModelArmsOnly/metarig", true); 
-            
+            var modelMetarig = Find("ScavengerModel/metarig/ScavengerModelArmsOnly/metarig", true);
+
             Find("ScavengerModel/metarig/ScavengerModelArmsOnly/metarig/spine.003/RigArms", true);
 
             var rigFollow = model.GetComponent<IKRigFollowVRRig>() ?? model.AddComponent<IKRigFollowVRRig>();
@@ -637,6 +638,8 @@ private void SwitchToUICamera()
             uiCamera.nearClipPlane = 0.01f;
             uiCamera.farClipPlane = 15f;
             uiCamera.enabled = true;
+
+            FindObjectsOfType<CanvasTransformFollow>().Do(follow => follow.ResetPosition(true));
         }
 
         private void SwitchToGameCamera()

diff --git a/UI/CanvasTransformFollow.cs b/UI/CanvasTransformFollow.cs
@@ -13,6 +13,7 @@ internal class CanvasTransformFollow : MonoBehaviour
         private InputAction resetPositionAction;
 
         public Transform sourceTransform;
+        public float heightOffset;
 
         private Quaternion targetRotation;
         private Vector3 targetPosition;
@@ -42,7 +43,7 @@ public void ResetPosition(bool force = false)
             var forward = rotation * Vector3.forward;
             var position = forward * CANVAS_DISTANCE;
 
-            targetPosition = new Vector3(position.x + sourceTransform.position.x, transform.position.y, position.z + sourceTransform.position.z);
+            targetPosition = new Vector3(position.x + sourceTransform.position.x, heightOffset, position.z + sourceTransform.position.z);
             targetRotation = Quaternion.Euler(0, sourceTransform.eulerAngles.y, 0);
 
             if (force)

diff --git a/UI/VRHUD.cs b/UI/VRHUD.cs
@@ -322,6 +322,7 @@ public void Initialize(VRPlayer player)
 
             var follow = spectateCanvas.gameObject.AddComponent<CanvasTransformFollow>();
             follow.sourceTransform = player.uiCamera.transform;
+            follow.heightOffset = -999;
 
             transform.localScale = Vector3.one * 0.0007f;