fr.jeanf.universal.player 0.8.23 → 0.8.25

package/Runtime/Prefabs/Player.prefab

@@ -359,10 +359,12 @@ MonoBehaviour:
   lightSkinColor: {r: 1, g: 1, b: 1, a: 1}
   darkSkinColor: {r: 0.23584908, g: 0.1764706, b: 0.15294118, a: 1}
   gloveValue: 0
-  _hands: []
+  _hands:
+  - {fileID: 0}
+  - {fileID: 0}
   isGlove: 0
   isHandVisible: 0
-  lastHandVisibility: 0
+  lastHandVisibility: 1
   canUpdate: 0
   shiftTypeHandAction: {fileID: -6974777946573060807, guid: 110d9016d6486d84697b9d7a66a57d45,
     type: 3}
@@ -1502,8 +1504,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2278783626678670785}
   serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -1.65, z: 0}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.296, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2990,6 +2992,7 @@ MonoBehaviour:
   m_RepeatRate: 0.1
   m_TrackedDeviceDragThresholdMultiplier: 2
   m_TrackedScrollDeltaMultiplier: 5
+  m_BypassUIToolkitEvents: 0
   m_ActiveInputMode: 1
   m_EnableXRInput: 1
   m_EnableMouseInput: 1
@@ -3927,7 +3930,7 @@ MonoBehaviour:
   m_IsGlobal: 0
   priority: 0
   blendDistance: 0
-  weight: 1
+  weight: 0.458
   sharedProfile: {fileID: 11400000, guid: ab06ed5ee4fe73548b3c4829b155a02d, type: 2}
 --- !u!114 &8755935149309269784
 MonoBehaviour:
@@ -3952,8 +3955,7 @@ MonoBehaviour:
     m_Interactions: 
     m_SingletonActionBindings: []
     m_Flags: 0
-  HDRPVolumeProfile: {fileID: 11400000, guid: ebc5f30c794e40c45a699e74a1b1d92f, type: 2}
-  URPVolumeProfile: {fileID: 11400000, guid: ab06ed5ee4fe73548b3c4829b155a02d, type: 2}
+  volumeProfile: {fileID: 0}
   postProcessVolume: {fileID: 1989632603716548249}
   fadeOutChannelSO: {fileID: 11400000, guid: 81e451f2c982d9a4bbba1960913d44b0, type: 2}
 --- !u!135 &3359612486687220250
@@ -5661,8 +5663,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8387425044706141412}
   serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -1.65, z: 0}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -6890,6 +6892,11 @@ PrefabInstance:
       propertyPath: m_Parameters.numCapVertices
       value: 4
       objectReference: {fileID: 0}
+    - target: {fileID: 2761784063978902504, guid: c1800acf6366418a9b5f610249000331,
+        type: 3}
+      propertyPath: m_Parameters.widthMultiplier
+      value: 0.01
+      objectReference: {fileID: 0}
     - target: {fileID: 2761784063978902504, guid: c1800acf6366418a9b5f610249000331,
         type: 3}
       propertyPath: m_Parameters.numCornerVertices
@@ -7357,7 +7364,7 @@ PrefabInstance:
     - target: {fileID: 1925769544920504264, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
         type: 3}
       propertyPath: m_Enabled
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2417358720014700305, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
         type: 3}
@@ -7369,10 +7376,70 @@ PrefabInstance:
       propertyPath: m_Name
       value: Poke Interactor
       objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.015929166
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.015929166
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.015929166
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.0135
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.0142
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.96625876
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.25757337
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.000000023883674
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.0000000028373721
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 29.852
+      objectReference: {fileID: 0}
     - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: -10
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8692027818177823645, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -8524,6 +8591,11 @@ PrefabInstance:
       propertyPath: m_Parameters.numCapVertices
       value: 4
       objectReference: {fileID: 0}
+    - target: {fileID: 2761784063978902504, guid: c1800acf6366418a9b5f610249000331,
+        type: 3}
+      propertyPath: m_Parameters.widthMultiplier
+      value: 0.01
+      objectReference: {fileID: 0}
     - target: {fileID: 2761784063978902504, guid: c1800acf6366418a9b5f610249000331,
         type: 3}
       propertyPath: m_Parameters.numCornerVertices
@@ -8710,7 +8782,7 @@ PrefabInstance:
     - target: {fileID: 1925769544920504264, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
         type: 3}
       propertyPath: m_Enabled
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2417358720014700305, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
         type: 3}
