mirror of
https://github.com/NotAKidoS/NAK_CVR_Mods.git
synced 2025-09-02 14:29:25 +00:00
backport from experimental
This commit is contained in:
parent
8a3523539b
commit
5fd8e3d4d6
14 changed files with 686 additions and 560 deletions
|
@ -1,61 +1,31 @@
|
|||
using ABI.CCK.Components;
|
||||
using ABI_RC.Core.Savior;
|
||||
using HarmonyLib;
|
||||
using MelonLoader;
|
||||
using UnityEngine;
|
||||
|
||||
//Thanks Ben! I was scared of transpiler so I reworked a bit...
|
||||
|
||||
namespace DesktopVRSwitch.Patches;
|
||||
|
||||
[HarmonyPatch]
|
||||
internal class CVRPickupObject_Patch
|
||||
{
|
||||
[HarmonyPrefix]
|
||||
[HarmonyPatch(typeof(CVRPickupObject), "Start")]
|
||||
private static void CVRPickupObject_Start_Prefix(ref CVRPickupObject __instance)
|
||||
{
|
||||
if (__instance.gripOrigin == null) return;
|
||||
|
||||
Transform desktopOrigin = __instance.gripOrigin.Find("[Desktop]");
|
||||
if (desktopOrigin == null) return;
|
||||
|
||||
var pickupTracker = __instance.GetComponent<CVRPickupObjectTracker>();
|
||||
if (pickupTracker != null) return;
|
||||
|
||||
__instance.gameObject.AddComponent<CVRPickupObjectTracker>();
|
||||
|
||||
StorePreviousPosition(__instance, (!MetaPort.Instance.isUsingVr) ? __instance.gripOrigin : desktopOrigin);
|
||||
}
|
||||
|
||||
private static void StorePreviousPosition(CVRPickupObject pickupObject, Transform gripOrigin)
|
||||
{
|
||||
MelonLogger.Msg("Storing previous gripOrigin.");
|
||||
CVRPickupObjectTracker.previousGripOrigin[pickupObject] = gripOrigin;
|
||||
}
|
||||
}
|
||||
namespace NAK.Melons.DesktopVRSwitch.Patches;
|
||||
|
||||
public class CVRPickupObjectTracker : MonoBehaviour
|
||||
{
|
||||
//maybe i should store both transforms instead and getcomponent for CVRPickupObject..?
|
||||
public static Dictionary<CVRPickupObject, Transform> previousGripOrigin = new();
|
||||
public CVRPickupObject pickupObject;
|
||||
public Transform storedGripOrigin;
|
||||
|
||||
public void OnSwitch()
|
||||
void Start()
|
||||
{
|
||||
var pickupObject = GetComponent<CVRPickupObject>();
|
||||
VRModeSwitchTracker.OnPostVRModeSwitch += PostVRModeSwitch;
|
||||
}
|
||||
|
||||
void OnDestroy()
|
||||
{
|
||||
VRModeSwitchTracker.OnPostVRModeSwitch -= PostVRModeSwitch;
|
||||
}
|
||||
|
||||
public void PostVRModeSwitch(bool enterVR, Camera activeCamera)
|
||||
{
|
||||
if (pickupObject != null)
|
||||
{
|
||||
if (pickupObject.IsGrabbedByMe() && pickupObject._controllerRay != null) pickupObject._controllerRay.DropObject(true);
|
||||
(previousGripOrigin[pickupObject], pickupObject.gripOrigin) = (pickupObject.gripOrigin, previousGripOrigin[pickupObject]);
|
||||
if (pickupObject._controllerRay != null) pickupObject._controllerRay.DropObject(true);
|
||||
(storedGripOrigin, pickupObject.gripOrigin) = (pickupObject.gripOrigin, storedGripOrigin);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
var pickupObject = GetComponent<CVRPickupObject>();
|
||||
|
||||
if (pickupObject != null)
|
||||
previousGripOrigin.Remove(pickupObject);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue