fr.jeanf.scenemanagement 0.7.2 → 0.7.4

package/Runtime/SectionStreaming/SectionRangeSystem.cs

@@ -88,8 +88,7 @@ namespace jeanf.SceneManagement
                 playerTransforms.Dispose();
             }
 
-            bool playerMoved = !_hasLastPosition ||
-                (hasPlayer && math.lengthsq(playerPosition - _lastPlayerPosition) > MOVEMENT_THRESHOLD_SQ);
+            bool playerMoved = !_hasLastPosition || (hasPlayer && math.lengthsq(playerPosition - _lastPlayerPosition) > MOVEMENT_THRESHOLD_SQ);
 
             int sectionCount = _sectionQuery.CalculateEntityCount();
             bool hasNewSections = sectionCount != _interceptedSections.Count;
@@ -122,6 +121,7 @@ namespace jeanf.SceneManagement
             _sectionsToLoad.Clear();
 
             var ecb = new EntityCommandBuffer(Allocator.Temp);
+            bool interceptedNewSections = false;
 
             for (int i = 0; i < sectionEntities.Length; i++)
             {
@@ -155,6 +155,8 @@ namespace jeanf.SceneManagement
                 if (isNewSection)
                 {
                     s_InterceptMarker.Begin();
+                    interceptedNewSections = true;
+
                     if (!shouldBeLoaded)
                     {
                         if (hasRequestSceneLoaded)
@@ -168,6 +170,13 @@ namespace jeanf.SceneManagement
                             SceneSystem.UnloadScene(state.WorldUnmanaged, sectionEntity, SceneSystem.UnloadParameters.Default);
                         }
                     }
+                    else
+                    {
+                        if (!hasRequestSceneLoaded)
+                        {
+                            ecb.AddComponent<RequestSceneLoaded>(sectionEntity);
+                        }
+                    }
 
                     _interceptedSections.Add(sectionEntity);
                     s_InterceptMarker.End();
@@ -184,17 +193,14 @@ namespace jeanf.SceneManagement
                     }
                     else
                     {
-                        if (_sectionsToLoad.Count > 0)
+                        if (hasRequestSceneLoaded)
                         {
-                            if (hasRequestSceneLoaded)
-                            {
-                                ecb.RemoveComponent<RequestSceneLoaded>(sectionEntity);
-                            }
-
-                            if (sectionState == SceneSystem.SectionStreamingState.Loaded)
-                            {
-                                SceneSystem.UnloadScene(state.WorldUnmanaged, sectionEntity, SceneSystem.UnloadParameters.Default);
-                            }
+                            ecb.RemoveComponent<RequestSceneLoaded>(sectionEntity);
+                        }
+
+                        if (sectionState == SceneSystem.SectionStreamingState.Loaded)
+                        {
+                            SceneSystem.UnloadScene(state.WorldUnmanaged, sectionEntity, SceneSystem.UnloadParameters.Default);
                         }
                     }
                     s_LoadUnloadMarker.End();

package/Samples/Example/Scenes/Section.unity

@@ -4836,7 +4836,8 @@ MonoBehaviour:
   sectionDistances:
   - 25
   - 100
-  sectionIndices: 0100000002000000
+  - 200
+  sectionIndices: 010000000200000003000000
 --- !u!4 &1757271947
 Transform:
   m_ObjectHideFlags: 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fr.jeanf.scenemanagement",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "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",