New array Extension plus tests

XRTK-Core/Assets/XRTK.Tests/Core/TestFixture_02_MixedRealityToolkitUtilityTests.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) XRTK. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using NUnit.Framework;

XRTK-Core/Assets/XRTK.Tests/Core/TestFixture_03_ExtensionsTests.cs

@@ -0,0 +1,58 @@
+// Copyright (c) XRTK. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using NUnit.Framework;
+using UnityEngine;
+using XRTK.Extensions;
+
+namespace XRTK.Tests.Core
+{
+    public class TestFixture_03_ExtensionsTests
+    {
+        [Test]
+        public void Test_01_Array_AddItem_Extension()
+        {
+            Vector2[] testArray = null;
+            Vector2[] newArray =  null;
+            try
+            {
+                newArray = testArray.AddItem(Vector2.zero);
+            }
+            catch { }
+
+            Assert.IsNotNull(newArray);
+
+            testArray = new Vector2[5];
+            newArray = testArray.AddItem(Vector2.one);
+
+            Assert.IsTrue(newArray[newArray.Length - 1] == Vector2.one);
+            Assert.IsTrue(newArray.Length > testArray.Length);
+            Assert.IsTrue(newArray.Length - testArray.Length == 1);
+        }
+
+        [Test]
+        public void Test_02_Array_InitialiseArray_Extension()
+        {
+            Vector2[] testArray = null;
+            Vector2[] newArray = null;
+            try
+            {
+                newArray = testArray.InitialiseArray(Vector2.one);
+            }
+            catch { }
+
+            Assert.IsNotNull(newArray);
+            Assert.IsTrue(newArray.Length == 1);
+            Assert.IsTrue(newArray[0] == Vector2.one);
+
+            testArray = new Vector2[5];
+            for (int i = 0; i < testArray.Length; i++)
+            {
+                testArray[i] = Vector2.one;
+            }
+            newArray = testArray.InitialiseArray(Vector2.zero);
+
+            Assert.IsTrue(newArray[0] == Vector2.zero);
+        }
+    }
+}

XRTK-Core/Packages/com.xrtk.core/Extensions/ArrayExtensions.cs

@@ -37,12 +37,43 @@ public static bool IsValidArray(this Array array)
         /// <param name="array">The array to extend</param>
         /// <param name="newItem">The item to add to the array</param>
         /// <returns></returns>
-        public static T[] AddItem<T>(this T[] array, T newItem, int insertAtIndex = 0)
+        public static T[] AddItem<T>(this T[] array, T newItem)
         {
+            // Initialise the array if it is null
+            if (array == null)
+            {
+                array = new T[0];
+            }
+
+            //Extend the array, copy the items and add the new one
             var newArray = new T[array.Length + 1];
-            array.CopyTo(newArray, insertAtIndex);
+            array.CopyTo(newArray, 0);
             newArray[array.Length] = newItem;
             return newArray;
         }
+
+        /// <summary>
+        /// Initialises an array with a default item
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="array">The array to initialise</param>
+        /// <param name="newItem">The default item to set all the array items to</param>
+        /// <returns></returns>
+        public static T[] InitialiseArray<T>(this T[] array, T newItem)
+        {
+            // Initialise the array if it is null
+            if (array == null)
+            {
+                array = new T[1];
+            }
+
+            //Set all the items to the provided value
+            for (int i = 0; i < array.Length; i++)
+            {
+                array[i] = newItem;
+            }
+
+            return array;
+        }
     }
 }