Merge remote-tracking branch 'upstream/master'

Author: 989onan

CommunityBugFixCollection/Box.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace CommunityBugFixCollection
+{
+    internal sealed class Box<T>
+        where T : struct
+    {
+        public T Value { get; set; }
+
+        public Box(T value)
+        {
+            Value = value;
+        }
+
+        public Box()
+        { }
+
+        public static implicit operator Box<T>(T value) => new(value);
+
+        public static implicit operator T(Box<T> box) => box.Value;
+    }
+}

CommunityBugFixCollection/CommunityBugFixCollection.csproj

@@ -10,8 +10,8 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>CommunityBugFixCollection</PackageId>
     <Title>Community Bug-Fix Collection</Title>
-    <Authors>Banane9; Nytra; art0007i; LeCloutPanda; goat; __Choco__; LJ</Authors>
-    <Version>0.6.0-beta</Version>
+    <Authors>Banane9; Nytra; art0007i; LeCloutPanda; goat; __Choco__; LJ; 989onan</Authors>
+    <Version>0.7.0-beta</Version>
     <Description>This MonkeyLoader mod for Resonite that fixes various small Resonite-issues that are still open.</Description>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>

CommunityBugFixCollection/Contributors.cs

@@ -20,5 +20,7 @@ internal static class Contributors
         public static string[] LJ { get; } = ["LJ"];
 
         public static string[] Nytra { get; } = ["Nytra"];
+
+        public static string[] Onan { get; } = ["989onan"];
     }
 }

CommunityBugFixCollection/Locale/de.json

@@ -43,6 +43,7 @@
     "CommunityBugFixCollection.ReallyNoDestroyUndo.Description": "Sorgt dafür, dass die NoDestroyUndo Komponente tatsächlich verhindert, dass das Zerstören eines Objekts rückgängig gemacht werden kann.",
     "CommunityBugFixCollection.SmoothDraggables.Description": "Umgeht, dass Slider und Joints in Headless-Sessions verrutschen.",
     "CommunityBugFixCollection.TiltedUIAlignment.Description": "Kippt die UI-fokussierte Kamera, um UIX-Renderprobleme zum umgehen.",
+    "CommunityBugFixCollection.SteamVRFocusResolutionScale.Description": "Verhindert, dass das SteamVR Unity Plugin die Renderauflösung dauerhaft verringert, wenn ein Fokusevent verpasst wird.",
     "CommunityBugFixCollection.StationaryGrabWorldActivation.Description": "Verhindert, dass die Welt-Greifen Fortbewegung den Spieler bei jeder Aktivierung bewegt.",
     "CommunityBugFixCollection.ValidQuaternionInputs.Description": "Lässt das ProtoFlux-Tool valide float und double Quaternions spawnen.",
     "CommunityBugFixCollection.ValueModDecimal.Description": "Fügt eine Nullprüfung bei der Decimal ValueMod ProtoFlux Node hinzu, um einen Crash bei der Teilung durch Null zu verhindern.",

CommunityBugFixCollection/Locale/en.json

@@ -49,6 +49,7 @@
     "CommunityBugFixCollection.ReallyNoDestroyUndo.Description": "Makes the NoDestroyUndo component actually prevent undoing destroying something.",
     "CommunityBugFixCollection.SmoothDraggables.Description": "Workaround for Sliders and Joints snapping in sessions hosted by a headless.",
     "CommunityBugFixCollection.StationaryGrabWorldActivation.Description": "Stops the Grab World Locomotion from moving the player with each activiation.",
+    "CommunityBugFixCollection.SteamVRFocusResolutionScale.Description": "Prevents the SteamVR Unity plugin from permanently lowering the render resolution when a focus event is missed.",
     "CommunityBugFixCollection.TiltedUIAlignment.Description": "Tilts the UI-Focus camera to work around UIX rendering issues.",
     "CommunityBugFixCollection.ValidQuaternionInputs.Description": "Makes the ProtoFlux Tool spawn valid float and double quaternion inputs.",
     "CommunityBugFixCollection.ValueModDecimal.Description": "Adds a zero check to the Decimal ValueMod ProtoFlux node to prevent DIV/0 crashes.",

