fr.jeanf.scenemanagement 0.6.21 → 0.6.23

package/Runtime/AdditiveLoading/SceneReference.cs

@@ -12,23 +12,18 @@ namespace jeanf.scenemanagement
         // Public getter for the scene name
         public string SceneName => sceneName;
 
+        public SceneReference(string sceneName)
+        {
+            this.sceneName = sceneName;
+        }
+        
         #if UNITY_EDITOR
-        // Called automatically by Unity when the object is modified in the editor
-        public void OnValidate()
+        // Méthode pour forcer la mise à jour du nom
+        public void UpdateSceneName()
         {
-            // Ensure the sceneName is updated when the sceneAsset changes
-            if (sceneAsset != null)
+            if (sceneAsset != null && sceneAsset is SceneAsset)
             {
-                if (sceneAsset is SceneAsset)
-                {
-                    sceneName = sceneAsset.name; // Extract scene name from the asset
-                }
-                else
-                {
-                    Debug.LogWarning("Assigned object is not a SceneAsset!");
-                    sceneAsset = null; // Reset if it's not a valid SceneAsset
-                    sceneName = "";
-                }
+                sceneName = sceneAsset.name;
             }
             else
             {
@@ -42,23 +37,28 @@ namespace jeanf.scenemanagement
     [CustomPropertyDrawer(typeof(SceneReference))]
     public class SceneReferenceDrawer : PropertyDrawer
     {
-
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
             EditorGUI.BeginProperty(position, label, property);
 
-            // Get the serialized properties
             SerializedProperty sceneAssetProp = property.FindPropertyRelative("sceneAsset");
             SerializedProperty sceneNameProp = property.FindPropertyRelative("sceneName");
 
-            // Draw the SceneAsset field with a label
+            // Vérifier si le nom a changé
+            if (sceneAssetProp.objectReferenceValue != null)
+            {
+                string currentName = sceneAssetProp.objectReferenceValue.name;
+                if (sceneNameProp.stringValue != currentName)
+                {
+                    sceneNameProp.stringValue = currentName;
+                }
+            }
+
             position = EditorGUI.PrefixLabel(position, GUIUtility.GetControlID(FocusType.Passive), label);
+        
             EditorGUI.BeginChangeCheck();
-
-            // Restrict the object field to accept only SceneAssets
             Object sceneAsset = EditorGUI.ObjectField(position, sceneAssetProp.objectReferenceValue, typeof(SceneAsset), false);
 
-            // If the scene asset changes, update the scene name
             if (EditorGUI.EndChangeCheck())
             {
                 sceneAssetProp.objectReferenceValue = sceneAsset;
@@ -68,6 +68,80 @@ namespace jeanf.scenemanagement
             EditorGUI.EndProperty();
         }
     }
-    #endif
 
+    // AssetPostprocessor pour détecter les renommages de scènes
+    public class SceneReferenceAssetPostprocessor : AssetPostprocessor
+    {
+        private static void OnPostprocessAllAssets(
+            string[] importedAssets,
+            string[] deletedAssets,
+            string[] movedAssets,
+            string[] movedFromAssetPaths)
+        {
+            bool sceneRenamed = false;
+
+            // Vérifier si des scènes ont été déplacées/renommées
+            for (int i = 0; i < movedAssets.Length; i++)
+            {
+                if (movedAssets[i].EndsWith(".unity"))
+                {
+                    sceneRenamed = true;
+                    break;
+                }
+            }
+
+            if (sceneRenamed)
+            {
+                // Forcer la mise à jour de tous les objets contenant des SceneReference
+                RefreshAllSceneReferences();
+            }
+        }
+
+        private static void RefreshAllSceneReferences()
+        {
+            // Trouver tous les MonoBehaviour et ScriptableObject dans le projet
+            string[] guids = AssetDatabase.FindAssets("t:MonoBehaviour t:ScriptableObject");
+        
+            foreach (string guid in guids)
+            {
+                string path = AssetDatabase.GUIDToAssetPath(guid);
+                Object obj = AssetDatabase.LoadAssetAtPath<Object>(path);
+            
+                if (obj != null)
+                {
+                    SerializedObject serializedObject = new SerializedObject(obj);
+                    SerializedProperty property = serializedObject.GetIterator();
+                    bool hasChanges = false;
+
+                    while (property.NextVisible(true))
+                    {
+                        if (property.type == "SceneReference")
+                        {
+                            SerializedProperty sceneAssetProp = property.FindPropertyRelative("sceneAsset");
+                            SerializedProperty sceneNameProp = property.FindPropertyRelative("sceneName");
+
+                            if (sceneAssetProp != null && sceneAssetProp.objectReferenceValue != null)
+                            { 
+                                string currentName = sceneAssetProp.objectReferenceValue.name;
+                                if (sceneNameProp.stringValue != currentName)
+                                {
+                                    sceneNameProp.stringValue = currentName;
+                                    hasChanges = true;
+                                }
+                            }
+                        }
+                    }
+
+                    if (hasChanges)
+                    {
+                        serializedObject.ApplyModifiedProperties();
+                        EditorUtility.SetDirty(obj);
+                    }
+                }
+            }
+
+            AssetDatabase.SaveAssets();
+        }
+    }
+    #endif
 }

package/Runtime/DynamicLoading/VolumeSystem.cs

@@ -147,8 +147,9 @@ namespace jeanf.scenemanagement
 
             var tempZoneList = new NativeList<FixedString128Bytes>(100, Allocator.Temp);
 
-            foreach (var entry in precomputedBuffer)
+            for (var index = 0; index < precomputedBuffer.Length; index++)
             {
+                var entry = precomputedBuffer[index];
                 switch (entry)
                 {
                     case { isZoneRegionMapping: true, zoneId: { IsEmpty: false }, regionId: { IsEmpty: false } }:
@@ -170,8 +171,9 @@ namespace jeanf.scenemanagement
         [BurstCompile]
         private void BuildPrecomputedCheckableZones(ref SystemState state, DynamicBuffer<PrecomputedVolumeDataBuffer> precomputedBuffer)
         {
-            foreach (var entry in precomputedBuffer)
+            for (var index = 0; index < precomputedBuffer.Length; index++)
             {
+                var entry = precomputedBuffer[index];
                 if (!entry.isHeader || entry.primaryZoneId.IsEmpty) continue;
                 var tempList = new NativeList<FixedString128Bytes>(entry.count + _landingZones.Count, Allocator.Temp);
 
@@ -191,11 +193,12 @@ namespace jeanf.scenemanagement
                 {
                     tempList.Add(landingEnumerator.Current);
                 }
+
                 landingEnumerator.Dispose();
 
                 var checkableArray = tempList.ToArray(Allocator.Persistent);
                 tempList.Dispose();
-                    
+
                 _precomputedCheckableZones.TryAdd(entry.primaryZoneId, checkableArray);
             }
         }
@@ -207,8 +210,9 @@ namespace jeanf.scenemanagement
 
             if (currentZone.IsEmpty)
             {
-                foreach (var t in _allZones)
+                for (var index = 0; index < _allZones.Length; index++)
                 {
+                    var t = _allZones[index];
                     _checkableZoneIds.Add(t);
                 }
 
@@ -217,8 +221,9 @@ namespace jeanf.scenemanagement
 
             if (_precomputedCheckableZones.TryGetValue(currentZone, out var checkableArray))
             {
-                foreach (var t in checkableArray)
+                for (var index = 0; index < checkableArray.Length; index++)
                 {
+                    var t = checkableArray[index];
                     _checkableZoneIds.Add(t);
                 }
             }
@@ -363,17 +368,21 @@ namespace jeanf.scenemanagement
             entities.Dispose();
             levelInfos.Dispose();
 
-            foreach (var toLoad in _toLoadList)
+            for (var index = 0; index < _toLoadList.Length; index++)
             {
+                var toLoad = _toLoadList[index];
                 var streamingData = toLoad.Item2;
-                streamingData.runtimeEntity = SceneSystem.LoadSceneAsync(state.WorldUnmanaged, streamingData.sceneReference);
+                streamingData.runtimeEntity =
+                    SceneSystem.LoadSceneAsync(state.WorldUnmanaged, streamingData.sceneReference);
                 state.EntityManager.SetComponentData(toLoad.Item1, streamingData);
             }
 
-            foreach (var toUnload in _toUnloadList)
+            for (var index = 0; index < _toUnloadList.Length; index++)
             {
+                var toUnload = _toUnloadList[index];
                 var streamingData = toUnload.Item2;
-                SceneSystem.UnloadScene(state.WorldUnmanaged, streamingData.runtimeEntity, SceneSystem.UnloadParameters.DestroyMetaEntities);
+                SceneSystem.UnloadScene(state.WorldUnmanaged, streamingData.runtimeEntity,
+                    SceneSystem.UnloadParameters.DestroyMetaEntities);
                 streamingData.runtimeEntity = Entity.Null;
                 state.EntityManager.SetComponentData(toUnload.Item1, streamingData);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fr.jeanf.scenemanagement",
-  "version": "0.6.21",
+  "version": "0.6.23",
   "displayName": "Scene Management",
   "description": "This package contains two scene loading system, one is additive, the other is to load subscenes. \nBoth system are living side-by-side.\nThe dynamic systems handles the loading of all static content (environment) using subscenes.\nThe additive system loads scene additively depending on zone & region and upon scenario load/unload requests. Each region or scenario can have dependency that will remain loaded until either a region or a scenario became irrelevant.",
   "unity": "2021.3",