ICompositeParent: Added some generic methods for getting concrete-t…

…yped children.
cocodrilodog · May 28, 2024 · 05df56b · 05df56b
1 parent 13f43cf
commit 05df56b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/Scripts/MotionKitBlocks/Motion3DBlock.cs b/Scripts/MotionKitBlocks/Motion3DBlock.cs
@@ -9,7 +9,7 @@ namespace CocodriloDog.MotionKit {
 	/// Block for <see cref="Vector3"/> motions.
 	/// </summary>
 	[Serializable]
-	public class Motion3DBlock : MotionBaseBlock<Vector3, Motion3D, Motion2DValues> {
+	public class Motion3DBlock : MotionBaseBlock<Vector3, Motion3D, Motion3DValues> {
 
 
 		#region Public Methods

diff --git a/Scripts/MotionKitBlocks/MotionKitComponent.cs b/Scripts/MotionKitBlocks/MotionKitComponent.cs
@@ -173,7 +173,7 @@ public MotionKitBlock GetChild(string name) {
 
 		public T GetChild<T>(string name) where T : MotionKitBlock {
 			TryInitialize();
-			return Blocks.FirstOrDefault(b => b != null && b.Name == name) as T;
+			return GetChild(name) as T;
 		}
 
 		public MotionKitBlock GetChildAtPath(string path) {

diff --git a/Scripts/MotionKitBlocks/ParallelBlock.cs b/Scripts/MotionKitBlocks/ParallelBlock.cs
@@ -106,8 +106,12 @@ public override void Dispose() {
 
 		public MotionKitBlock GetChild(string name) => Items.FirstOrDefault(b => b != null && b.Name == name);
 
+		public T GetChild<T>(string name) where T : MotionKitBlock => GetChild(name) as T;
+
 		public MotionKitBlock GetChildAtPath(string path) => CompositeObjectUtility.GetChildAtPath(this, path);
 
+		public T GetChildAtPath<T>(string path) where T : MotionKitBlock => GetChildAtPath(path) as T;
+
 		public MotionKitBlock[] GetChildren() => Items.ToArray();
 
 		public override void SetItem(int index, MotionKitBlock block) => m_ParallelItems[index] = block;

diff --git a/Scripts/MotionKitBlocks/SequenceBlock.cs b/Scripts/MotionKitBlocks/SequenceBlock.cs
@@ -106,8 +106,16 @@ public override void Dispose() {
 
 		public MotionKitBlock GetChild(string name) => Items.FirstOrDefault(b => b != null && b.Name == name);
 
+		public T GetChild<T>(string name) where T : MotionKitBlock {
+			return GetChild(name) as T;
+		}
+
 		public MotionKitBlock GetChildAtPath(string path) => CompositeObjectUtility.GetChildAtPath(this, path);
 
+		public T GetChildAtPath<T>(string path) where T : MotionKitBlock {
+			return GetChildAtPath(path) as T;
+		}
+
 		public MotionKitBlock[] GetChildren() => Items.ToArray();
 
 		public override void SetItem(int index, MotionKitBlock block) => m_SequenceItems[index] = block;