Removed resizing from HeapArray and fixed windows packaging

Author: Raelr

engine/utils/collections/HeapArray.h

@@ -265,39 +265,6 @@ class MHArray
         count--;
     }
 
-    /**
-     * @brief Resizes the array. Re-allocates the memory to a new size and adjusts the stateMask
-     * accordingly
-     * @param newSize the new size of the array
-     */
-    void Resize(size_t newSize)
-    {
-        // Setting the array to 0 is the equivalent of destroying the array.
-        if (newSize == 0)
-        {
-            Destroy();
-            return;
-        }
-
-        // Every 8 positions are represented with one 8-bit unsigned integer. As such, every 8
-        // elements in the array represents one to the size of our collection of byte masks.
-        size_t newByteCount = ((newSize / BitUtils::BYTE_SIZE_IN_BITS) + 1);
-
-        // Reallocate the two pointers
-        ReallocateMemory(newSize);
-
-        // Resize our state mask. Reallocating the states simply changes the number of bytes.
-        // We need to change the last byte available to us to represent the new number of possible
-        // states.
-        bitField.Resize(newByteCount);
-        bitField.UnsetPostBits(newSize);
-
-        size = newSize;
-
-        // Adjust the count to be within the range of our new size.
-        count = ArrayUtils::SetCount(count, 0, newSize);
-    }
-
     /**
      * @brief Checks if an array element has been filled
      * @param index the index of the element we want to check
@@ -551,7 +518,6 @@ class MHArray
     void DeallocateMemory()
     {
         free(data);
-        bitField.Clear();
     }
 
     /**

examples/game/Makefile

@@ -72,5 +72,5 @@ render-assets:
 
 # Package the built application and all its assets to the output directory
 package: all
-	$(RM) $(call platformpth,$(outputDir)/$(exampleGameOutputName))
+	$(RM) "$(outputDir)/$(exampleGameOutputName)"
 	$(call PACKAGE_SCRIPT, $(exampleGameOutputName), $(shell basename $(exampleGameApp)), $(outputDir), $(exampleGameBuildDir))

tests/utils/test_MHArray.cpp

@@ -509,87 +509,6 @@ UTEST(test_MHArray, IterateWithFastIteratorWithGaps)
     }
 }
 
-UTEST(test_MHArray, ResizeArray)
-{
-    MHArray<uint32_t> array({1, 2, 3, 4});
-
-    ASSERT_EQ(array.Size(), 4);
-    ASSERT_EQ(array.Count(), 4);
-
-    ASSERT_EQ(array[0], 1);
-    ASSERT_EQ(array[1], 2);
-    ASSERT_EQ(array[2], 3);
-    ASSERT_EQ(array[3], 4);
-
-    array.Resize(6);
-
-    ASSERT_EQ(array.Size(), 6);
-    ASSERT_EQ(array.Count(), 4);
-
-    ASSERT_EQ(array[0], 1);
-    ASSERT_EQ(array[1], 2);
-    ASSERT_EQ(array[2], 3);
-    ASSERT_EQ(array[3], 4);
-
-    ASSERT_FALSE(array.IsActive(4));
-    ASSERT_FALSE(array.IsActive(5));
-
-    array[4] = 5;
-    array[5] = 6;
-
-    ASSERT_TRUE(array.IsActive(4));
-    ASSERT_TRUE(array.IsActive(5));
-
-    ASSERT_EQ(array[4], 5);
-    ASSERT_EQ(array[5], 6);
-    ASSERT_EQ(array.Count(), 6);
-}
-
-UTEST(test_MHArray, ResizeArrayToSmallerSize)
-{
-    MHArray<uint32_t> array({1, 2, 3, 4});
-
-    ASSERT_EQ(array.Size(), 4);
-    ASSERT_EQ(array.Count(), 4);
-
-    ASSERT_EQ(array[0], 1);
-    ASSERT_EQ(array[1], 2);
-    ASSERT_EQ(array[2], 3);
-    ASSERT_EQ(array[3], 4);
-
-    array.Resize(2);
-
-    ASSERT_EQ(array.Size(), 2);
-    ASSERT_EQ(array.Count(), 2);
-
-    ASSERT_EQ(array[0], 1);
-    ASSERT_EQ(array[1], 2);
-
-    ASSERT_TRUE(array.IsActive(0));
-    ASSERT_TRUE(array.IsActive(1));
-    ASSERT_FALSE(array.IsActive(2));
-    ASSERT_FALSE(array.IsActive(3));
-}
-
-UTEST(test_MHArray, ResizeLargeArray)
-{
-    MHArray<uint32_t> array({1, 2, 3, 4, 5, 6, 7, 8, 9, 10});
-
-    ASSERT_EQ(array.Size(), 10);
-    ASSERT_EQ(array.Count(), 10);
-
-    uint32_t number = 1;
-
-    for (auto it = array.CreateIterator(); it; ++it) ASSERT_EQ(number++, *it);
-
-    array.Resize(9);
-
-    ASSERT_EQ(array.Size(), 9);
-    ASSERT_EQ(array.Count(), 9);
-
-    ASSERT_FALSE(array.IsActive(9));
-}
-
 UTEST(test_MHArray, ClearArray)
 {
     MHArray<uint32_t> array({1, 2});