Few more 1.1.0 changes

- Disabled AO (major performance boost)
- Fix one enemy patch not being applied
- Bump BepInEx requirement
- Add eye tracking debug flag

Author: DaXcess

CHANGELOG.md

@@ -1,8 +1,11 @@
 # 1.1.0
 
--- BUGS --
+-- TODOs --
 
-- Flashlight not aligned (needs more testing)
+- LocalPlayerCamera maybe not being synced properly
+- Dead head spectate tip might have wrong controls
+- Compact canvas UI a little bit (on X axis) so it's easier to see
+- Grab map shoulder is only on one side (should be both), also no haptic feedback
 
 ## Detached Arms
 
@@ -39,10 +42,12 @@ You can now swap between VR mode and flatscreen mode by pressing the F8 button o
 - Added hotswapping in the main menu (F8)
 
 **Changes**:
+- The ceiling eye now darkens the world except for where the eye is (no more cheating hihi)
 - Removed the performance tab and replaced it with UI in the settings
 - Replaced the valuable discover overlay with a new 3D graphic (supports custom colors)
 - You now look at the enemy/object that killed you while the death animation plays (if possible)
-- Optimized the custom camera by adding a frame rate limiter
+- Slightly optimized the custom camera by adding a frame rate limiter
+- Optimized framerate by forcibly disabling ambient occlusion (20%-40% less render time)
 - Renamed "Dynamic Smooth Speed" to "Analog Smooth Turn"
 - Changed the minimum possible HUD height value to account for detached hands
 - The map tool can now also be grabbed from behind your head (near the shoulders)

Source/Experiments.cs

@@ -3,14 +3,15 @@
 using System.Collections.Generic;
 using System.Reflection.Emit;
 using HarmonyLib;
