fr.jeanf.scenemanagement 0.0.21 → 0.0.23

package/Runtime/AdditiveLoading/ScenarioManager.cs

@@ -17,6 +17,9 @@ namespace jeanf.scenemanagement
         [SerializeField] private VoidEventChannelSO KillAllScenariosRequest;
 
         public static Dictionary<string, List<AppType>> activeOverridesPerZone = new Dictionary<string, List<AppType>>();
+        
+        public delegate void ScenarioStateChanged(string zoneId);
+        public static ScenarioStateChanged OnZoneOverridesChanged;
         private void Awake()
         {
             _sceneLoader = this.GetComponent<SceneLoader>();
@@ -53,6 +56,7 @@ namespace jeanf.scenemanagement
             foreach (var zoneOverride in ScenarioDictionary[scenarioID].ZoneOverrides)
             {
                 activeOverridesPerZone.Add(zoneOverride.zone.id, zoneOverride.AppsForThisZone_Override);
+                OnZoneOverridesChanged?.Invoke(zoneOverride.zone.id);
             }
 
             foreach (var scene in CompileSceneList(scenario))
@@ -78,6 +82,7 @@ namespace jeanf.scenemanagement
             foreach (var zoneOverride in ScenarioDictionary[scenarioID].ZoneOverrides)
             {
                 activeOverridesPerZone.Remove(zoneOverride.zone.id);
+                OnZoneOverridesChanged?.Invoke(zoneOverride.zone.id);
             }
             foreach (var scene in CompileSceneList(scenario))
             {
@@ -90,11 +95,25 @@ namespace jeanf.scenemanagement
         {
             var scenariosToRemove = _activeScenarios;
             var obsoleteScenarios = scenariosToRemove.Select(scenario => UnloadScenario(scenario.id)).Where(scenarioToUnload => scenarioToUnload is not null).ToList();
+            var affectedZones = new HashSet<string>();
+            // Collect all affected zones before unloading
+            foreach (var scenario in scenariosToRemove)
+            {
+                foreach (var zoneOverride in scenario.ZoneOverrides)
+                {
+                    affectedZones.Add(zoneOverride.zone.id);
+                }
+            }
 
             foreach (var obsoleteScenario in obsoleteScenarios)
             {
                 _activeScenarios.Remove(obsoleteScenario);
             }
+            // Notify for all affected zones after everything is unloaded
+            foreach (var zoneId in affectedZones)
+            {
+                OnZoneOverridesChanged?.Invoke(zoneId);
+            }
         }
 
         private static List<string> CompileSceneList(Scenario scenario)

package/Runtime/AdditiveLoading/WorldManager.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using jeanf.EventSystem;
+using jeanf.propertyDrawer;
 using jeanf.vrplayer;
 
 namespace jeanf.scenemanagement
@@ -25,8 +26,20 @@ namespace jeanf.scenemanagement
         [SerializeField] private StringEventChannelSO regionChangeRequestChannel;
         [SerializeField] private SendTeleportTarget sendTeleportTarget;
 
-        public static Zone CurrentPlayerZone { get; private set; }
-        public static Region CurrentPlayerRegion { get; private set; }
+        [ReadOnly] [SerializeField] private Zone _currentPlayerZone;
+        private static WorldManager Instance;
+        public static Zone CurrentPlayerZone 
+        { 
+            get => Instance._currentPlayerZone;
+            private set => Instance._currentPlayerZone = value;
+        }
+        
+        [ReadOnly] [SerializeField] private Region _currentPlayerRegion;
+        public static Region CurrentPlayerRegion
+        { 
+            get => Instance._currentPlayerRegion;
+            private set => Instance._currentPlayerRegion = value;
+        }
 
         public delegate void SendId(string newRegionID);
         public static SendId RequestRegionChange;
@@ -45,6 +58,7 @@ namespace jeanf.scenemanagement
 
         private void Awake()
         {
+            Instance = this;
             _sceneLoader = this.GetComponent<SceneLoader>();
             Init();
         }
@@ -60,6 +74,7 @@ namespace jeanf.scenemanagement
             
             ZoneContainer.broadcastObject += SetCurrentZoneAndRegion;
             ResetWorld += Init;
+            ScenarioManager.OnZoneOverridesChanged += OnZoneOverridesChanged;
         }
 
         private void Unsubscribe()
@@ -69,6 +84,7 @@ namespace jeanf.scenemanagement
             
             ZoneContainer.broadcastObject -= SetCurrentZoneAndRegion;
             ResetWorld -= Init;
+            ScenarioManager.OnZoneOverridesChanged -= OnZoneOverridesChanged;
         }
 
 
