kneesox/NAK_CVR_Mods
1
0
Fork 0
mirror of https://github.com/NotAKidoS/NAK_CVR_Mods.git synced 2025-09-02 06:19:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

i hate all

Browse source 
holy shit this fucking bug took me two hours to fix
why was the solution so simple... fuck
This commit is contained in:
NotAKidoS 2023-01-03 21:11:16 -06:00
parent 845baee849
commit 4a5527d7de
4 changed files with 38 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

56
MenuScalePatch/Helpers/MainMenuHelper.cs
View file

@ -28,11 +28,6 @@ public class MainMenuHelper : MonoBehaviour
public static MainMenuHelper Instance;
public Transform worldAnchor;
static readonly FieldInfo ms_followAngleY = typeof(MovementSystem).GetField("_followAngleY", BindingFlags.NonPublic | BindingFlags.Instance);
private bool independentHeadTurn = false;
private bool returnIndependentHeadTurn = false;
private bool prevIndependentHeadTurn = false;
void Start()
{
Instance = this;
@ -41,23 +36,10 @@ public class MainMenuHelper : MonoBehaviour
void LateUpdate()
{
MSP_MenuInfo.HandleIndependentLookInput();
UpdateMenuPosition();
}
void OnEnable()
{
independentHeadTurn = false;
returnIndependentHeadTurn = false;
prevIndependentHeadTurn = false;
}
void OnDisable()
{
independentHeadTurn = false;
returnIndependentHeadTurn = false;
prevIndependentHeadTurn = false;
}
public void CreateWorldAnchors()
{
//VR specific anchor
@ -99,39 +81,6 @@ public class MainMenuHelper : MonoBehaviour
HandleVRPosition();
return;
}
float angle = (float)ms_followAngleY.GetValue(MovementSystem.Instance);
bool independentHeadTurnChanged = CVRInputManager.Instance.independentHeadTurn != prevIndependentHeadTurn;
if (independentHeadTurnChanged)
{
prevIndependentHeadTurn = CVRInputManager.Instance.independentHeadTurn;
//if pressing but not already enabled
if (prevIndependentHeadTurn)
{
if (!independentHeadTurn && angle == 0f)
{
UpdateWorldAnchors();
MSP_MenuInfo.ToggleDesktopInputMethod(!prevIndependentHeadTurn);
independentHeadTurn = true;
}
returnIndependentHeadTurn = false;
}
else
{
returnIndependentHeadTurn = true;
}
}
if (returnIndependentHeadTurn)
{
if (angle == 0f)
{
independentHeadTurn = false;
returnIndependentHeadTurn = false;
MSP_MenuInfo.ToggleDesktopInputMethod(!prevIndependentHeadTurn);
}
}
HandleDesktopPosition();
}
@ -139,8 +88,7 @@ public class MainMenuHelper : MonoBehaviour
public void HandleDesktopPosition()
{
if (MSP_MenuInfo.CameraTransform == null || MSP_MenuInfo.DisableMMHelper) return;
Transform activeAnchor = independentHeadTurn ? worldAnchor : MSP_MenuInfo.CameraTransform;
Transform activeAnchor = MSP_MenuInfo.independentHeadTurn ? worldAnchor : MSP_MenuInfo.CameraTransform;
transform.localScale = new Vector3(1.6f * MSP_MenuInfo.ScaleFactor, 0.9f * MSP_MenuInfo.ScaleFactor, 1f);
transform.eulerAngles = activeAnchor.eulerAngles;
transform.position = activeAnchor.position + activeAnchor.forward * 1f * MSP_MenuInfo.ScaleFactor * MSP_MenuInfo.AspectRatio;

56
MenuScalePatch/Helpers/QuickMenuHelper.cs
View file

@ -27,11 +27,6 @@ public class QuickMenuHelper : MonoBehaviour
public Transform worldAnchor;
public Transform handAnchor;
static readonly FieldInfo ms_followAngleY = typeof(MovementSystem).GetField("_followAngleY", BindingFlags.NonPublic | BindingFlags.Instance);
private bool independentHeadTurn = false;
private bool returnIndependentHeadTurn = false;
private bool prevIndependentHeadTurn = false;
void Start()
{
Instance = this;
@ -40,23 +35,10 @@ public class QuickMenuHelper : MonoBehaviour
void LateUpdate()
{
MSP_MenuInfo.HandleIndependentLookInput();
UpdateMenuPosition();
}
void OnEnable()
{
independentHeadTurn = false;
returnIndependentHeadTurn = false;
prevIndependentHeadTurn = false;
}
void OnDisable()
{
independentHeadTurn = false;
returnIndependentHeadTurn = false;
prevIndependentHeadTurn = false;
}
public void CreateWorldAnchors()
{
//VR specific anchor
@ -69,7 +51,6 @@ public class QuickMenuHelper : MonoBehaviour
public void UpdateWorldAnchors()
{
if (worldAnchor == null || MSP_MenuInfo.CameraTransform == null) return;
worldAnchor.eulerAngles = MSP_MenuInfo.CameraTransform.eulerAngles;
worldAnchor.position = MSP_MenuInfo.CameraTransform.position;
}
@ -81,39 +62,6 @@ public class QuickMenuHelper : MonoBehaviour
HandleVRPosition();
return;
}
float angle = (float)ms_followAngleY.GetValue(MovementSystem.Instance);
bool independentHeadTurnChanged = CVRInputManager.Instance.independentHeadTurn != prevIndependentHeadTurn;
if (independentHeadTurnChanged)
{
prevIndependentHeadTurn = CVRInputManager.Instance.independentHeadTurn;
//if pressing but not already enabled
if (prevIndependentHeadTurn)
{
if (!independentHeadTurn && angle == 0f)
{
UpdateWorldAnchors();
MSP_MenuInfo.ToggleDesktopInputMethod(!prevIndependentHeadTurn);
independentHeadTurn = true;
}
returnIndependentHeadTurn = false;
}
else
{
returnIndependentHeadTurn = true;
}
}
if (returnIndependentHeadTurn)
{
if (angle == 0f)
{
independentHeadTurn = false;
returnIndependentHeadTurn = false;
MSP_MenuInfo.ToggleDesktopInputMethod(!prevIndependentHeadTurn);
}
}
HandleDesktopPosition();
}
@ -122,7 +70,7 @@ public class QuickMenuHelper : MonoBehaviour
{
if (MSP_MenuInfo.CameraTransform == null || MSP_MenuInfo.DisableQMHelper) return;
Transform activeAnchor = independentHeadTurn ? worldAnchor : MSP_MenuInfo.CameraTransform;
Transform activeAnchor = MSP_MenuInfo.independentHeadTurn ? worldAnchor : MSP_MenuInfo.CameraTransform;
transform.localScale = new Vector3(1f * MSP_MenuInfo.ScaleFactor, 1f * MSP_MenuInfo.ScaleFactor, 1f);
transform.eulerAngles = activeAnchor.eulerAngles;
transform.position = activeAnchor.position + activeAnchor.transform.forward * 1f * MSP_MenuInfo.ScaleFactor;