Revert "Use CommonCameraUtility to fix projection pool remote cameras"

This reverts commit d509e11379ad04c14417c059323764f079644ff5.
This commit is contained in:
Nick 2022-09-13 23:05:41 -04:00
parent 0b2be0cfcc
commit 829fedb6a3
4 changed files with 1 additions and 54 deletions

View File

@ -1,16 +0,0 @@
using NewHorizons.OtherMods.MenuFramework;
namespace NewHorizons.OtherMods.CommonCameraUtility
{
public static class CommonCameraHandler
{
private static ICommonCameraAPI _cameraAPI;
static CommonCameraHandler()
{
_cameraAPI = Main.Instance.ModHelper.Interaction.TryGetModApi<ICommonCameraAPI>("xen.CommonCameraUtility");
}
public static void RegisterCustomCamera(OWCamera camera) => _cameraAPI.RegisterCustomCamera(camera);
}
}

View File

@ -1,13 +0,0 @@
using UnityEngine;
using UnityEngine.Events;
namespace NewHorizons.OtherMods.CommonCameraUtility
{
public interface ICommonCameraAPI
{
void RegisterCustomCamera(OWCamera OWCamera);
(OWCamera, Camera) CreateCustomCamera(string name);
UnityEvent<PlayerTool> EquipTool();
UnityEvent<PlayerTool> UnequipTool();
}
}

View File

@ -1,24 +0,0 @@
using HarmonyLib;
using NewHorizons.OtherMods.CommonCameraUtility;
using UnityEngine;
namespace NewHorizons.Patches.CameraPatches
{
[HarmonyPatch]
public static class NomaiRemoteCameraPatches
{
[HarmonyPostfix]
[HarmonyPatch(typeof(NomaiRemoteCamera), nameof(NomaiRemoteCamera.Awake))]
public static void NomaiRemoteCamera_Awake(NomaiRemoteCamera __instance)
{
// Ensures that if the player is visible from the remote camera they look normal
CommonCameraHandler.RegisterCustomCamera(__instance._camera);
// These layers were left on because it doesnt come up in base game (Dreamworld is inactive, player is far away)
__instance._camera.mainCamera.cullingMask &= ~(1 << LayerMask.NameToLayer("DreamSimulation"));
__instance._camera.mainCamera.cullingMask &= ~(1 <<LayerMask.NameToLayer("UI"));
__instance._camera.mainCamera.cullingMask &= ~(1 <<LayerMask.NameToLayer("HeadsUpDisplay"));
__instance._camera.mainCamera.cullingMask &= ~(1 <<LayerMask.NameToLayer("HelmetUVPass"));
}
}
}

View File

@ -6,7 +6,7 @@
"uniqueName": "xen.NewHorizons", "uniqueName": "xen.NewHorizons",
"version": "1.5.1", "version": "1.5.1",
"owmlVersion": "2.6.0", "owmlVersion": "2.6.0",
"dependencies": [ "JohnCorby.VanillaFix", "_nebula.MenuFramework", "xen.CommonCameraUtility" ], "dependencies": [ "JohnCorby.VanillaFix", "_nebula.MenuFramework" ],
"conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_Randomizer" ], "conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_Randomizer" ],
"pathsToPreserve": [ "planets", "systems", "translations" ] "pathsToPreserve": [ "planets", "systems", "translations" ]
} }