Fix memory leak and add Scale property to Models

Author: BurntRanch

include/engine.hpp

@@ -142,8 +142,7 @@ struct RenderUIArrows {
     // VkImageView diffTextureImageView;
     // VkSampler diffTextureSampler;
 
-    /* 3*2, 3 arrows, 2 objects per arrow. */
-    std::array<RenderModel, 3*2> arrowRenderModels;
+    std::array<RenderModel, 3> arrowRenderModels;
 
     std::array<std::pair<std::pair<MatricesUBO, UIArrowsUBO>, std::pair<BufferAndMemory, BufferAndMemory>>, 3> arrowBuffers;
 };
@@ -219,6 +218,8 @@ class Engine {
     VkFramebuffer CreateFramebuffer(VkRenderPass renderPass, VkImageView imageView, VkExtent2D resolution, VkImageView depthImageView = nullptr);
     bool QuitEventCheck(SDL_Event &event);
 
+    void UnloadRenderModel(RenderModel &renderModel);
+
     SwapChainSupportDetails QuerySwapChainSupport(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface);
     VkShaderModule CreateShaderModule(VkDevice device, const std::vector<char> &code);
     Uint32 FindMemoryType(Uint32 typeFilter, VkMemoryPropertyFlags properties);

include/model.hpp

@@ -132,13 +132,16 @@ class Model
 
     Model() = default;
 
-    Model(const string_view path, glm::vec3 position = glm::vec3(0, 0, 0), glm::vec3 rotation = glm::vec3(0, 0, 0));
+    Model(const string_view path, glm::vec3 position = glm::vec3(0, 0, 0), glm::vec3 rotation = glm::vec3(0, 0, 0), glm::vec3 scale = glm::vec3(1, 1, 1));
 
     constexpr void SetPosition(glm::vec3 pos) { m_Position = pos; m_NeedsUpdate = true; };
     constexpr void SetRotation(glm::vec3 rot) { m_Rotation = rot; m_NeedsUpdate = true; };
+    constexpr void SetScale(glm::vec3 scale)  { boundingBox[0] *= (1.0f / m_Scale) * scale; boundingBox[1] *= (1.0f / m_Scale) * scale; m_Scale = scale; m_NeedsUpdate = true; };
 
     constexpr glm::vec3 GetPosition() { return m_Position; };
     constexpr glm::vec3 GetRotation() { return m_Rotation; };
+    constexpr glm::vec3 GetScale()    { return m_Scale; };
+
     glm::mat4 GetModelMatrix();
 private:
     // model data
@@ -147,6 +150,7 @@ class Model
 
     glm::vec3 m_Position;
     glm::vec3 m_Rotation;
+    glm::vec3 m_Scale;
 
     glm::mat4 m_ModelMatrix;
     bool m_NeedsUpdate = false;   // flag, set to true when Position and Rotation are updated, set to false when GetModelMatrix is called.

models/arrows.mtl

@@ -1,32 +1,32 @@
-# Blender 4.2.0 MTL File: 'None'
+# Blender 4.2.1 LTS MTL File: 'None'
 # www.blender.org
 
-newmtl Material
+newmtl Material.001
 Ns 250.000000
 Ka 1.000000 1.000000 1.000000
-Kd 1.000000 0.000000 0.002615
+Kd 0.000000 1.000000 0.000000
 Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
-Ni 1.450000
+Ni 1.500000
 d 1.000000
 illum 2
 
-newmtl Material.001
+newmtl Material.002
 Ns 250.000000
 Ka 1.000000 1.000000 1.000000
-Kd 0.000000 1.000000 0.000000
+Kd 0.000000 0.000000 1.000000
 Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
 Ni 1.500000
 d 1.000000
 illum 2
 
-newmtl Material.002
+newmtl Material.003
 Ns 250.000000
 Ka 1.000000 1.000000 1.000000
-Kd 0.000000 0.000000 1.000000
+Kd 1.000000 0.000000 0.002615
 Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
-Ni 1.500000
+Ni 1.450000
 d 1.000000
 illum 2