From b891d1e05aae292f32bf39575594810f6559fd52 Mon Sep 17 00:00:00 2001 From: Mikhail <99481254+DCFApixels@users.noreply.github.com> Date: Sat, 19 Oct 2024 00:45:22 +0800 Subject: [PATCH] update EcsRootUnity --- src/Buildin/EcsRootUnity.cs | 13 ++++++++++++- .../{DebugModule.cs => UnityDebugModule.cs} | 13 ++++++------- ...DebugModule.cs.meta => UnityDebugModule.cs.meta} | 0 3 files changed, 18 insertions(+), 8 deletions(-) rename src/DebugUtils/{DebugModule.cs => UnityDebugModule.cs} (65%) rename src/DebugUtils/{DebugModule.cs.meta => UnityDebugModule.cs.meta} (100%) diff --git a/src/Buildin/EcsRootUnity.cs b/src/Buildin/EcsRootUnity.cs index a7c23c1..fbf4531 100644 --- a/src/Buildin/EcsRootUnity.cs +++ b/src/Buildin/EcsRootUnity.cs @@ -1,4 +1,6 @@ -using System.Collections.Generic; +using DCFApixels.DragonECS.Unity; +using DCFApixels.DragonECS.Unity.Internal; +using System.Collections.Generic; using System.Linq; using UnityEditor; using UnityEngine; @@ -9,6 +11,8 @@ namespace DCFApixels.DragonECS [AddComponentMenu(EcsConsts.FRAMEWORK_NAME + "/" + nameof(EcsRootUnity), 30)] public class EcsRootUnity : MonoBehaviour { + [SerializeField] + private bool _enablePipelineDebug = true; [SerializeField] private ScriptablePipelineTemplateBase[] _scriptableTemplates; [SerializeField] @@ -46,6 +50,13 @@ namespace DCFApixels.DragonECS if (template == null) { continue; } pipelineBuilder.Add(template); } +#if UNITY_EDITOR + if (_enablePipelineDebug) + { + pipelineBuilder.Layers.Insert(EcsConsts.POST_END_LAYER, EcsUnityConsts.DEBUG_LAYER); + pipelineBuilder.AddUnique(new PipelineMonitorSystem(), EcsUnityConsts.DEBUG_LAYER); + } +#endif _pipeline = pipelineBuilder.BuildAndInit(); } diff --git a/src/DebugUtils/DebugModule.cs b/src/DebugUtils/UnityDebugModule.cs similarity index 65% rename from src/DebugUtils/DebugModule.cs rename to src/DebugUtils/UnityDebugModule.cs index f3b1aa7..9c3743b 100644 --- a/src/DebugUtils/DebugModule.cs +++ b/src/DebugUtils/UnityDebugModule.cs @@ -7,22 +7,21 @@ namespace DCFApixels.DragonECS [MetaGroup(EcsUnityConsts.PACK_GROUP, EcsConsts.DEBUG_GROUP)] [MetaDescription(EcsConsts.AUTHOR, "...")] [MetaID("1D16B980920108B62A0971E4058A3E01")] - public sealed class DebugModule : IEcsModule + public sealed class UnityDebugModule : IEcsModule { - public const string DEBUG_LAYER = EcsUnityConsts.DEBUG_LAYER; public EcsWorld[] _worlds; - public DebugModule(params EcsWorld[] worlds) + public UnityDebugModule(params EcsWorld[] worlds) { _worlds = worlds; } void IEcsModule.Import(EcsPipeline.Builder b) { UnityDebugService.Activate(); - b.Layers.Insert(EcsConsts.POST_END_LAYER, DEBUG_LAYER); - b.AddUnique(new PipelineMonitorSystem(), DEBUG_LAYER); + b.Layers.Insert(EcsConsts.POST_END_LAYER, EcsUnityConsts.DEBUG_LAYER); + b.AddUnique(new PipelineMonitorSystem(), EcsUnityConsts.DEBUG_LAYER); foreach (var world in _worlds) { - b.Add(new WorldMonitorSystem(world), DEBUG_LAYER); + b.Add(new WorldMonitorSystem(world), EcsUnityConsts.DEBUG_LAYER); } } } @@ -31,7 +30,7 @@ namespace DCFApixels.DragonECS { public static EcsPipeline.Builder AddUnityDebug(this EcsPipeline.Builder self, params EcsWorld[] worlds) { - self.AddModule(new DebugModule(worlds)); + self.AddModule(new UnityDebugModule(worlds)); return self; } } diff --git a/src/DebugUtils/DebugModule.cs.meta b/src/DebugUtils/UnityDebugModule.cs.meta similarity index 100% rename from src/DebugUtils/DebugModule.cs.meta rename to src/DebugUtils/UnityDebugModule.cs.meta