Merge pull request #127 from amazingalek/dev

Input, VR, Steam
ow-mods · Jun 28, 2020 · bd3f7cc · bd3f7cc
2 parents 81f7164 + fbb3165
commit bd3f7cc
Show file tree

Hide file tree

Showing 59 changed files with 2,633 additions and 138 deletions.
diff --git a/OWML.Common/IModHelper.cs b/OWML.Common/IModHelper.cs
@@ -14,6 +14,7 @@ public interface IModHelper
         IModManifest Manifest { get; }
         IModConfig Config { get; }
         IOwmlConfig OwmlConfig { get; }
+        IModInputHandler Input { get; }
         IModInteraction Interaction { get; }
     }
 }
diff --git a/OWML.Common/IModInputCombination.cs b/OWML.Common/IModInputCombination.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.ObjectModel;
+using UnityEngine;
+
+namespace OWML.Common
+{
+    public interface IModInputCombination
+    {
+        float LastPressedMoment { get; }
+        float PressDuration { get; }
+        string ModName { get; }
+        string Name { get; }
+        string FullName { get; }
+        ReadOnlyCollection<KeyCode> Singles { get; }
+        ReadOnlyCollection<long> Hashes { get; }
+        bool IsFirst { get; }
+
+        void InternalSetPressed(bool isPressed = true);
+    }
+}
diff --git a/OWML.Common/IModInputHandler.cs b/OWML.Common/IModInputHandler.cs
@@ -0,0 +1,16 @@
+namespace OWML.Common
+{
+    public interface IModInputHandler
+    {
+        IModInputCombination RegisterCombination(IModBehaviour mod, string name, string combination);
+        void UnregisterCombination(IModInputCombination combo);
+        bool IsPressedExact(IModInputCombination combo);
+        bool IsNewlyPressedExact(IModInputCombination combo);
+        bool WasTappedExact(IModInputCombination combo);
+        bool WasNewlyReleasedExact(IModInputCombination combo);
+        bool IsPressed(IModInputCombination combo);
+        bool IsNewlyPressed(IModInputCombination combo);
+        bool WasTapped(IModInputCombination combo);
+        bool WasNewlyReleased(IModInputCombination combo);
+    }
+}
diff --git a/OWML.Common/IOwmlConfig.cs b/OWML.Common/IOwmlConfig.cs
@@ -11,5 +11,6 @@ public interface IOwmlConfig
         string OutputFilePath { get; }
         string LogFilePath { get; }
         bool Verbose { get; }
+        bool BlockInput { get; }
     }
 }
diff --git a/OWML.Common/Menus/IModComboInput.cs b/OWML.Common/Menus/IModComboInput.cs
@@ -0,0 +1,8 @@
+namespace OWML.Common.Menus
+{
+    public interface IModComboInput : IModInput<string>
+    {
+        IModComboInput Copy();
+        IModComboInput Copy(string key);
+    }
+}
diff --git a/OWML.Common/Menus/IModConfigMenu.cs b/OWML.Common/Menus/IModConfigMenu.cs
@@ -5,6 +5,6 @@ public interface IModConfigMenu : IModPopupMenu
         IModData ModData { get; }
         IModBehaviour Mod { get; }
 
-        void Initialize(Menu modMenuCopy, IModToggleInput toggleTemplate, IModSliderInput sliderTemplate, IModTextInput textInputTemplate, IModNumberInput numberInputTemplate);
+        void Initialize(Menu modMenuCopy, IModToggleInput toggleTemplate, IModSliderInput sliderTemplate, IModTextInput textInputTemplate, IModNumberInput numberInputTemplate, IModComboInput comboInputTemplate);
     }
 }
diff --git a/OWML.Common/Menus/IModLayoutButton.cs b/OWML.Common/Menus/IModLayoutButton.cs
@@ -0,0 +1,33 @@
+using System;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace OWML.Common.Menus
+{
+    public interface IModLayoutButton
+    {
+        event Action OnClick;
+        HorizontalLayoutGroup LayoutGroup { get; }
+        int Index { get; set; }
+        Button Button { get; }
+        void UpdateState();
+        void Initialize(IModMenu menu);
+
+        IModLayoutButton Copy();
+        IModLayoutButton Copy(int index);
+
+        IModLayoutButton Duplicate();
+        IModLayoutButton Duplicate(int index);
+
+        IModLayoutButton Replace();
+        IModLayoutButton Replace(int index);
+
+        void Show();
+        void Hide();
+
+        void SetControllerCommand(SingleAxisCommand inputCommand);
+
+        void AddText(string text);
+        void AddPicture(Texture2D texture, float scale = 1.0f);
+    }
+}
diff --git a/OWML.Common/Menus/IModMenu.cs b/OWML.Common/Menus/IModMenu.cs
@@ -14,6 +14,8 @@ public interface IModMenu
         IModButton GetButton(string title);
         IModButton AddButton(IModButton button);
         IModButton AddButton(IModButton button, int index);
