kneesox/NAK_CVR_Mods
1
0
Fork 0
mirror of https://github.com/NotAKidoS/NAK_CVR_Mods.git synced 2025-09-03 14:59:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[ThirdPerson] Fixed for Stable and Nightly, did some cleanup

Browse source 
- Adjusted the local player scaled event patch to work both on Stable and Nightly
This commit is contained in:
NotAKidoS 2025-07-15 21:02:03 -05:00
parent bf877124c1
commit e96a0e164d
4 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ThirdPerson/CameraLogic.cs
View file

@ -13,7 +13,6 @@ internal static class CameraLogic
private static float _dist; private static float _dist;
private static float _scale = 1f; private static float _scale = 1f;
private static Camera _thirdPersonCam; private static Camera _thirdPersonCam;
private static Camera _uiCam;
private static Camera _desktopCam; private static Camera _desktopCam;
private static int _storedCamMask; private static int _storedCamMask;
private static CameraFovClone _cameraFovClone; private static CameraFovClone _cameraFovClone;
@ -51,11 +50,10 @@ internal static class CameraLogic
_cameraFovClone = _thirdPersonCam.gameObject.AddComponent<CameraFovClone>(); _cameraFovClone = _thirdPersonCam.gameObject.AddComponent<CameraFovClone>();
_desktopCam = PlayerSetup.Instance.desktopCamera.GetComponent<Camera>(); _desktopCam = PlayerSetup.Instance.desktopCam;
_cameraFovClone.targetCamera = _desktopCam; _cameraFovClone.targetCamera = _desktopCam;
_thirdPersonCam.transform.SetParent(_desktopCam.transform); _thirdPersonCam.transform.SetParent(_desktopCam.transform);
_uiCam = _desktopCam.transform.Find("_UICamera").GetComponent<Camera>();
RelocateCam(CameraLocation.Default); RelocateCam(CameraLocation.Default);
@ -66,15 +64,15 @@ internal static class CameraLogic
internal static void CopyPlayerCamValues() internal static void CopyPlayerCamValues()
{ {
Camera activePlayerCam = PlayerSetup.Instance.GetActiveCamera().GetComponent<Camera>(); Camera activePlayerCam = PlayerSetup.Instance.activeCam;
if (_thirdPersonCam == null || activePlayerCam == null) if (!_thirdPersonCam || !activePlayerCam)
return; return;
ThirdPerson.Logger.Msg("Copying active camera settings & components."); ThirdPerson.Logger.Msg("Copying active camera settings & components.");
CVRTools.CopyToDestCam(activePlayerCam, _thirdPersonCam, true); CVRTools.CopyToDestCam(activePlayerCam, _thirdPersonCam);
// Remove PlayerClone // Remove PlayerClone
_thirdPersonCam.cullingMask &= ~(1 << CVRLayers.PlayerClone); // _thirdPersonCam.cullingMask &= ~(1 << CVRLayers.PlayerClone);
if (!CheckIsRestricted()) if (!CheckIsRestricted())
return; return;
@ -116,9 +114,9 @@ internal static class CameraLogic
private static void ResetDist() => _dist = 0; private static void ResetDist() => _dist = 0;
internal static void ScrollDist(float sign) { _dist += sign * 0.25f; RelocateCam(CurrentLocation); } internal static void ScrollDist(float sign) { _dist += sign * 0.25f; RelocateCam(CurrentLocation); }
internal static void AdjustScale(float height) { _scale = height; RelocateCam(CurrentLocation); } internal static void AdjustScale(float avatarScaleRelation) { _scale = avatarScaleRelation; RelocateCam(CurrentLocation); }
internal static void CheckVRMode() { if (MetaPort.Instance.isUsingVr) State = false; } internal static void CheckVRMode() { if (MetaPort.Instance.isUsingVr) State = false; }
private static bool CheckIsRestricted() private static bool CheckIsRestricted()
=> CVRWorld.Instance != null && !CVRWorld.Instance.enableZoom; => CVRWorld.Instance && !CVRWorld.Instance.enableZoom;
} }

2
ThirdPerson/Patches.cs
View file

@ -32,6 +32,6 @@ internal static class Patches
//Copy camera settings & postprocessing components //Copy camera settings & postprocessing components
private static void OnPostWorldStart() => CopyPlayerCamValues(); private static void OnPostWorldStart() => CopyPlayerCamValues();
//Adjust camera distance with height as modifier //Adjust camera distance with height as modifier
private static void OnScaleAdjusted(float height) => AdjustScale(height); private static void OnScaleAdjusted(ref float ____avatarScaleRelation) => AdjustScale(____avatarScaleRelation);
private static void OnConfigureHudAffinity() => CheckVRMode(); private static void OnConfigureHudAffinity() => CheckVRMode();
} }

2
ThirdPerson/Properties/AssemblyInfo.cs
View file

@ -27,6 +27,6 @@ using System.Reflection;
namespace NAK.ThirdPerson.Properties; namespace NAK.ThirdPerson.Properties;
internal static class AssemblyInfoParams internal static class AssemblyInfoParams
{ {
public const string Version = "1.1.1"; public const string Version = "1.1.2";
public const string Author = "Davi & NotAKidoS"; public const string Author = "Davi & NotAKidoS";
} }

4
ThirdPerson/format.json
View file

@ -2,7 +2,7 @@
{ {
"_id": 16, "_id": 16,
"name": "ThirdPerson", "name": "ThirdPerson",
"modversion": "1.1.1", "modversion": "1.1.2",
"gameversion": "2025r179", "gameversion": "2025r179",
"loaderversion": "0.6.1", "loaderversion": "0.6.1",
"modtype": "Mod", "modtype": "Mod",
@ -16,7 +16,7 @@
"requirements": [], "requirements": [],
"downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r46/ThirdPerson.dll", "downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r46/ThirdPerson.dll",
"sourcelink": "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/ThirdPerson", "sourcelink": "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/ThirdPerson",
"changelog": "- Recompiled for 2025r179", "changelog": "- Adjusted the local player scaled event patch to work both on Stable and Nightly.",
"embedcolor": "#F61961" "embedcolor": "#F61961"
} }
] ]