fr.jeanf.universal.player 0.8.25 → 0.8.27

package/Runtime/scripts/Fade/FadeMask.cs

@@ -450,6 +450,28 @@ namespace jeanf.universalplayer
             if (!checkForDebugChangeState) return;
             _isDebugSTATIC = _isDebug;
         }
+        public static void PrepareVolumeProfile(FadeType fadeType)
+        {
+            if (staticPostProcessVolume == null)
+            {
+                if (_isDebugSTATIC) Debug.LogWarning("FadeMask: staticPostProcessVolume is null. Cannot prepare volume profile.");
+                return;
+            }
+
+            switch (fadeType)
+            {
+                case FadeType.Loading:
+                    SetVolumeTo_FadeToBlack(); // Black fade
+                    if (_isDebugSTATIC) Debug.Log("FadeMask: Volume profile prepared for Loading (black)");
+                    break;
+                case FadeType.HeadInWall:
+                    SetVolumeTo_FadeSaturation(); // Saturation fade
+                    if (_isDebugSTATIC) Debug.Log("FadeMask: Volume profile prepared for HeadInWall (desaturated)");
+                    break;
+            }
+
+            _currentFadeType = fadeType;
+        }
 
         public static void SwitchFadeState()
         {
@@ -484,9 +506,9 @@ namespace jeanf.universalplayer
                 return;
             }
 
-            if (value)
+            // Only set up the volume profile if we're changing fade types or fading in
+            if (_currentFadeType != fadeType || value)
             {
-                _currentFadeType = fadeType;
                 switch (fadeType)
                 {
                     case FadeType.Loading:
@@ -496,15 +518,16 @@ namespace jeanf.universalplayer
                         SetVolumeTo_FadeSaturation(); // Saturation fade
                         break;
                 }
-                
-                if (_isDebugSTATIC) Debug.Log($"FadeMask: Setting up {fadeType} fade");
+                _currentFadeType = fadeType;
             }
 
+            // Check if we're already transitioning to the same target state
             if (_isCurrentlyFading && _targetState == value)
                 return;
 
             if (_isDebugSTATIC) Debug.Log($"FadeMask: Fading to {value} in {fadeTime}s with {fadeType} style");
 
+            // Cancel any existing fade
             if (_fadeHandle.IsActive())
             {
                 _fadeHandle.Cancel();

package/Runtime/scripts/Gaze/NoPeeking.cs

@@ -15,46 +15,62 @@ namespace jeanf.universalplayer
         [SerializeField] private LayerMask collisionLayer;
         [SerializeField] private float sphereCheckSize = .15f;
 
-        [SerializeField] private bool _isHeadInWall = false;
-        private bool _isHeadInWallLastValue = false;
+        [SerializeField] private bool _fadeState = false;
+        private bool _fadeStateLastValue = false;
         
         private static bool _isSceneLoading = true;
+        private static bool _wasSceneLoadingLastFrame = true;
         
         private void FixedUpdate()
         {
-            _isHeadInWallLastValue = _isHeadInWall;
+            _fadeStateLastValue = _fadeState;
+            bool wasLoadingLastFrame = _wasSceneLoadingLastFrame;
+            _wasSceneLoadingLastFrame = _isSceneLoading;
             
             if (_isSceneLoading)
             {
-                _isHeadInWall = true;
+                _fadeState = true;
             }
             else
             {
                 if (isDebug) Debug.Log("NoPeeking - made it through the return");
                 if (Physics.CheckSphere(transform.position, sphereCheckSize, collisionLayer, QueryTriggerInteraction.Ignore))
                 {
-                    _isHeadInWall = true;
+                    _fadeState = true;
                 }
                 else
                 {
-                    _isHeadInWall = false;
+                    _fadeState = false;
                 }
             }
 
-            if (_isHeadInWall == _isHeadInWallLastValue) return;
+            // Check if loading state changed from true to false
+            if (wasLoadingLastFrame && !_isSceneLoading)
+            {
+                // Scene loading just finished - set up for head-in-wall detection
+                if (isDebug) Debug.Log("Scene loading finished - preparing head-in-wall detection mode");
+                
+                // Just prepare the volume profile without fading, let the normal logic handle the actual fade
+                FadeMask.PrepareVolumeProfile(FadeMask.FadeType.HeadInWall);
+                
+                // Don't return early - let the normal logic below handle the fade state
+            }
+
+            // Normal state change detection
+            if (_fadeState == _fadeStateLastValue) return;
             
             // Determine fade type based on whether we're loading or detecting collision
             if (_isSceneLoading)
             {
                 // Black fade for loading
-                FadeMask.FadeValue(_isHeadInWall, FadeMask.FadeType.Loading);
-                if (isDebug) Debug.Log($"Loading fade changed to: {_isHeadInWall}");
+                FadeMask.FadeValue(_fadeState, FadeMask.FadeType.Loading);
+                if (isDebug) Debug.Log($"Loading fade changed to: {_fadeState}");
             }
             else
             {
                 // Gray fade for head-in-wall collision
-                FadeMask.FadeValue(_isHeadInWall, FadeMask.FadeType.HeadInWall);
-                if (isDebug) Debug.Log($"HeadInWall collision fade changed to: {_isHeadInWall}");
+                FadeMask.FadeValue(_fadeState, FadeMask.FadeType.HeadInWall);
+                if (isDebug) Debug.Log($"HeadInWall collision fade changed to: {_fadeState}");
             }
         }
 
@@ -70,21 +86,13 @@ namespace jeanf.universalplayer
         {
             _isSceneLoading = isLoading;
         }
-        
-        /// <summary>
-        /// Gets the current loading state
-        /// </summary>
         public static bool IsCurrentlyLoading()
         {
             return _isSceneLoading;
         }
-        
-        /// <summary>
-        /// Gets the current head-in-wall state (useful for debugging)
-        /// </summary>
-        public bool IsHeadInWall()
+        public bool GetFadeState()
         {
-            return _isHeadInWall;
+            return _fadeState;
         }
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fr.jeanf.universal.player",
 
-  "version": "0.8.25",
+  "version": "0.8.27",
 
   "displayName": "Universal Player",
   "description": "This package contains a universal player working in URP & HDRP for Mouse+Keyboard or VR",