@@ -8728,10 +8800,70 @@ PrefabInstance:
       value: 
       objectReference: {fileID: 8877177980677234388, guid: de9f91a37e546c64197961b0badf093c,
         type: 3}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.016718
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.016718
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.016718
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.0007
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.0116
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.0192
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9884403
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.14618813
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.02707173
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.02969769
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 16.702
+      objectReference: {fileID: 0}
     - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 10
+      value: 3.723
+      objectReference: {fileID: 0}
+    - target: {fileID: 8259524632637961923, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 3.989
       objectReference: {fileID: 0}
     - target: {fileID: 8692027818177823645, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
         type: 3}
@@ -10097,8 +10229,7 @@ MonoBehaviour:
       m_Interactions: 
       m_SingletonActionBindings: []
       m_Flags: 0
-    m_Reference: {fileID: 5101698808175986029, guid: 110d9016d6486d84697b9d7a66a57d45,
-      type: 3}
+    m_Reference: {fileID: 0}
   m_IsTrackedAction:
     m_UseReference: 0
     m_Action:
@@ -10122,8 +10253,7 @@ MonoBehaviour:
       m_Interactions: 
       m_SingletonActionBindings: []
       m_Flags: 0
-    m_Reference: {fileID: -1277054153949319361, guid: 110d9016d6486d84697b9d7a66a57d45,
-      type: 3}
+    m_Reference: {fileID: 0}
   m_SelectAction:
     m_UseReference: 1
     m_Action:
@@ -10161,8 +10291,7 @@ MonoBehaviour:
       m_Interactions: 
       m_SingletonActionBindings: []
       m_Flags: 0
-    m_Reference: {fileID: 83097790271614945, guid: 110d9016d6486d84697b9d7a66a57d45,
-      type: 3}
+    m_Reference: {fileID: 0}
   m_ActivateActionValue:
     m_UseReference: 1
     m_Action:
@@ -10187,8 +10316,7 @@ MonoBehaviour:
       m_Interactions: 
       m_SingletonActionBindings: []
       m_Flags: 0
-    m_Reference: {fileID: 3279264004350380116, guid: 110d9016d6486d84697b9d7a66a57d45,
-      type: 3}
+    m_Reference: {fileID: 0}
   m_UIPressActionValue:
     m_UseReference: 1
     m_Action:
@@ -10225,8 +10353,7 @@ MonoBehaviour:
       m_Interactions: 
       m_SingletonActionBindings: []
       m_Flags: 0
-    m_Reference: {fileID: -8222252007134549311, guid: 110d9016d6486d84697b9d7a66a57d45,
-      type: 3}
+    m_Reference: {fileID: 0}
   m_RotateAnchorAction:
     m_UseReference: 1
     m_Action:
@@ -10264,8 +10391,7 @@ MonoBehaviour:
       m_Interactions: 
       m_SingletonActionBindings: []
       m_Flags: 0
-    m_Reference: {fileID: 875253871413052681, guid: 110d9016d6486d84697b9d7a66a57d45,
-      type: 3}
+    m_Reference: {fileID: 0}
   m_ScaleToggleAction:
     m_UseReference: 0
     m_Action:

package/Runtime/scripts/Fade/FadeMask.cs

@@ -5,6 +5,7 @@ using UnityEngine.Serialization;
 using UnityEngine.Rendering;
 using LitMotion;
 using System;
+using System.Collections;
 using System.Linq;
 using Volume = UnityEngine.Rendering.Volume;
 
@@ -12,6 +13,12 @@ namespace jeanf.universalplayer
 {
     public class FadeMask : MonoBehaviour, IDebugBehaviour
     {
+        public enum FadeType 
+        { 
+            Loading,    // Black fade for scene loading
+            HeadInWall  // Saturation fade for collision detection
+        }
+
         public bool isDebug
         {
             get => _isDebug;
@@ -44,13 +51,13 @@ namespace jeanf.universalplayer
         [SerializeField] private Volume postProcessVolume;
         private static Volume staticPostProcessVolume;
         
-        // Use objects to handle both URP and HDRP ColorAdjustments via reflection
         private static object hdrpColorAdjustments;
         private static object urpColorAdjustments;
 
         private static MotionHandle _fadeHandle;
         private static bool _isCurrentlyFading = false;
         private static bool _targetState = false;
+        private static FadeType _currentFadeType = FadeType.Loading;
 
         [Header("Listening On")] [SerializeField]
         private BoolFloatEventChannelSO fadeOutChannelSO;
@@ -59,7 +66,6 @@ namespace jeanf.universalplayer
 
         public static TogglePpeDelegate TogglePPE;
 
-        // Pipeline detection
         private enum RenderPipeline
         {
             BuiltIn,
@@ -74,7 +80,7 @@ namespace jeanf.universalplayer
         {
             DetectRenderPipeline();
             SetupVolumeProfile();
-            SetVolumeTo_InitialSetup();
+            SetVolumeTo_FadeToBlack();
             FadeValue(false, .5f);
         }
 
@@ -112,7 +118,6 @@ namespace jeanf.universalplayer
                 return;
             }
 
-            // Use the assigned volume profile if available
             if (volumeProfile != null)
             {
                 postProcessVolume.profile = volumeProfile;
@@ -123,23 +128,18 @@ namespace jeanf.universalplayer
                 return;
             }
 
-            // Handle built-in pipeline
             if (_currentPipeline == RenderPipeline.BuiltIn)
             {
                 if (_isDebugSTATIC) Debug.LogWarning("FadeMask: Built-in pipeline detected. Volume system may not be available.");
                 return;
             }
 
-            // Set blend distance (same for all pipelines that support volumes)
             postProcessVolume.blendDistance = 10.0f;
 
             staticPostProcessVolume = postProcessVolume;
-            
-            // Try to get ColorAdjustments component based on current pipeline
-            if (!TryGetColorAdjustments())
-            {
-                if (_isDebugSTATIC) Debug.LogError("FadeMask: ColorAdjustments component not found in volume profile!");
-            }
+
+            if (TryGetColorAdjustments()) return;
+            if (_isDebugSTATIC) Debug.LogError("FadeMask: ColorAdjustments component not found in volume profile!");
         }
 
         private bool TryGetColorAdjustments()
@@ -153,7 +153,11 @@ namespace jeanf.universalplayer
                     
                     case RenderPipeline.URP:
                         return TryGetURPColorAdjustments();
-                        
+
+                    case RenderPipeline.BuiltIn:
+                        break;
+                    case RenderPipeline.Unknown:
+                        break;
                     default:
                         if (_isDebugSTATIC) Debug.LogError($"FadeMask: Unsupported pipeline: {_currentPipeline}");
                         break;
@@ -172,10 +176,8 @@ namespace jeanf.universalplayer
         {
             try
             {
-                // Find HDRP ColorAdjustments type
                 System.Type hdrpColorAdjustmentsType = System.Type.GetType("UnityEngine.Rendering.HighDefinition.ColorAdjustments, Unity.RenderPipelines.HighDefinition.Runtime");
                 
-                // Fallback: search through loaded assemblies
                 if (hdrpColorAdjustmentsType == null)
                 {
                     foreach (var assembly in System.AppDomain.CurrentDomain.GetAssemblies())
@@ -194,7 +196,6 @@ namespace jeanf.universalplayer
                     return false;
                 }
                 
-                // Use reflection to call TryGet<T> method
                 var profileType = staticPostProcessVolume.profile.GetType();
                 var tryGetMethods = profileType.GetMethods().Where(m => m.Name == "TryGet" && m.IsGenericMethodDefinition).ToArray();
                 
@@ -231,10 +232,8 @@ namespace jeanf.universalplayer
         {
             try
             {
-                // Find URP ColorAdjustments type
                 System.Type urpColorAdjustmentsType = System.Type.GetType("UnityEngine.Rendering.Universal.ColorAdjustments, Unity.RenderPipelines.Universal.Runtime");
                 
-                // Fallback: search through loaded assemblies
                 if (urpColorAdjustmentsType == null)
                 {
                     foreach (var assembly in System.AppDomain.CurrentDomain.GetAssemblies())
@@ -253,7 +252,6 @@ namespace jeanf.universalplayer
                     return false;
                 }
                 
-                // Use reflection to call TryGet<T> method
                 var profileType = staticPostProcessVolume.profile.GetType();
                 var tryGetMethods = profileType.GetMethods().Where(m => m.Name == "TryGet" && m.IsGenericMethodDefinition).ToArray();
                 
@@ -310,9 +308,9 @@ namespace jeanf.universalplayer
             TogglePPE -= ChangePostProcessing;
         }
 
-        public static void SetVolumeTo_InitialSetup()
+        public static void SetVolumeTo_FadeToBlack()
         {
-            if (_isDebugSTATIC) Debug.Log($"FadeMask: Setting initial setup for {_currentPipeline}");
+            if (_isDebugSTATIC) Debug.Log($"FadeMask: Setting initial setup (black) for {_currentPipeline}");
             
             switch (_currentPipeline)
             {
@@ -333,16 +331,20 @@ namespace jeanf.universalplayer
                     }
                     else if (_isDebugSTATIC) Debug.LogWarning("FadeMask: URP ColorAdjustments is null.");
                     break;
-                
+
+                case RenderPipeline.BuiltIn:
+                    break;
+                case RenderPipeline.Unknown:
+                    break;
                 default:
                     if (_isDebugSTATIC) Debug.LogWarning($"FadeMask: Cannot set initial setup for pipeline: {_currentPipeline}");
                     break;
             }
         }
 
-        public static void SetVolumeTo_HeadInWallSetup()
+        public static void SetVolumeTo_FadeSaturation()
         {
-            if (_isDebugSTATIC) Debug.Log($"FadeMask: Setting head in wall setup for {_currentPipeline}");
+            if (_isDebugSTATIC) Debug.Log($"FadeMask: Setting head in wall setup (gray) for {_currentPipeline}");
             
             switch (_currentPipeline)
             {
@@ -363,7 +365,11 @@ namespace jeanf.universalplayer
                     }
                     else if (_isDebugSTATIC) Debug.LogWarning("FadeMask: URP ColorAdjustments is null.");
                     break;
-                
+
+                case RenderPipeline.BuiltIn:
+                    break;
+                case RenderPipeline.Unknown:
+                    break;
                 default:
                     if (_isDebugSTATIC) Debug.LogWarning($"FadeMask: Cannot set head in wall setup for pipeline: {_currentPipeline}");
                     break;
@@ -379,12 +385,9 @@ namespace jeanf.universalplayer
                 var colorAdjustmentsType = colorAdjustments.GetType();
                 var parametersProperty = colorAdjustmentsType.GetProperty("parameters");
                 if (parametersProperty == null) return;
-                
                 var parameters = parametersProperty.GetValue(colorAdjustments);
-                if (parameters == null) return;
-                
-                var parametersEnumerable = parameters as System.Collections.IEnumerable;
-                if (parametersEnumerable == null) return;
+
+                if (parameters is not IEnumerable parametersEnumerable) return;
                 
                 var parametersList = new System.Collections.Generic.List<object>();
                 foreach (var param in parametersEnumerable)
@@ -394,57 +397,47 @@ namespace jeanf.universalplayer
                 
                 object targetParameter = null;
                 
-                if (propertyName == "colorFilter")
+                switch (propertyName)
                 {
-                    // Find ColorParameter
-                    foreach (var param in parametersList)
+                    case "colorFilter":
                     {
-                        if (param.GetType().Name == "ColorParameter")
+                        foreach (var param in parametersList)
                         {
+                            if (param.GetType().Name != "ColorParameter") continue;
                             targetParameter = param;
                             break;
                         }
+
+                        break;
                     }
-                }
-                else if (propertyName == "saturation")
-                {
-                    // Find saturation parameter - typically index 4 or by range check
-                    if (parametersList.Count > 4 && parametersList[4].GetType().Name == "ClampedFloatParameter")
-                    {
+                    case "saturation" when parametersList.Count > 4 && parametersList[4].GetType().Name == "ClampedFloatParameter":
                         targetParameter = parametersList[4];
-                    }
-                    else
+                        break;
+                    case "saturation":
                     {
-                        // Fallback: find ClampedFloatParameter with range -100 to 100
                         foreach (var param in parametersList)
                         {
-                            if (param.GetType().Name == "ClampedFloatParameter")
-                            {
-                                var paramType = param.GetType();
-                                var minProp = paramType.GetProperty("min");
-                                var maxProp = paramType.GetProperty("max");
-                                if (minProp?.GetValue(param)?.ToString() == "-100" && 
-                                    maxProp?.GetValue(param)?.ToString() == "100")
-                                {
-                                    targetParameter = param;
-                                    break;
-                                }
-                            }
+                            if (param.GetType().Name != "ClampedFloatParameter") continue;
+                            var paramType = param.GetType();
+                            var minProp = paramType.GetProperty("min");
+                            var maxProp = paramType.GetProperty("max");
+                            if (minProp?.GetValue(param)?.ToString() != "-100" ||
+                                maxProp?.GetValue(param)?.ToString() != "100") continue;
+                            targetParameter = param;
+                            break;
                         }
+
+                        break;
                     }
                 }
-                
-                if (targetParameter != null)
-                {
-                    var parameterType = targetParameter.GetType();
-                    var valueProperty = parameterType.GetProperty("value");
-                    
-                    if (valueProperty != null)
-                    {
-                        valueProperty.SetValue(targetParameter, value);
-                        if (_isDebugSTATIC) Debug.Log($"FadeMask: Set {propertyName} to {value}");
-                    }
-                }
+
+                if (targetParameter == null) return;
+                var parameterType = targetParameter.GetType();
+                var valueProperty = parameterType.GetProperty("value");
+
+                if (valueProperty == null) return;
+                valueProperty.SetValue(targetParameter, value);
+                if (_isDebugSTATIC) Debug.Log($"FadeMask: Set {propertyName} to {value}");
             }
             catch (Exception e)
             {
@@ -466,35 +459,52 @@ namespace jeanf.universalplayer
 
         private void ChangePostProcessing(bool isInitComplete)
         {
-            SetVolumeTo_InitialSetup();
-            
-            if (!isInitComplete) return;
-
-            SetVolumeTo_HeadInWallSetup();
+            SetVolumeTo_FadeToBlack();
         }
-
         public static void FadeValue(bool value)
         {
-            FadeValue(value, _fadeTime);
-            if (_isDebugSTATIC) Debug.Log($"FadeMask: Fading to {value} in {_fadeTime}s");
+            FadeValue(value, FadeType.Loading);
         }
 
         public static void FadeValue(bool value, float fadeTime)
         {
-            // Check if volume is initialized
+            FadeValue(value, fadeTime, FadeType.Loading);
+        }
+
+        public static void FadeValue(bool value, FadeType fadeType)
+        {
+            FadeValue(value, _fadeTime, fadeType);
+        }
+
+        public static void FadeValue(bool value, float fadeTime, FadeType fadeType)
+        {
             if (staticPostProcessVolume == null)
             {
                 if (_isDebugSTATIC) Debug.LogWarning("FadeMask: staticPostProcessVolume is null. Make sure FadeMask.Awake() has been called.");
                 return;
             }
 
-            // Don't start a new fade if we're already fading to the same target
+            if (value)
+            {
+                _currentFadeType = fadeType;
+                switch (fadeType)
+                {
+                    case FadeType.Loading:
+                        SetVolumeTo_FadeToBlack(); // Black fade
+                        break;
+                    case FadeType.HeadInWall:
+                        SetVolumeTo_FadeSaturation(); // Saturation fade
+                        break;
+                }
+                
+                if (_isDebugSTATIC) Debug.Log($"FadeMask: Setting up {fadeType} fade");
+            }
+
             if (_isCurrentlyFading && _targetState == value)
                 return;
 
-            if (_isDebugSTATIC) Debug.Log($"FadeMask: Fading to {value} in {fadeTime}s");
+            if (_isDebugSTATIC) Debug.Log($"FadeMask: Fading to {value} in {fadeTime}s with {fadeType} style");
 
-            // Only cancel if the handle is valid and active
             if (_fadeHandle.IsActive())
             {
                 _fadeHandle.Cancel();

package/Runtime/scripts/Gaze/NoPeeking.cs

@@ -42,8 +42,20 @@ namespace jeanf.universalplayer
             }
 
             if (_isHeadInWall == _isHeadInWallLastValue) return;
-            FadeMask.FadeValue(_isHeadInWall);
-            if(isDebug) Debug.Log($"isHeadInWall changed to: {_isHeadInWall}");
+            
+            // 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}");
+            }
+            else
+            {
+                // Gray fade for head-in-wall collision
+                FadeMask.FadeValue(_isHeadInWall, FadeMask.FadeType.HeadInWall);
+                if (isDebug) Debug.Log($"HeadInWall collision fade changed to: {_isHeadInWall}");
+            }
         }
 
 #if UNITY_EDITOR
@@ -54,10 +66,25 @@ namespace jeanf.universalplayer
         }
 #endif
 
-        public static void SetIsLoadingState(bool value)
+        public static void SetIsLoadingState(bool isLoading)
+        {
+            _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()
         {
-            value = !value;
-            _isSceneLoading = value;
+            return _isHeadInWall;
         }
     }
 }

package/package.json

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