@@ -102,6 +118,16 @@ namespace jeanf.scenemanagement
                 _dependenciesPerRegion.TryAdd(region.id, region.dependenciesInThisRegion);
             }
         }
+        
+        // Add new method to handle zone override changes
+        private void OnZoneOverridesChanged(string zoneId)
+        {
+            // Only update if we're in the affected zone
+            if (CurrentPlayerZone != null && CurrentPlayerZone.id == zoneId)
+            {
+                PublishAppList(CurrentPlayerZone);
+            }
+        }
 
         private void SetCurrentZoneAndRegion(GameObject gameObject, Zone zone)
         {
@@ -161,12 +187,13 @@ namespace jeanf.scenemanagement
         private void PublishAppList(Zone zone)
         {
             var listToBroadcast = zone.DefaultAppsInZone;
+            if(isDebug) Debug.Log($"[WorldManager] Default list for zone [{zone.name}] : [{string.Join(", ", listToBroadcast)}]");
             // check if for this zone there is no override 
             if (ScenarioManager.activeOverridesPerZone.TryGetValue(zone.id, out var value))
             {
                 // if yes, send override list
                 listToBroadcast = value;
-                Debug.Log($"[WorldManager] List override found: [{string.Join(", ", listToBroadcast)}]");
+                if(isDebug) Debug.Log($"[WorldManager] List override found for zone [{zone.name}] : [{string.Join(", ", listToBroadcast)}]");
             }
             
             // broadcast list

package/Runtime/DynamicLoading/VolumeSystem.cs

@@ -13,12 +13,14 @@ namespace jeanf.scenemanagement
     {
         private EntityQuery _relevantQuery;
         private EntityQuery _volumeSetQuery;
+        private EntityQuery _configQuery;
         private NativeHashSet<Entity> _activeScenes;
         private NativeHashSet<Entity> _preloadingScenes;
         
-        private const float PRELOAD_HORIZONTAL_MULTIPLIER = 2.0f;
-        private const float PRELOAD_VERTICAL_MULTIPLIER = 1.0f;
-        private const int MAX_OPERATIONS_PER_FRAME = 2;
+        // Default values if no config is present
+        private const float DEFAULT_PRELOAD_HORIZONTAL_MULTIPLIER = 1.0f;
+        private const float DEFAULT_PRELOAD_VERTICAL_MULTIPLIER = 1.0f;
+        private const int DEFAULT_MAX_OPERATIONS_PER_FRAME = 2;
 
         [BurstCompile]
         public void OnCreate(ref SystemState state)
@@ -33,6 +35,10 @@ namespace jeanf.scenemanagement
                 .WithAll<VolumeBuffer>()  // Changed from WithReadOnly to WithAll
                 .Build(ref state);
             
+            _configQuery = new EntityQueryBuilder(Allocator.Temp)
+                .WithAll<VolumeSystemConfig>()
+                .Build(ref state);
+            
             //_relevantQuery = state.GetEntityQuery(
             //    ComponentType.ReadOnly<Relevant>(),
             //    ComponentType.ReadOnly<LocalToWorld>());
@@ -55,6 +61,8 @@ namespace jeanf.scenemanagement
             [ReadOnly] public ComponentLookup<LocalToWorld> LocalToWorldLookup;
             [ReadOnly] public ComponentLookup<Volume> VolumeLookup;
             [ReadOnly] public BufferLookup<VolumeBuffer> VolumeBufferLookup;
+            [ReadOnly] public float PreloadHorizontalMultiplier;  // Added this
+            [ReadOnly] public float PreloadVerticalMultiplier;    // Added this
             
             public NativeHashSet<Entity> ContainingVolumes;
             public NativeHashSet<Entity> NearbyVolumes;
@@ -70,9 +78,9 @@ namespace jeanf.scenemanagement
             private bool IsPositionNearVolume(float3 position, float3 volumePosition, float3 range)
             {
                 var distance = math.abs(position - volumePosition);
-                bool isNearHorizontally = distance.x < range.x * PRELOAD_HORIZONTAL_MULTIPLIER && 
-                                        distance.z < range.z * PRELOAD_HORIZONTAL_MULTIPLIER;
-                bool isNearVertically = distance.y < range.y * PRELOAD_VERTICAL_MULTIPLIER;
+                bool isNearHorizontally = distance.x < range.x * PreloadHorizontalMultiplier && 
+                                        distance.z < range.z * PreloadHorizontalMultiplier;
+                bool isNearVertically = distance.y < range.y * PreloadVerticalMultiplier;
                 return isNearHorizontally && isNearVertically;
             }
 
@@ -203,9 +211,21 @@ namespace jeanf.scenemanagement
             }
         }
 
-        [BurstCompile]
         public void OnUpdate(ref SystemState state)
         {
+            // Get config values with fallback to defaults
+            float preloadHorizontalMultiplier = DEFAULT_PRELOAD_HORIZONTAL_MULTIPLIER;
+            float preloadVerticalMultiplier = DEFAULT_PRELOAD_VERTICAL_MULTIPLIER;
+            int maxOperationsPerFrame = DEFAULT_MAX_OPERATIONS_PER_FRAME;
+
+            if (_configQuery.HasSingleton<VolumeSystemConfig>())
+            {
+                var config = SystemAPI.GetSingleton<VolumeSystemConfig>();
+                preloadHorizontalMultiplier = config.PreloadHorizontalMultiplier;
+                preloadVerticalMultiplier = config.PreloadVerticalMultiplier;
+                maxOperationsPerFrame = config.MaxOperationsPerFrame;
+            }
+            
             var relevantTransforms = _relevantQuery.ToComponentDataArray<LocalToWorld>(Allocator.TempJob);
             var playerPosition = relevantTransforms[0].Position;
             var volumeSets = _volumeSetQuery.ToEntityArray(Allocator.TempJob);
@@ -228,7 +248,9 @@ namespace jeanf.scenemanagement
                 VolumeLookup = SystemAPI.GetComponentLookup<Volume>(true),
                 VolumeBufferLookup = SystemAPI.GetBufferLookup<VolumeBuffer>(true),
                 ContainingVolumes = containingVolumes,
-                NearbyVolumes = nearbyVolumes
+                NearbyVolumes = nearbyVolumes,
+                PreloadHorizontalMultiplier = preloadHorizontalMultiplier,
+                PreloadVerticalMultiplier = preloadVerticalMultiplier
             };
 
             // Schedule scene filter job
@@ -261,7 +283,7 @@ namespace jeanf.scenemanagement
             sceneChangeHandle.Complete();
 
             // Process scene operations (this part cannot be burst compiled or parallelized due to SceneSystem calls)
-            ProcessSceneOperations(ref state, scenesToUnload, scenesToLoad, scenesToPreload);
+            ProcessSceneOperations(ref state, scenesToUnload, scenesToLoad, scenesToPreload, maxOperationsPerFrame);
 
             // Cleanup
             relevantTransforms.Dispose();
@@ -275,14 +297,14 @@ namespace jeanf.scenemanagement
             scenesToPreload.Dispose();
         }
 
