jank ass fix for right clicking

Author: brian91292

CameraPlus/CameraPlus.csproj

@@ -32,6 +32,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="0Harmony">
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Beat Saber\Beat Saber_Data\Managed\0Harmony.dll</HintPath>
+    </Reference>
     <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Beat Saber\Beat Saber_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
@@ -103,6 +106,7 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Utilities.cs" />
+    <Compile Include="WindowOverridePatch.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

CameraPlus/CameraPlusBehaviour.cs

@@ -325,8 +325,7 @@ public virtual void SceneManager_activeSceneChanged(Scene from, Scene to)
                 return;
             }
 
-            var pointer = vrPointers[0];
-            if (pointer == null) return;
+            var pointer = to.name != "GameCore" ? vrPointers.First() : vrPointers.Last();
             if (_moverPointer) Destroy(_moverPointer);
             _moverPointer = pointer.gameObject.AddComponent<CameraMoverPointer>();
             _moverPointer.Init(this, _cameraCube);

CameraPlus/Plugin.cs

@@ -4,7 +4,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Windows.Forms;
+using Harmony;
 using IllusionPlugin;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -19,15 +21,27 @@ public class Plugin : IPlugin
         private bool _init;
         public static Plugin Instance { get; private set; }
         public string Name => "CameraPlus";
-        public string Version => "v3.2.3";
+        public string Version => "v3.2.4";
 
         public Action<Scene, Scene> ActiveSceneChanged;
+
+        private HarmonyInstance _harmony;
 
         public void OnApplicationStart()
         {
             if (_init) return;
             _init = true;
             Instance = this;
+
+            _harmony = HarmonyInstance.Create("com.brian91292.beatsaber.cameraplus");
+            try
+            {
+                _harmony.PatchAll(Assembly.GetExecutingAssembly());
+            }
+            catch (Exception ex)
+            {
+                Plugin.Log("Failed to apply harmony patches!");
+            }
 
             // Add our default cameraplus camera
             CameraUtilities.AddNewCamera("cameraplus");
@@ -61,6 +75,8 @@ IEnumerator DelayedActiveSceneChanged(Scene from, Scene to)
         public void OnApplicationQuit()
         {
             SceneManager.activeSceneChanged -= SceneManager_activeSceneChanged;
+
+            _harmony.UnpatchAll("com.brian91292.beatsaber.cameraplus");
         }
 
         public void OnLevelWasLoaded(int level)

CameraPlus/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly:AssemblyVersion("3.2.3.0")]
-[assembly:AssemblyFileVersion("3.2.3.0")]
+[assembly:AssemblyVersion("3.2.4.0")]
+[assembly:AssemblyFileVersion("3.2.4.0")]

CameraPlus/WindowOverridePatch.cs

@@ -0,0 +1,31 @@
+using Harmony;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CameraPlus
+{
+    [HarmonyPatch(typeof(WindowOverride))]
+    [HarmonyPatch("WndProc", MethodType.Normal)]
+    public class WindowOverridePatch
+    {
+        private static readonly int WM_RBUTTONDOWN = 516;
+        private static readonly int WM_RBUTTONUP = 517;
+
+        [DllImport("user32.dll", CallingConvention = CallingConvention.StdCall, EntryPoint = "CallWindowProcW")]
+        private static extern IntPtr CallWindowProc(IntPtr prevWndProc, IntPtr hwnd, uint msg, IntPtr wparam, IntPtr lparam);
+
+        public static bool Prefix(WindowOverride __instance, IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam, ref IntPtr __result, IntPtr ____oldWndProcPtr)
+        {
+            if (msg == WM_RBUTTONDOWN || msg == WM_RBUTTONUP)
+            {
+                __result = CallWindowProc(____oldWndProcPtr, hWnd, msg, wParam, lParam);
+                return false;
+            }
+            return true;
+        }
+    }
+}