+using UnityEngine;
 
 namespace RepoXR;
 
 #if DEBUG
 internal static class Experiments
 {
     [HarmonyPatch(typeof(EnemyDirector), nameof(EnemyDirector.Awake))]
-    [HarmonyPostfix]
+    // [HarmonyPostfix]
     private static void FuckLolEnemy(EnemyDirector __instance)
     {
         // Difficulty 1 enemies
@@ -50,7 +51,7 @@ private static void FuckLolEnemy(EnemyDirector __instance)
     private static bool done;
 
     [HarmonyPatch(typeof(MenuButton), nameof(MenuButton.OnHovering))]
-    [HarmonyPrefix]
+    // [HarmonyPrefix]
     private static void ForceMap()
     {
         if (done)
@@ -70,22 +71,28 @@ private static void ForceMap()
 
         var boombox = museum.ValuablePresets[0].big[2];
 
-        for (var i = 0; i < museum.ValuablePresets.Count; i++)
+        foreach (var preset in museum.ValuablePresets)
         {
-            for (var j = 0; j < museum.ValuablePresets[i].big.Count; j++)
-                Logger.LogDebug($"[{museum.ValuablePresets[i]}] Big: {museum.ValuablePresets[i].big[j].prefabName}");
-            for (var j = 0; j < museum.ValuablePresets[i].medium.Count; j++)
-                Logger.LogDebug($"[{museum.ValuablePresets[i]}] Medium: {museum.ValuablePresets[i].medium[j].prefabName}");
-            for (var j = 0; j < museum.ValuablePresets[i].small.Count; j++)
-                Logger.LogDebug($"[{museum.ValuablePresets[i]}] Small: {museum.ValuablePresets[i].small[j].prefabName}");
-            for (var j = 0; j < museum.ValuablePresets[i].tall.Count; j++)
-                Logger.LogDebug($"[{museum.ValuablePresets[i]}] Tall: {museum.ValuablePresets[i].tall[j].prefabName}");
-            for (var j = 0; j < museum.ValuablePresets[i].tiny.Count; j++)
-                Logger.LogDebug($"[{museum.ValuablePresets[i]}] Tiny: {museum.ValuablePresets[i].tiny[j].prefabName}");
-            for (var j = 0; j < museum.ValuablePresets[i].veryTall.Count; j++)
-                Logger.LogDebug($"[{museum.ValuablePresets[i]}] Very Tall: {museum.ValuablePresets[i].veryTall[j].prefabName}");
-            for (var j = 0; j < museum.ValuablePresets[i].wide.Count; j++)
-                Logger.LogDebug($"[{museum.ValuablePresets[i]}] Wide: {museum.ValuablePresets[i].wide[j].prefabName}");
+            foreach (var val in preset.big)
+                Logger.LogDebug($"[{preset}] Big: {val.prefabName}");
+
+            foreach (var val in preset.medium)
+                Logger.LogDebug($"[{preset}] Medium: {val.prefabName}");
+
+            foreach (var val in preset.small)
+                Logger.LogDebug($"[{preset}] Small: {val.prefabName}");
+
+            foreach (var val in preset.tall)
+                Logger.LogDebug($"[{preset}] Tall: {val.prefabName}");
+
+            foreach (var val in preset.tiny)
+                Logger.LogDebug($"[{preset}] Tiny: {val.prefabName}");
+
+            foreach (var val in preset.veryTall)
+                Logger.LogDebug($"[{preset}] Very Tall: {val.prefabName}");
+
+            foreach (var val in preset.wide)
+                Logger.LogDebug($"[{preset}] Wide: {val.prefabName}");
         }
 
         museum.ValuablePresets[0].big.Clear();
@@ -153,5 +160,17 @@ private static void IAmASurgeonIMeanDeveloper(ref bool __result)
     {
         __result = true;
     }
+
+    [HarmonyPatch(typeof(DebugConsoleUI), nameof(DebugConsoleUI.Update))]
+    [HarmonyTranspiler]
+    [HarmonyDebug]
+    private static IEnumerable<CodeInstruction> KeepEnterKeyThing(IEnumerable<CodeInstruction> instructions)
+    {
+        return new CodeMatcher(instructions)
+            .MatchForward(false, new CodeMatch(OpCodes.Ldc_I4_S, (sbyte)9))
+            .SetOperandAndAdvance((sbyte)KeyCode.Return)
+            .SetOperandAndAdvance(AccessTools.Method(typeof(UnityEngine.Input), nameof(UnityEngine.Input.GetKeyDown), [typeof(KeyCode)]))
+            .InstructionEnumeration();
+    }
 }
 #endif

Source/Patches/Enemy/EnemyOoglyPatches.cs

@@ -8,8 +8,12 @@
 
 namespace RepoXR.Patches.Enemy;
 
+[RepoXRPatch]
 internal static class EnemyOoglyPatches
 {
+    /// <summary>
+    /// Oh you don't wanna know... oh the horror (look at oogly while being attached)
+    /// </summary>
     [HarmonyPatch(typeof(EnemyOogly), nameof(EnemyOogly.UpdateEvilEyesTimer))]
     [HarmonyTranspiler]
     private static IEnumerable<CodeInstruction> LookAtPatch(IEnumerable<CodeInstruction> instructions)

Source/Patches/Enemy/EnemySpinnyPatches.cs

@@ -7,14 +7,15 @@ namespace RepoXR.Patches.Enemy;
 internal static class EnemySpinnyPatches
 {
     /// <summary>
-    /// TODO: I don't yet know what this enemy does or looks like
+    /// Make sure to always look at the little gambling machine
     /// </summary>
     [HarmonyPatch(typeof(EnemySpinny), nameof(EnemySpinny.OverrideTargetPlayerCameraAim))]
     [HarmonyPrefix]
     private static bool OverrideVRCameraAim(EnemySpinny __instance, float _strenght, float _strenghtNoAim)
     {
+        // Always low impact, there's not really a need to force up-down look here
         VRCameraAim.instance.SetAimTargetSoft(__instance.spinnyWheel.position, 0.1f, _strenght, _strenghtNoAim,
-            __instance.gameObject, 100, Plugin.Config.ReducedAimImpact.Value);
+            __instance.gameObject, 100, true);
 
         return false;
     }

Source/Patches/HarmonyPatcher.cs

@@ -87,6 +87,7 @@ internal enum RepoXRPatchTarget
 /// https://github.com/BepInEx/HarmonyX/blob/master/Harmony/Internal/Patching/ILManipulator.cs#L322
 /// Licensed under MIT: https://github.com/BepInEx/HarmonyX/blob/master/LICENSE
 /// </summary>
+// TODO: It is unclear how BepInEx currently chooses Harmony versions, so we keep this patch in for now
 [RepoXRPatch(RepoXRPatchTarget.Universal)]
 [HarmonyPriority(Priority.First)]
 internal static class LeaveMyLeaveAlonePatch

Source/Patches/InputPatches.cs

@@ -190,10 +190,7 @@ private static bool KeyPullAndPush(ref float __result)
 
         var pull = Actions.Instance["Pull"].ReadValue<float>();
         if (pull > 0)
-        {
             __result = -pull;
-            return false;
-        }
 
         return false;
     }

Source/Patches/Player/PlayerEyesPatches.cs

@@ -19,8 +19,6 @@ private static void LookAtTransformEyeTracking(PlayerEyes __instance)
         if (!__instance.playerAvatar || __instance.playerAvatar.isLocal)
             return;
 
-        // TODO: Determine if certain occurrences in the game should override eye gaze
-
         if (!NetworkSystem.instance.GetNetworkPlayer(__instance.playerAvatar, out var player) || !player.EyeTracking)
             return;
 

Source/Player/VREyeTracking.cs

@@ -28,7 +28,9 @@ private void Awake()
 
         Plugin.Config.EnableEyeTracking.SettingChanged += OnEyeTrackingSettingChanged;
 
-        // TODO: Remove once tested with real hardware
+        if (!Plugin.Flags.HasFlag(Flags.EyeTrackingDebug))
+            return;
+
         debugCube = Instantiate(AssetCollection.Cube).transform;
         debugCube.GetComponent<MeshRenderer>().material.color = Color.blue;
         debugCube.GetComponent<Collider>().enabled = false;
@@ -101,6 +103,9 @@ private void Update()
 
         NetworkSystem.instance.UpdateEyeTracking(position);
 
+        if (!debugCube)
+            return;
+
         debugCube.position = position;
         debugCube.rotation = Quaternion.LookRotation(ray.direction);
     }

Source/Plugin.cs

@@ -21,20 +21,21 @@ public class Plugin : BaseUnityPlugin
     public const string PLUGIN_GUID = "io.daxcess.repoxr";
     public const string PLUGIN_NAME = "RepoXR";
     public const string PLUGIN_VERSION = "1.1.0";
-    
-    #if DEBUG
+
+#if DEBUG
     private const string SKIP_CHECKSUM_VAR = $"--repoxr-skip-checksum={PLUGIN_VERSION}-dev";
-    #else
+#else
     private const string SKIP_CHECKSUM_VAR = $"--repoxr-skip-checksum={PLUGIN_VERSION}";
-    #endif
+#endif
 
-    private const string HASHES_OVERRIDE_URL = "https://gist.githubusercontent.com/DaXcess/033e8ff514c505d2372e6f55a412dc00/raw/RepoXR%2520Game%2520Hashes";
+    private const string HASHES_OVERRIDE_URL =
+        "https://gist.githubusercontent.com/DaXcess/033e8ff514c505d2372e6f55a412dc00/raw/RepoXR%2520Game%2520Hashes";
 
     private readonly string[] GAME_ASSEMBLY_HASHES =
     [
         "137D6E8475DEA976831CC95D7F56F4B7DA311E52A57B4C420591A5122F25589F" // v0.3.0
     ];
-    
+
     public new static Config Config { get; private set; } = null!;
     public static Flags Flags { get; private set; } = 0;
 
@@ -105,14 +106,17 @@ private void Awake()
         }
 #endif
 