+        IModLayoutButton AddLayoutButton(IModLayoutButton button);
+        IModLayoutButton AddLayoutButton(IModLayoutButton button, int index);
 
         List<IModToggleInput> ToggleInputs { get; }
         IModToggleInput GetToggleInput(string title);

diff --git a/OWML.Common/Menus/IModPauseMenu.cs b/OWML.Common/Menus/IModPauseMenu.cs
@@ -3,7 +3,7 @@
     public interface IModPauseMenu : IModPopupMenu
     {
         IModTabbedMenu OptionsMenu { get; }
-        
+
         IModButton ResumeButton { get; }
         IModButton OptionsButton { get; }
         IModButton QuitButton { get; }

diff --git a/OWML.Common/OWML.Common.csproj b/OWML.Common/OWML.Common.csproj
@@ -38,7 +38,11 @@
     <Compile Include="IHarmonyHelper.cs" />
     <Compile Include="IModAssets.cs" />
     <Compile Include="IModAsset.cs" />
+    <Compile Include="IModInputCombination.cs" />
+    <Compile Include="IModInputHandler.cs" />
     <Compile Include="IModInteraction.cs" />
+    <Compile Include="Menus\IModLayoutButton.cs" />
+    <Compile Include="Menus\IModComboInput.cs" />
     <Compile Include="Menus\InputType.cs" />
     <Compile Include="Menus\IModButton.cs" />
     <Compile Include="IModConfig.cs" />

diff --git a/OWML.GameFinder/PathFinder.cs b/OWML.GameFinder/PathFinder.cs
@@ -17,9 +17,9 @@ public PathFinder(IOwmlConfig config, IModConsole writer)
         public string FindGamePath()
         {
             return FindPathWith<CurrentPathFinder>() ??
-                   FindPathWith<DefaultLocationFinder>() ??
-                   FindPathWith<EpicGameFinder>() ??
                    FindPathWith<SteamGameFinder>() ??
+                   FindPathWith<EpicGameFinder>() ??
+                   FindPathWith<DefaultLocationFinder>() ??
                    FindPathWith<PromptGameFinder>();
         }
 

diff --git a/OWML.Launcher/App.cs b/OWML.Launcher/App.cs
@@ -149,7 +149,14 @@ private void PatchGame(IList<IModData> mods)
             var vrMod = mods.FirstOrDefault(x => x.Config.RequireVR && x.Config.Enabled);
             var enableVR = vrMod != null;
             _writer.WriteLine(enableVR ? $"{vrMod.Manifest.UniqueName} requires VR." : "No mods require VR.");
-            _vrPatcher.PatchVR(enableVR);
+            try
+            {
+                _vrPatcher.PatchVR(enableVR);
+            }
+            catch (Exception ex)
+            {
+                _writer.WriteLine($"Error while applying VR patch: {ex}");
+            }
         }
 
         private void StartGame(string[] args)

diff --git a/OWML.Launcher/OWML.Config.json b/OWML.Launcher/OWML.Config.json
@@ -1,4 +1,5 @@
 {
   "gamePath": "C:/Program Files/Epic Games/OuterWilds",
-  "verbose": false
-}
+  "verbose": false,
+  "combinationsBlockInput" :  false
+}
diff --git a/OWML.Launcher/OWML.Manifest.json b/OWML.Launcher/OWML.Manifest.json
@@ -2,6 +2,6 @@
   "author": "Alek",
   "name": "OWML",
   "uniqueName": "Alek.OWML",
-  "version": "0.3.56",
+  "version": "0.3.57",
   "description": "The mod loader and mod framework for Outer Wilds"
 }
