Set camera mask instead of messing with avatar

nicoco007 · May 23, 2024 · d6c4cb0 · d6c4cb0
1 parent 50c8c16
commit d6c4cb0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/Source/CustomAvatar/Player/PlayerAvatarManager.cs b/Source/CustomAvatar/Player/PlayerAvatarManager.cs
@@ -128,7 +128,6 @@ private void OnEnable()
             _settings.enableLocomotion.changed += OnEnableLocomotionChanged;
 
             _beatSaberUtilities.roomAdjustChanged += OnRoomAdjustChanged;
-            _beatSaberUtilities.focusChanged += OnFocusChanged;
 
             _activeOriginManager.changed += OnActiveOriginChanged;
         }
@@ -193,7 +192,6 @@ private void OnDisable()
             _settings.enableLocomotion.changed -= OnEnableLocomotionChanged;
 
             _beatSaberUtilities.roomAdjustChanged -= OnRoomAdjustChanged;
-            _beatSaberUtilities.focusChanged -= OnFocusChanged;
 
             _activeOriginManager.changed -= OnActiveOriginChanged;
         }
@@ -425,11 +423,6 @@ private void OnRoomAdjustChanged(Vector3 roomCenter, Quaternion roomRotation)
             ResizeCurrentAvatar();
         }
 
-        private void OnFocusChanged(bool hasFocus)
-        {
-            UpdateFirstPersonVisibility();
-        }
-
         private void UpdateConstraints()
         {
             _logger.LogTrace("Updating constraints");
@@ -527,11 +520,7 @@ private void UpdateFirstPersonVisibility()
 
             FirstPersonVisibility visibility = FirstPersonVisibility.Hidden;
 
-            if (!_beatSaberUtilities.hasFocus)
-            {
-                visibility = FirstPersonVisibility.Visible;
-            }
-            else if (_settings.isAvatarVisibleInFirstPerson)
+            if (_settings.isAvatarVisibleInFirstPerson)
             {
                 visibility = ignoreFirstPersonExclusions ? FirstPersonVisibility.Visible : FirstPersonVisibility.VisibleWithExclusionsApplied;
             }

diff --git a/Source/CustomAvatar/Rendering/MainCamera.cs b/Source/CustomAvatar/Rendering/MainCamera.cs
@@ -142,6 +142,8 @@ private void OnFocusChanged(bool hasFocus)
             _trackedPoseDriver.originPose = hasFocus ? Pose.identity : new Pose(
                 Vector3.ProjectOnPlane(Quaternion.Euler(0, 180, 0) * -transform.localPosition * 2, Vector3.up) + Vector3.ProjectOnPlane(transform.localRotation * Vector3.forward, Vector3.up).normalized * 1.5f,
                 Quaternion.Euler(0, 180, 0));
+
+            UpdateCameraMask();
         }
 
         private void UpdateCameraMask()
@@ -156,7 +158,7 @@ private void UpdateCameraMask()
             int mask = _camera.cullingMask | AvatarLayers.kAlwaysVisibleMask;
 
             // FPFC basically ends up being a 3rd person camera
-            if (_fpfcSettings.Enabled)
+            if (_fpfcSettings.Enabled || !_beatSaberUtilities.hasFocus)
             {
                 mask |= AvatarLayers.kOnlyInThirdPersonMask;
             }