+        if (Environment.GetCommandLineArgs().Contains("--repoxr-debug-eyetracking", StringComparer.OrdinalIgnoreCase))
+            Flags |= Flags.EyeTrackingDebug;
+
         Native.BringGameWindowToFront();
         Config.SetupGlobalCallbacks();
 
         SceneManager.sceneLoaded += (scene, _) => UniversalEntrypoint.OnSceneLoad(scene.name);
     }
 
     public static string GetCommitHash()
-    {            
+    {
         try
         {
             var attribute = Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>();
@@ -131,17 +135,17 @@ private bool VerifyGameVersion()
     {
         var location = Path.Combine(Paths.ManagedPath, "Assembly-CSharp.dll");
         var hash = BitConverter.ToString(Utils.ComputeHash(File.ReadAllBytes(location))).Replace("-", "");
-        
+
         // Attempt local lookup first
         if (GAME_ASSEMBLY_HASHES.Contains(hash))
         {
             Logger.LogInfo("Game version verified using local hashes");
 
             return true;
         }
-        
+
         Logger.LogWarning("Failed to verify game version using local hashes, checking remotely for updated hashes...");
-        
+
         // Attempt to fetch a gist with known working assembly hashes
         // This allows me to keep RepoXR up and running if the game updates, without having to push an update out
         try
@@ -150,7 +154,7 @@ private bool VerifyGameVersion()
             var hashes = Utils.ParseConfig(contents);
 
             var found = false;
-            
+
             foreach (var versionedHash in hashes)
             {
                 try
@@ -206,8 +210,9 @@ private bool PreloadRuntimeDependencies()
         }
         catch (Exception ex)
         {
-            Logger.LogError($"Unexpected error occured while preloading runtime dependencies (incorrect folder structure?): {ex.Message}");
-            
+            Logger.LogError(
+                $"Unexpected error occured while preloading runtime dependencies (incorrect folder structure?): {ex.Message}");
+
             return false;
         }
 
@@ -231,7 +236,7 @@ public static void ToggleVR()
             Flags |= Flags.VR;
         }
     }
-    
+
     private static bool InitializeVR()
     {
         RepoXR.Logger.LogInfo("Loading VR...");
@@ -245,21 +250,23 @@ private static bool InitializeVR()
 
             return false;
         }
-        
-        if (OpenXR.GetActiveRuntimeName(out var name) && OpenXR.GetActiveRuntimeVersion(out var major, out var minor, out var patch))
+
+        if (OpenXR.GetActiveRuntimeName(out var name) &&
+            OpenXR.GetActiveRuntimeVersion(out var major, out var minor, out var patch))
             RepoXR.Logger.LogInfo($"OpenXR runtime being used: {name} ({major}.{minor}.{patch})");
         else
             RepoXR.Logger.LogError("Could not get OpenXR runtime info?");
 
         HarmonyPatcher.PatchVR();
-        
+
         RepoXR.Logger.LogDebug("Inserted VR patches using Harmony");
-        
+
         // Change render pipeline settings if needed
         XRSettings.eyeTextureResolutionScale = Config.CameraResolution.Value / 100f;
-        
+
         // Input settings
-        InputSystem.settings.backgroundBehavior = InputSettings.BackgroundBehavior.IgnoreFocus; // Prevent VR from getting disabled when losing focus
+        InputSystem.settings.backgroundBehavior =
+            InputSettings.BackgroundBehavior.IgnoreFocus; // Prevent VR from getting disabled when losing focus
 
         return true;
     }
@@ -276,5 +283,6 @@ public static MethodInfo GetConfigGetter()
 public enum Flags
 {
     VR = 1 << 0,
-    StartupFailed = 1 << 1
+    StartupFailed = 1 << 1,
+    EyeTrackingDebug = 1 << 2
 }

Source/Rendering/CustomPostProcessing.cs

@@ -1,4 +1,5 @@
 using UnityEngine;
+using UnityEngine.Rendering.PostProcessing;
 
 namespace RepoXR.Rendering;
 
@@ -22,6 +23,9 @@ private void Start()
 
         // Disable original shaders
         postProcessing.vignette.enabled.value = false;
+
+        // Disable ambient occlusion (big performance boost)
+        postProcessing.GetComponent<PostProcessVolume>().profile.GetSetting<AmbientOcclusion>().enabled.value = false;
     }
 
     private void Update()