CommunityBugFixCollection/PauseAnimatorUpdates.cs

@@ -11,7 +11,9 @@ namespace CommunityBugFixCollection
     [HarmonyPatch(typeof(Animator), nameof(Animator.OnCommonUpdate))]
     internal sealed class PauseAnimatorUpdates : ResoniteBugFixMonkey<PauseAnimatorUpdates>
     {
-        public override IEnumerable<string> Authors => Contributors.Banane9;
+        private static readonly ConditionalWeakTable<Animator, Box<float>> _lastPositionByAnimator = new();
+
+        public override IEnumerable<string> Authors { get; } = [.. Contributors.Banane9, .. Contributors.Onan];
 
         private class Float
         {
@@ -41,11 +43,17 @@ private static bool Prefix(Animator __instance)
             if (!__instance._fieldMappersValid)
                 __instance.GenerateFieldMappers();
 
+            if (!_lastPositionByAnimator.TryGetValue(__instance, out var lastPosition))
+            {
+                // Make sure that initial state is always applied,
+                // since playback position can't be < 0
+                lastPosition = -1;
+                _lastPositionByAnimator.Add(__instance, lastPosition);
+            }
 
-            if (_hasChangedPlayhead.GetOrCreateValue(__instance).Value != __instance._playback.Position)
+            if (lastPosition != __instance.Position)
             {
-                var position = __instance.Position;
-                _hasChangedPlayhead.GetOrCreateValue(__instance).Value = __instance.Position;
+                var position = lastPosition.Value = __instance.Position;
 
                 foreach (var fieldMapper in __instance._fieldMappers)
                     fieldMapper.Set(position);

…ollection/SteamVrFocusResolutionScale.cs …ollection/SteamVRFocusResolutionScale.csCommunityBugFixCollection/SteamVrFocusResolutionScale.cs renamed to CommunityBugFixCollection/SteamVRFocusResolutionScale.cs CommunityBugFixCollection/SteamVrFocusResolutionScale.cs renamed to CommunityBugFixCollection/SteamVRFocusResolutionScale.cs

@@ -1,29 +1,28 @@
 using HarmonyLib;
-using MonkeyLoader.Resonite;
 using System.Collections.Generic;
 
 namespace CommunityBugFixCollection
 {
-    [HarmonyPatchCategory(nameof(SteamVrFocusResolutionScale))]
     [HarmonyPatch("Valve.VR.SteamVR_Render", "OnInputFocus")]
-    internal sealed class SteamVrFocusResolutionScale : ResoniteBugFixMonkey<SteamVrFocusResolutionScale>
+    [HarmonyPatchCategory(nameof(SteamVRFocusResolutionScale))]
+    internal sealed class SteamVRFocusResolutionScale : ResoniteBugFixMonkey<SteamVRFocusResolutionScale>
     {
-        public override IEnumerable<string> Authors => Contributors.Goat;
-        
-        // SteamVR_Render is treated as a singleton in SteamVR and initialized once from SteamVRDriver through SteamVR.Initialize() 
+        // SteamVR_Render is treated as a singleton in SteamVR and initialized once from SteamVRDriver through SteamVR.Initialize()
         private static bool _lastInputFocus = false;
-        
+
+        public override IEnumerable<string> Authors => Contributors.Goat;
+
         public static bool Prefix(bool hasFocus)
         {
             // Work around some broken logic in SteamVR focus handling
             // https://github.com/Yellow-Dog-Man/Resonite-Issues/issues/2337#issuecomment-3025681468
             // https://github.com/ValveSoftware/steamvr_unity_plugin/blob/056c82369d78f253af8cefcae9b289efd69bd960/Assets/SteamVR/Scripts/SteamVR_Render.cs#L237-L262
             if (Enabled && !hasFocus && !_lastInputFocus)
             {
-                Logger.Trace(() => "Dropping redundant OnInputFocus call");
+                Logger.Trace(() => "Dropping redundant OnInputFocus unfocus call!");
                 return false;
             }
-            
+
             _lastInputFocus = hasFocus;
             return true;
         }