addressing more comments.

Author: gpx1000

attachments/simple_engine/audio_system.cpp

@@ -587,7 +587,7 @@ void AudioSystem::Update(float deltaTime) {
 
     // Synchronize HRTF listener position and orientation with active camera
     if (engine) {
-        CameraComponent* activeCamera = engine->GetActiveCamera();
+        const CameraComponent* activeCamera = engine->GetActiveCamera();
         if (activeCamera) {
             // Get camera position
             glm::vec3 cameraPos = activeCamera->GetPosition();

attachments/simple_engine/engine.cpp

@@ -114,9 +114,7 @@ void Engine::Run() {
     running = true;
 
     // Main loop
-    int loopCount = 0;
     while (running) {
-        loopCount++;
         // Process platform events
         if (!platform->ProcessEvents()) {
             running = false;
@@ -180,17 +178,16 @@ void Engine::Cleanup() {
 }
 
 Entity* Engine::CreateEntity(const std::string& name) {
-    // Check if an entity with this name already exists
-    if (entityMap.contains(name)) {
-        return nullptr;
-    }
-
+    // Always allow duplicate names; map stores a representative entity
     // Create the entity
     auto entity = std::make_unique<Entity>(name);
-    // Add to the map and vector
+    // Add to the vector and map
     entities.push_back(std::move(entity));
+    Entity* rawPtr = entities.back().get();
+    // Update the map to point to the most recently created entity with this name
+    entityMap[name] = rawPtr;
 
-    return entities.back().get();
+    return rawPtr;
 }
 
 Entity* Engine::GetEntity(const std::string& name) const {
@@ -206,19 +203,31 @@ bool Engine::RemoveEntity(Entity* entity) {
         return false;
     }
 
+    // Remember the name before erasing ownership
+    std::string name = entity->GetName();
+
     // Find the entity in the vector
     auto it = std::find_if(entities.begin(), entities.end(),
         [entity](const std::unique_ptr<Entity>& e) {
             return e.get() == entity;
         });
 
     if (it != entities.end()) {
-        // Remove from the map
-        entityMap.erase(entity->GetName());
-
-        // Remove from the vector
+        // Remove from the vector (ownership)
         entities.erase(it);
 
+        // Update the map: point to another entity with the same name if one exists
+        auto remainingIt = std::find_if(entities.begin(), entities.end(),
+            [&name](const std::unique_ptr<Entity>& e) {
+                return e->GetName() == name;
+            });
+
+        if (remainingIt != entities.end()) {
+            entityMap[name] = remainingIt->get();
+        } else {
+            entityMap.erase(name);
+        }
+
         return true;
     }
 
@@ -233,50 +242,39 @@ bool Engine::RemoveEntity(const std::string& name) {
     return false;
 }
 
-std::vector<Entity*> Engine::GetAllEntities() const {
-    std::vector<Entity*> result;
-    result.reserve(entities.size());
-
-    for (const auto& entity : entities) {
-        result.push_back(entity.get());
-    }
-
-    return result;
-}
-
 void Engine::SetActiveCamera(CameraComponent* cameraComponent) {
     activeCamera = cameraComponent;
 }
 
-CameraComponent* Engine::GetActiveCamera() const {
+const CameraComponent* Engine::GetActiveCamera() const {
     return activeCamera;
 }
 
-ResourceManager* Engine::GetResourceManager() const {
+const ResourceManager* Engine::GetResourceManager() const {
     return resourceManager.get();
 }
 
-Platform* Engine::GetPlatform() const {
+const Platform* Engine::GetPlatform() const {
     return platform.get();
 }
 
-Renderer* Engine::GetRenderer() const {
+Renderer* Engine::GetRenderer() {
     return renderer.get();
 }
 
-ModelLoader* Engine::GetModelLoader() const {
+ModelLoader* Engine::GetModelLoader() {
     return modelLoader.get();
 }
 
-AudioSystem* Engine::GetAudioSystem() const {
+const AudioSystem* Engine::GetAudioSystem() const {
     return audioSystem.get();
 }
 
-PhysicsSystem* Engine::GetPhysicsSystem() const {
+PhysicsSystem* Engine::GetPhysicsSystem() {
     return physicsSystem.get();
 }
 
-ImGuiSystem* Engine::GetImGuiSystem() const {
+const ImGuiSystem* Engine::GetImGuiSystem() const {
     return imguiSystem.get();
 }
 

attachments/simple_engine/engine.h

@@ -81,12 +81,6 @@ class Engine {
      */
     bool RemoveEntity(const std::string& name);
 
-    /**
-     * @brief Get all entities.
-     * @return A vector of pointers to all entities.
-     */
-    std::vector<Entity*> GetAllEntities() const;
-
     /**
      * @brief Set the active camera.
      * @param cameraComponent The camera component to set as active.
@@ -97,49 +91,49 @@ class Engine {
      * @brief Get the active camera.
      * @return A pointer to the active camera component, or nullptr if none is set.
      */
-    CameraComponent* GetActiveCamera() const;
+    const CameraComponent* GetActiveCamera() const;
 
     /**
      * @brief Get the resource manager.
      * @return A pointer to the resource manager.
      */
-    ResourceManager* GetResourceManager() const;
+    const ResourceManager* GetResourceManager() const;
 
     /**
      * @brief Get the platform.
      * @return A pointer to the platform.
      */
-    Platform* GetPlatform() const;
+    const Platform* GetPlatform() const;
 
     /**
      * @brief Get the renderer.
      * @return A pointer to the renderer.
      */
-    Renderer* GetRenderer() const;
+    Renderer* GetRenderer();
 
     /**
      * @brief Get the model loader.
      * @return A pointer to the model loader.
      */
-    ModelLoader* GetModelLoader() const;
+     ModelLoader* GetModelLoader();
 
     /**
      * @brief Get the audio system.
      * @return A pointer to the audio system.
      */
-    AudioSystem* GetAudioSystem() const;
+    const AudioSystem* GetAudioSystem() const;
 
     /**
      * @brief Get the physics system.
      * @return A pointer to the physics system.
      */
-    PhysicsSystem* GetPhysicsSystem() const;
+     PhysicsSystem* GetPhysicsSystem();
 
     /**
      * @brief Get the ImGui system.
      * @return A pointer to the ImGui system.
      */
-    ImGuiSystem* GetImGuiSystem() const;
+    const ImGuiSystem* GetImGuiSystem() const;
 
     /**
      * @brief Handles mouse input for interaction and camera control.