diff --git a/OWML.ModHelper.Events/ModEvents.cs b/OWML.ModHelper.Events/ModEvents.cs
@@ -16,7 +16,7 @@ public class ModEvents : IModEvents
         private readonly IHarmonyHelper _harmonyHelper;
         private readonly IModConsole _console;
         private readonly IModLogger _logger;
-        
+
         public ModEvents(IModLogger logger, IModConsole console, IHarmonyHelper harmonyHelper)
         {
             _logger = logger;

diff --git a/OWML.ModHelper.Input/BindingChangeListener.cs b/OWML.ModHelper.Input/BindingChangeListener.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Collections.Generic;
+using OWML.Common;
+using UnityEngine;
+
+namespace OWML.ModHelper.Input
+{
+    public class BindingChangeListener : MonoBehaviour
+    {
+        private ModInputHandler _inputHandler;
+        private bool _updateInputsNext, _updateInputs;
+
+        internal void Initialize(ModInputHandler inputHandler, IModEvents events)
+        {
+            _inputHandler = inputHandler;
+            events.Subscribe<TitleScreenManager>(Common.Events.AfterStart);
+            events.OnEvent += OnEvent;
+        }
+
+        private void OnEvent(MonoBehaviour behaviour, Common.Events ev)
+        {
+            if (behaviour.GetType() == typeof(TitleScreenManager) && ev == Common.Events.AfterStart)
+            {
+                _updateInputsNext = true;
+            }
+        }
+
+        private void Start()
+        {
+            DontDestroyOnLoad(gameObject);
+            GlobalMessenger.AddListener("KeyBindingsChanged", new Callback(PrepareForUpdate));
+        }
+
+        private void PrepareForUpdate()
+        {
+            _updateInputsNext = true;
+        }
+
+        private void Update()
+        {
+            if (_updateInputs)
+            {
+                _updateInputs = false;
+                UpdateInputs();
+            }
+            if (_updateInputsNext)
+            {
+                _updateInputs = true;
+                _updateInputsNext = false;
+            }
+        }
+
+        public void UpdateInputs()
+        {
+            _inputHandler.UpdateGamesBindings();
+        }
+    }
+}
diff --git a/OWML.ModHelper.Input/InputInterceptor.cs b/OWML.ModHelper.Input/InputInterceptor.cs
@@ -0,0 +1,74 @@
+using UnityEngine;
+using System.Collections.Generic;
+
+namespace OWML.ModHelper.Input
+{
+    internal class InputInterceptor
+    {
+        public static void SingleAxisUpdatePost(
+            SingleAxisCommand __instance,
+            ref float ____value,
+            List<KeyCode> ____posKeyCodes,
+            List<KeyCode> ____negKeyCodes
+        )
+        {
+            foreach (var key in ____posKeyCodes)
+            {
+                if (ModInputHandler.Instance.IsPressedAndIgnored(key))
+                {
+                    ____value = 0f;
+                }
+            }
+            foreach (var key in ____negKeyCodes)
+            {
+                if (ModInputHandler.Instance.IsPressedAndIgnored(key))
+                {
+                    ____value = 0f;
+                }
+            }
+        }
+
+        public static void DoubleAxisUpdatePost(
+            DoubleAxisCommand __instance,
+            ref Vector2 ____value,
+            List<KeyCode> ____posXKeyCodes,
+            List<KeyCode> ____negXKeyCodes,
+            List<KeyCode> ____posYKeyCodes,
+            List<KeyCode> ____negYKeyCodes
+        )
+        {
+            if (OWInput.UsingGamepad())
+            {
+                return;
+            }
+            foreach (var key in ____posXKeyCodes)
+            {
+                if (ModInputHandler.Instance.IsPressedAndIgnored(key))
+                {
+                    ____value.x = 0f;
+                }
+            }
+            foreach (var key in ____negXKeyCodes)
+            {
+                if (ModInputHandler.Instance.IsPressedAndIgnored(key))
+                {
+                    ____value.x = 0f;
+                }
+            }
+            foreach (var key in ____posYKeyCodes)
+            {
+                if (ModInputHandler.Instance.IsPressedAndIgnored(key))
+                {
+                    ____value.y = 0f;
+                }
+            }
+            foreach (var key in ____negYKeyCodes)
+            {
+                if (ModInputHandler.Instance.IsPressedAndIgnored(key))
+                {
+                    ____value.y = 0f;
+                }
+            }
+        }
+    }
+}