-        private void ProcessSceneOperations( ref SystemState state, NativeList<Entity> scenesToUnload, NativeList<Entity> scenesToLoad, NativeList<Entity> scenesToPreload)
+        private void ProcessSceneOperations( ref SystemState state, NativeList<Entity> scenesToUnload, NativeList<Entity> scenesToLoad, NativeList<Entity> scenesToPreload, int maxOperationsPerFrame)
         {
             var operationsThisFrame = 0;
 
             // Process unloads first
             foreach (var scene in scenesToUnload)
             {
-                if (operationsThisFrame >= MAX_OPERATIONS_PER_FRAME) break;
+                if (operationsThisFrame >= maxOperationsPerFrame) break;
                 
                 // Check if entity exists before trying to access it
                 if (!state.EntityManager.Exists(scene)) 
@@ -318,7 +340,7 @@ namespace jeanf.scenemanagement
             // Process loads
             foreach (var scene in scenesToLoad)
             {
-                if (operationsThisFrame >= MAX_OPERATIONS_PER_FRAME) break;
+                if (operationsThisFrame >= maxOperationsPerFrame) break;
                 
                 if (!state.EntityManager.Exists(scene) || !state.EntityManager.HasComponent<LevelInfo>(scene))
                 {
@@ -341,7 +363,7 @@ namespace jeanf.scenemanagement
             // Process preloads
             foreach (var scene in scenesToPreload)
             {
-                if (operationsThisFrame >= MAX_OPERATIONS_PER_FRAME) break;
+                if (operationsThisFrame >= maxOperationsPerFrame) break;
                 
                 if (!state.EntityManager.Exists(scene) || !state.EntityManager.HasComponent<LevelInfo>(scene))
                 {

package/Runtime/DynamicLoading/VolumeSystemAuthoring.cs

@@ -0,0 +1,33 @@
+using Unity.Entities;
+using UnityEngine;
+
+namespace jeanf.scenemanagement
+{
+    public class VolumeSystemAuthoring : MonoBehaviour
+    {
+        public float preloadHorizontalMultiplier = 2.0f;
+        public float preloadVerticalMultiplier = 1.0f;
+        public int maxOperationsPerFrame = 2;
+
+        class Baker : Baker<VolumeSystemAuthoring>
+        {
+            public override void Bake(VolumeSystemAuthoring authoring)
+            {
+                var entity = GetEntity(TransformUsageFlags.None);
+                AddComponent(entity, new VolumeSystemConfig
+                {
+                    PreloadHorizontalMultiplier = authoring.preloadHorizontalMultiplier,
+                    PreloadVerticalMultiplier = authoring.preloadVerticalMultiplier,
+                    MaxOperationsPerFrame = authoring.maxOperationsPerFrame
+                });
+            }
+        }
+    }
+
+    public struct VolumeSystemConfig : IComponentData
+    {
+        public float PreloadHorizontalMultiplier;
+        public float PreloadVerticalMultiplier;
+        public int MaxOperationsPerFrame;
+    }
+}

package/Runtime/DynamicLoading/VolumeSystemAuthoring.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d2b2dee6072489842b61e469ffe698de

package/Samples/Example/ObjectThatFollowsCamera.prefab

@@ -0,0 +1,46 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6922798849384411428
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4453093168078531673}
+  - component: {fileID: 7398194448339198983}
+  m_Layer: 0
+  m_Name: ObjectThatFollowsCamera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4453093168078531673
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6922798849384411428}
+  serializedVersion: 2
+  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: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7398194448339198983
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6922798849384411428}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ba0952901a8ec71478ebf3e3f21a9f0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

package/Samples/Example/ObjectThatFollowsCamera.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 646e3b510c41d3044be0d8aa4f54453f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Samples/Example/RegionData/Region_00/Region_00.asset

@@ -0,0 +1,38 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c96c6420dc848df48969d92d82fab61f, type: 3}
+  m_Name: Region_00
+  m_EditorClassIdentifier: 
+  id:
+    id: f6a8a488-c421-48db-8b31-fc5d846a16fa
+  Coordinate:
+    x: 0
+    y: 0
+  levelName: region_00
+  level: 0
+  scenariosInThisRegion:
+  - {fileID: 11400000, guid: da48d91e553f86f47add3deca44799c2, type: 2}
+  zonesInThisRegion:
+  - {fileID: 11400000, guid: 2b0939a48ac9b554d9da18a49189cb9d, type: 2}
+  - {fileID: 11400000, guid: a171907111fad6941a4b6e06501f0a26, type: 2}
+  - {fileID: 11400000, guid: 31277bf1125592b41afff901df8ad815, type: 2}
+  - {fileID: 11400000, guid: 89857cc01bad650448624ec63199b051, type: 2}
+  dependenciesInThisRegion:
+  - sceneAsset: {fileID: 102900000, guid: eca06b9066d8efb4fae7239d6bec44d5, type: 3}
+    sceneName: World_depedency
+  SpawnPosOnRegionChangeRequest:
+    position: {x: 2.5, y: 0, z: 2.5}
+    rotation: {x: 0, y: 0, z: 0}
+  isUsingOnInitSpawnPos: 1
+  SpawnPosOnInit:
+    position: {x: -2.5, y: 0, z: -2.5}
+    rotation: {x: 0, y: 0, z: 0}

package/Samples/Example/RegionData/Region_00/Region_00.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bbabf3e47905c1b4da96100c0b4e4484
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: