address several comments (more still need to be addressed). And fix the install_dependencies_windows.bat to be more user friendly.

Author: gpx1000

attachments/simple_engine/audio_system.cpp

@@ -385,7 +385,7 @@ class OpenALAudioOutputDevice : public AudioOutputDevice {
             std::vector<int16_t> pcmBuffer(samplesProcessed);
             for (uint32_t i = 0; i < samplesProcessed; i++) {
                 // Clamp and convert to 16-bit PCM
-                float sample = std::max(-1.0f, std::min(1.0f, audioBuffer[i]));
+                float sample = std::clamp( -1.0f, 1.0f, audioBuffer[i] );
                 pcmBuffer[i] = static_cast<int16_t>(sample * 32767.0f);
             }
 

attachments/simple_engine/debug_system.h

@@ -193,9 +193,7 @@ class DebugSystem {
      * @brief End a performance measurement and log the result.
      * @param name The name of the measurement.
      */
-    void EndMeasurement(const std::string& name) {
-        std::lock_guard<std::mutex> lock(mutex);
-
+    void StopMeasurement(const std::string& name) {
         auto now = std::chrono::high_resolution_clock::now();
         auto it = measurements.find(name);
 

attachments/simple_engine/descriptor_manager.cpp

@@ -1,7 +1,7 @@
 #include "descriptor_manager.h"
 #include <iostream>
 #include <array>
-#include <string.h>
+#include <cstring>
 #include "transform_component.h"
 #include "camera_component.h"
 
@@ -11,9 +11,7 @@ DescriptorManager::DescriptorManager(VulkanDevice& device)
 }
 
 // Destructor
-DescriptorManager::~DescriptorManager() {
-    // RAII will handle destruction
-}
+DescriptorManager::~DescriptorManager() = default;
 
 // Create descriptor pool
 bool DescriptorManager::createDescriptorPool(uint32_t maxSets) {
@@ -88,9 +86,58 @@ bool DescriptorManager::createUniformBuffers(Entity* entity, uint32_t maxFramesI
     }
 }
 
+bool DescriptorManager::update_descriptor_sets(Entity* entity, uint32_t maxFramesInFlight, bool& value1) {
+    assert(entityResources[entity].uniformBuffers.size() == maxFramesInFlight);
+    // Update descriptor sets
+    for (size_t i = 0; i < maxFramesInFlight; i++) {
+        // Create descriptor buffer info
+        vk::DescriptorBufferInfo bufferInfo{
+            .buffer = *entityResources[entity].uniformBuffers[i],
+            .offset = 0,
+            .range = sizeof(UniformBufferObject)
+        };
+
+        // Create descriptor image info
+        vk::DescriptorImageInfo imageInfo{
+            // These would be set based on the texture resources
+            // .sampler = textureSampler,
+            // .imageView = textureImageView,
+            .imageLayout = vk::ImageLayout::eShaderReadOnlyOptimal
+        };
+
+        // Create descriptor writes
+        std::array<vk::WriteDescriptorSet, 2> descriptorWrites = {
+            vk::WriteDescriptorSet{
+                .dstSet = entityResources[entity].descriptorSets[i],
+                .dstBinding = 0,
+                .dstArrayElement = 0,
+                .descriptorCount = 1,
+                .descriptorType = vk::DescriptorType::eUniformBuffer,
+                .pImageInfo = nullptr,
+                .pBufferInfo = &bufferInfo,
+                .pTexelBufferView = nullptr
+            },
+            vk::WriteDescriptorSet{
+                .dstSet = entityResources[entity].descriptorSets[i],
+                .dstBinding = 1,
+                .dstArrayElement = 0,
+                .descriptorCount = 1,
+                .descriptorType = vk::DescriptorType::eCombinedImageSampler,
+                .pImageInfo = &imageInfo,
+                .pBufferInfo = nullptr,
+                .pTexelBufferView = nullptr
+            }
+        };
+
+        // Update descriptor sets
+        device.getDevice().updateDescriptorSets(descriptorWrites, nullptr);
+    }
+    return false;
+}
 // Create descriptor sets for an entity
 bool DescriptorManager::createDescriptorSets(Entity* entity, const std::string& texturePath, vk::DescriptorSetLayout descriptorSetLayout, uint32_t maxFramesInFlight) {
     try {
+        assert(entityResources.find(entity) != entityResources.end());
         // Create descriptor sets for each frame in flight
         std::vector<vk::DescriptorSetLayout> layouts(maxFramesInFlight, descriptorSetLayout);
 
@@ -101,61 +148,10 @@ bool DescriptorManager::createDescriptorSets(Entity* entity, const std::string&
             .pSetLayouts = layouts.data()
         };
 
-        // Allocate descriptor sets
-        auto descriptorSets = device.getDevice().allocateDescriptorSets(allocInfo);
+        entityResources[entity].descriptorSets = device.getDevice().allocateDescriptorSets(allocInfo);
 
-        // Store descriptor sets
-        // Convert from vk::raii::DescriptorSet to vk::DescriptorSet
-        std::vector<vk::DescriptorSet> nonRaiiDescriptorSets;
-        for (const auto& ds : descriptorSets) {
-            nonRaiiDescriptorSets.push_back(*ds);
-        }
-        entityResources[entity].descriptorSets = nonRaiiDescriptorSets;
-
-        // Update descriptor sets
-        for (size_t i = 0; i < maxFramesInFlight; i++) {
-            // Create descriptor buffer info
-            vk::DescriptorBufferInfo bufferInfo{
-                .buffer = *entityResources[entity].uniformBuffers[i],
-                .offset = 0,
-                .range = sizeof(UniformBufferObject)
-            };
-
-            // Create descriptor image info
-            vk::DescriptorImageInfo imageInfo{
-                // These would be set based on the texture resources
-                // .sampler = textureSampler,
-                // .imageView = textureImageView,
-                .imageLayout = vk::ImageLayout::eShaderReadOnlyOptimal
-            };
-
-            // Create descriptor writes
-            std::array<vk::WriteDescriptorSet, 2> descriptorWrites = {
-                vk::WriteDescriptorSet{
-                    .dstSet = descriptorSets[i],
-                    .dstBinding = 0,
-                    .dstArrayElement = 0,
-                    .descriptorCount = 1,
-                    .descriptorType = vk::DescriptorType::eUniformBuffer,
-                    .pImageInfo = nullptr,
-                    .pBufferInfo = &bufferInfo,
-                    .pTexelBufferView = nullptr
-                },
-                vk::WriteDescriptorSet{
-                    .dstSet = descriptorSets[i],
-                    .dstBinding = 1,
-                    .dstArrayElement = 0,
-                    .descriptorCount = 1,
-                    .descriptorType = vk::DescriptorType::eCombinedImageSampler,
-                    .pImageInfo = &imageInfo,
-                    .pBufferInfo = nullptr,
-                    .pTexelBufferView = nullptr
-                }
-            };
-
-            // Update descriptor sets
-            device.getDevice().updateDescriptorSets(descriptorWrites, nullptr);
-        }
+        bool value1;
+        if (update_descriptor_sets(entity, maxFramesInFlight, value1)) return value1;
 
         return true;
     } catch (const std::exception& e) {
@@ -192,6 +188,8 @@ void DescriptorManager::updateUniformBuffer(uint32_t currentImage, Entity* entit
     ubo.lightPos = glm::vec4(0.0f, 5.0f, 0.0f, 1.0f);
     ubo.lightColor = glm::vec4(1.0f, 1.0f, 1.0f, 1.0f);
 
+    assert(entityResources.find(entity) != entityResources.end());
+    assert(entityResources[entity].uniformBuffers.size() > currentImage);
     // Copy data to uniform buffer
     memcpy(entityResources[entity].uniformBuffersMapped[currentImage], &ubo, sizeof(ubo));
 }

attachments/simple_engine/descriptor_manager.h

@@ -34,7 +34,7 @@ class DescriptorManager {
         std::vector<vk::raii::Buffer> uniformBuffers;
         std::vector<vk::raii::DeviceMemory> uniformBuffersMemory;
         std::vector<void*> uniformBuffersMapped;
-        std::vector<vk::DescriptorSet> descriptorSets;
+        std::vector<vk::raii::DescriptorSet> descriptorSets;
     };
 
     /**
@@ -62,6 +62,7 @@ class DescriptorManager {
      * @return True if the uniform buffers were created successfully, false otherwise.
      */
     bool createUniformBuffers(Entity* entity, uint32_t maxFramesInFlight);
+    bool update_descriptor_sets(Entity* entity, uint32_t maxFramesInFlight, bool& value1);
 
     /**
      * @brief Create descriptor sets for an entity.
@@ -91,14 +92,14 @@ class DescriptorManager {
      * @brief Get the entity resources.
      * @return The entity resources.
      */
-    std::unordered_map<Entity*, EntityResources>& getEntityResources() { return entityResources; }
+    const std::unordered_map<Entity*, EntityResources>& getEntityResources() { return entityResources; }
 
     /**
      * @brief Get the resources for an entity.
      * @param entity The entity.
      * @return The entity resources.
      */
-    EntityResources& getEntityResources(Entity* entity) { return entityResources[entity]; }
+    const EntityResources& getEntityResources(Entity* entity) { return entityResources[entity]; }
 
 private:
     // Vulkan device