more changes

Author: jnyfah

ZEngine/ZEngine/Core/Container/Array.h

@@ -107,10 +107,6 @@ namespace ZEngine::Core::Container
 
         void clear()
         {
-            for (size_type i = 0; i < m_size; ++i)
-            {
-                m_data[i].~T();
-            }
             m_size = 0;
         }
 
@@ -152,7 +148,6 @@ namespace ZEngine::Core::Container
         {
             ZENGINE_VALIDATE_ASSERT(m_size > 0, "Index out of range")
             --m_size;
-            m_data[m_size].~T();
         }
 
         ~Array()
@@ -171,8 +166,7 @@ namespace ZEngine::Core::Container
 
             size_t old_alloc_size = m_capacity * sizeof(T);
             size_t new_alloc_size = new_capacity * sizeof(T);
-
-            m_data                = static_cast<pointer>(m_allocator->Resize(m_data, old_alloc_size, new_alloc_size, alignof(value_type)));
+            m_data                = static_cast<pointer>(ZENGINE_RESIZE_MEMORY(m_allocator, m_data, old_alloc_size, new_alloc_size, ZENGINE_TYPE_ALIGNMENT(value_type)));
             m_capacity            = new_capacity;
         }
 

ZEngine/ZEngine/Core/Container/Strings.h

@@ -20,19 +20,17 @@ namespace ZEngine::Core::Container
         void init(Memory::ArenaAllocator* allocator, size_type initial_capacity = 16)
         {
             m_allocator = allocator;
-            m_size      = 0;
-            m_capacity  = 0;
-            m_data      = nullptr;
+            m_capacity = m_size = 0;
+            m_data              = nullptr;
             reserve(initial_capacity);
             m_data[0] = '\0';
         }
 
         void init(Memory::ArenaAllocator* allocator, const char* str)
         {
             m_allocator = allocator;
-            m_size      = 0;
-            m_capacity  = 0;
-            m_data      = nullptr;
+            m_capacity = m_size = 0;
+            m_data              = nullptr;
 
             if (str)
             {
@@ -169,7 +167,7 @@ namespace ZEngine::Core::Container
             size_t old_alloc_size = m_capacity * sizeof(char);
             size_t new_alloc_size = new_capacity * sizeof(char);
 
-            m_data                = static_cast<pointer>(m_allocator->Resize(m_data, old_alloc_size, new_alloc_size, alignof(value_type)));
+            m_data                = static_cast<pointer>(ZENGINE_RESIZE_MEMORY(m_allocator, m_data, old_alloc_size, new_alloc_size, ZENGINE_TYPE_ALIGNMENT(value_type)));
             m_capacity            = new_capacity;
         }
 

ZEngine/ZEngine/ZEngineDef.h

@@ -39,9 +39,13 @@
         collection.shrink_to_fit();          \
     }
 
-#define SINGLE_ARG(...)     __VA_ARGS__
+#define ZENGINE_RESIZE_MEMORY(allocator, ptr, old_size, new_size, alignment) ((allocator)->Resize((ptr), (old_size), (new_size), (alignment)))
 
-#define MAX_FILE_PATH_COUNT 256
+#define ZENGINE_TYPE_ALIGNMENT(type)                                         ((alignof(type) < DEFAULT_ALIGNMENT) ? DEFAULT_ALIGNMENT : alignof(type))
+
+#define SINGLE_ARG(...)                                                      __VA_ARGS__
+
+#define MAX_FILE_PATH_COUNT                                                  256
 
 /*
  * Allocator and Memory Macros