Added -> operator to iterators and renamed Material Destroy function

Author: Raelr

engine/render/renderer/platform/vulkan/Material.cpp

@@ -107,21 +107,20 @@ Material::~Material()
 
     for (auto it = propertiesSlots.CreateFIterator(); it; ++it)
     {
-        vkDestroyDescriptorSetLayout(device, (*it).layout, nullptr);
+        vkDestroyDescriptorSetLayout(device, it->layout, nullptr);
     }
 }
 
-void Material::Destroy()
+void Material::Free()
 {
     auto device = Vulkan::Context::GetVkLogicalDevice();
 
     Buffer::DestroyBuffer(buffer);
 
     for (auto it = propertiesSlots.CreateFIterator(); it; ++it)
     {
-        auto& prop = *it;
-        vkDestroyDescriptorSetLayout(device, prop.layout, nullptr);
-        prop.layout = nullptr;
+        vkDestroyDescriptorSetLayout(device, it->layout, nullptr);
+        it->layout = nullptr;
     }
 
     vertexShader.Destroy();
@@ -373,7 +372,7 @@ int32_t Material::FindPropertyIndex(Hash::StringId id, PropertiesSlot& slot)
     int32_t foundIdx {-1};
     for (auto it = slot.properties.CreateIterator(); it; ++it)
     {
-        if ((*it).id == id)
+        if (it->id == id)
         {
             foundIdx = it.GetIndex();
             break;

engine/render/renderer/platform/vulkan/Material.h

@@ -63,7 +63,7 @@ class Material
      */
     ~Material();
 
-    void Destroy();
+    void Free();
 
     /**
      * A movement assignment operator

engine/render/renderer/platform/vulkan/Pipeline.cpp

@@ -102,11 +102,10 @@ Pipeline Pipeline::Builder::Build()
 
     for (auto vertIt = vertShaderVertices.CreateIterator(); vertIt; ++vertIt)
     {
-        auto index = vertIt.GetIndex();
         auto& binding = *vertIt;
-        inputDescriptions[index] = {static_cast<uint32_t>(index),
-                                    binding.stride,
-                                    VK_VERTEX_INPUT_RATE_VERTEX};
+        inputDescriptions[vertIt.GetIndex()] = {static_cast<uint32_t>(vertIt.GetIndex()),
+                                                binding.stride,
+                                                VK_VERTEX_INPUT_RATE_VERTEX};
 
         auto& attributes = binding.attributes;
 

engine/render/renderer/renderer/DebugRenderer3D.cpp

@@ -39,7 +39,7 @@ void DebugRenderer3D::Initialise(const String& globalDataAttributeName,
 
 void DebugRenderer3D::Destroy()
 {
-    lineMaterial.Destroy();
+    lineMaterial.Free();
     lineModel.DestroyModel();
 }
 

engine/render/renderer/renderer/LightRenderer.cpp

@@ -35,7 +35,7 @@ void LightRenderer::Initialise(const String& globalDataAttributeName,
 
 void LightRenderer::Destroy()
 {
-    lightMaterial.Destroy();
+    lightMaterial.Free();
     lightModel.DestroyModel();
 }
 

engine/render/renderer/renderer/Renderer2D.cpp

@@ -102,7 +102,7 @@ void Renderer2D::DestroyRenderer2D()
 {
     quadModel.DestroyModel();
     defaultTexture.Free();
-    defaultMaterial.Destroy();
+    defaultMaterial.Free();
 }
 
 void Renderer2D::Flush()

engine/utils/collections/Iterators.h

@@ -88,6 +88,15 @@ class Iter
         return ptr->Data() != other.ptr->Data() && index != other.index;
     }
 
+    /**
+     * A de-referencing operator. Accesses a pointer to the current element
+     * @return a pointer to the element pointed to by the iterator
+     */
+    inline constexpr T* operator->() const
+    {
+        return ptr->Data() + index;
+    }
+
     /**
      * Returns the index currently held by the iterator
      * @return returns the current index the iterator is on
@@ -183,6 +192,15 @@ class ConstIter
         return ptr->Data() != other.ptr->Data() && index != other.index;
     }
 
+    /**
+     * A de-referencing operator. Accesses a pointer to the current element
+     * @return a pointer to the element pointed to by the iterator
+     */
+    inline constexpr const T* operator->() const
+    {
+        return ptr->Data() + index;
+    }
+
     /**
      * Returns the index currently held by the iterator
      * @return returns the current index the iterator is on
@@ -288,6 +306,15 @@ class MIter
         return ptr->Data() != other.ptr->Data() && index != other.index;
     }
 
+    /**
+     * A de-referencing operator. Accesses a pointer to the current element
+     * @return a pointer to the element pointed to by the iterator
+     */
+    inline constexpr T* operator->() const
+    {
+        return ptr->Data() + index;
+    }
+
     /**
      * Returns the index currently held by the iterator
      * @return returns the current index the iterator is on
@@ -395,6 +422,15 @@ class CMIter
         return ptr->Data() != other.ptr->Data() && index != other.index;
     }
 
+    /**
+     * A de-referencing operator. Accesses a pointer to the current element
+     * @return a pointer to the element pointed to by the iterator
+     */
+    inline constexpr const T* operator->() const
+    {
+        return ptr->Data() + index;
+    }
+
     /**
      * Returns the index currently held by the iterator
      * @return returns the current index the iterator is on