Moved Validation methods into Component and Removed "Samples"

knowlife4 · Mar 10, 2023 · fbd61bc · fbd61bc
1 parent a648912
commit fbd61bc
Show file tree

Hide file tree

Showing 29 changed files with 7 additions and 1,062 deletions.
diff --git a/Runtime/ECTComponent.cs b/Runtime/ECTComponent.cs
@@ -43,6 +43,7 @@ public virtual IEnumerable<IComponent> GetComponentsRecursively()
         }
 
         protected static IValidation ValidateReferences(params UnityEngine.Object[] references) => ECTValidation.ValidateReferences(references);
+        protected static IValidation ValidateReference<T>(T input, out T output) where T : UnityEngine.Object => ECTValidation.ValidateReference(input, out output);
 
         public abstract class System<TComponent> : ECTSystem<TRoot, TParent, TComponent, ECTSystemData> where TComponent : class, IComponent { }
 

diff --git a/Runtime/ECTComponentParent.cs b/Runtime/ECTComponentParent.cs
@@ -42,10 +42,8 @@ public override TSystem GetSystem<TSystem>()
 
         public new abstract class System<TComponent> : ECTSystem<TRoot, TParent, TComponent, ComponentParentSystemData> where TComponent : class, IComponent, IParent
         {
-            protected override void OnUpdate()
-            {
-                Data.DataGroup.Update(Root, Component);
-            }
+            public void UpdateSystems() => Data.DataGroup.Update(Root, Component);
+            protected override void OnUpdate() => UpdateSystems();
         }
 
         public abstract class Component : ECTComponent<TRoot, TComponentParent> { }

diff --git a/Runtime/ECTSystem.cs b/Runtime/ECTSystem.cs
@@ -29,7 +29,6 @@ protected virtual void OnInitialize() { }
 
         public IValidation QuerySystem<TSystem>(out TSystem found) where TSystem : class, ISystem => Root.QuerySystem(out found);
         public IValidation QueryReference<TReference>(out TReference found) where TReference : struct, ISceneReference => Root.QueryReference(out found);
-        public IValidation ValidateReference<T>(T input, out T output) where T : UnityEngine.Object => ECTValidation.ValidateReference(input, out output);
         public ECTBoolValidation Subscribe(ECTAction ectAction, Action action)
         {
             ectAction.Subscribe(action);

diff --git a/Samples/.gitignore b/Samples/.gitignore
diff --git a/Samples/Platformer.meta b/Samples/Platformer.meta
diff --git a/Samples/Platformer/Components.meta b/Samples/Platformer/Components.meta
diff --git a/Samples/Platformer/Components/Player.meta b/Samples/Platformer/Components/Player.meta
diff --git a/Samples/Platformer/Components/Player/MovementRotate.asset b/Samples/Platformer/Components/Player/MovementRotate.asset
diff --git a/Samples/Platformer/Components/Player/MovementRotate.asset.meta b/Samples/Platformer/Components/Player/MovementRotate.asset.meta
diff --git a/Samples/Platformer/Components/Player/MovementWalk.asset b/Samples/Platformer/Components/Player/MovementWalk.asset
diff --git a/Samples/Platformer/Components/Player/MovementWalk.asset.meta b/Samples/Platformer/Components/Player/MovementWalk.asset.meta
diff --git a/Samples/Platformer/Components/Player/PlayerMovement.asset b/Samples/Platformer/Components/Player/PlayerMovement.asset
diff --git a/Samples/Platformer/Components/Player/PlayerMovement.asset.meta b/Samples/Platformer/Components/Player/PlayerMovement.asset.meta
diff --git a/Samples/Platformer/Materials.meta b/Samples/Platformer/Materials.meta
diff --git a/Samples/Platformer/Materials/Test.mat b/Samples/Platformer/Materials/Test.mat
diff --git a/Samples/Platformer/Materials/Test.mat.meta b/Samples/Platformer/Materials/Test.mat.meta