Fix crash on escape and black background in DX11

Author: CanReader

Engine/include/public/ECS/Components/FirstPersonController.hpp

@@ -4,6 +4,7 @@
 #include <ECS/Components/CameraController.hpp>
 #include <Core/OSDef.hpp>
 #include <Events/KeyboardEvent.h>
+#include <string>
 
 namespace Sleak {
 
@@ -14,6 +15,7 @@ namespace Sleak {
     class ENGINE_API FirstPersonController : public CameraController {
     public:
         FirstPersonController(GameObject* object);
+        ~FirstPersonController() override;
 
         bool Initialize() override;
         void Update(float deltaTime) override;
@@ -68,6 +70,9 @@ namespace Sleak {
         bool m_firstFrame = true;
 
         RigidbodyComponent* m_rigidbody = nullptr;
+
+        std::string m_keyPressedHandlerId;
+        std::string m_keyReleasedHandlerId;
     };
 
 } // namespace Sleak

Engine/include/public/ECS/Components/FreeLookCameraController.hpp

@@ -4,11 +4,13 @@
 #include <ECS/Components/CameraController.hpp>
 #include <Events/KeyboardEvent.h>
 #include <Core/OSDef.hpp>
+#include <string>
 
 namespace Sleak {
     class ENGINE_API FreeLookCameraController : public CameraController {
     public:
         FreeLookCameraController(GameObject* object);
+        ~FreeLookCameraController() override;
 
         bool Initialize() override;
         void Update(float deltaTime) override;
@@ -73,6 +75,9 @@ namespace Sleak {
         Math::Vector2D RollRange;
 
         bool m_firstFrame = true;
+
+        std::string m_keyPressedHandlerId;
+        std::string m_keyReleasedHandlerId;
     };
 }
 

Engine/include/public/Events/Event.h

@@ -123,15 +123,19 @@ namespace Sleak {
             template<typename EventT>
             static void DispatchEvent(const EventT& event) {
                 EventType type = event.GetEventType();
-                
-                if (eventHandlers.find(type) != eventHandlers.end()) {
-                    for (auto& handler : eventHandlers[type]) {
-                        // Try to cast to the right event delegate type
-                        auto typedDelegate = std::dynamic_pointer_cast<EventDelegate<EventT>>(handler);
-                        if (typedDelegate) {
-                            typedDelegate->SetEvent(event);
-                            typedDelegate->Execute();
-                        }
+
+                if (eventHandlers.find(type) == eventHandlers.end())
+                    return;
+
+                // Copy the handler list so that handlers which add/remove entries
+                // during dispatch don't invalidate the iteration.
+                auto handlers = eventHandlers[type];
+                for (auto& handler : handlers) {
+                    // Try to cast to the right event delegate type
+                    auto typedDelegate = std::dynamic_pointer_cast<EventDelegate<EventT>>(handler);
+                    if (typedDelegate) {
+                        typedDelegate->SetEvent(event);
+                        typedDelegate->Execute();
                     }
                 }
             }

Engine/src/DirectX11Renderer.cpp

@@ -432,9 +432,16 @@ void DirectX11Renderer::DrawIndexedInstance(uint32_t instanceCount,
 void DirectX11Renderer::ClearRenderTarget(float r, float g, float b, float a) {
     const float clearColor[4] = {r, g, b, a};
 
-    ID3D11RenderTargetView* target = msaaSampleCount > 1 ? msaaRenderTargetView : renderTargetView; 
-
-    deviceContext->ClearRenderTargetView(target, clearColor);
+    ID3D11RenderTargetView* target;
+    if (m_tonemapEnabled && m_tonemapResourcesCreated && msaaSampleCount <= 1)
+        target = m_hdrRTV;
+    else if (msaaSampleCount > 1)
+        target = msaaRenderTargetView;
+    else
+        target = renderTargetView;
+
+    if (target)
+        deviceContext->ClearRenderTargetView(target, clearColor);
 }
 
 void DirectX11Renderer::ClearDepthStencil(bool clearDepth, bool clearStencil,

Engine/src/FirstPersonController.cpp

@@ -16,8 +16,13 @@ FirstPersonController::FirstPersonController(GameObject* object)
     m_velocity = Math::Vector3D::Zero();
     translationInput = Math::Vector3D::Zero();
 
-    EventDispatcher::RegisterEventHandler(this, &FirstPersonController::OnKeyPressed);
-    EventDispatcher::RegisterEventHandler(this, &FirstPersonController::OnKeyReleased);
+    m_keyPressedHandlerId  = EventDispatcher::RegisterEventHandler(this, &FirstPersonController::OnKeyPressed);
+    m_keyReleasedHandlerId = EventDispatcher::RegisterEventHandler(this, &FirstPersonController::OnKeyReleased);
+}
+
+FirstPersonController::~FirstPersonController() {
+    EventDispatcher::UnregisterEvent(EventType::KeyPressed,  m_keyPressedHandlerId);
+    EventDispatcher::UnregisterEvent(EventType::KeyReleased, m_keyReleasedHandlerId);
 }
 
 bool FirstPersonController::Initialize() {

Engine/src/FreeLookCameraControllerComponent.cpp

@@ -25,9 +25,13 @@ namespace Sleak {
         translationInput = Math::Vector3D::Zero();
         velocity = Math::Vector3D::Zero();
 
-        EventDispatcher::RegisterEventHandler(this, &FreeLookCameraController::OnKeyPressed);
-        EventDispatcher::RegisterEventHandler(this, &FreeLookCameraController::OnKeyReleased);
+        m_keyPressedHandlerId  = EventDispatcher::RegisterEventHandler(this, &FreeLookCameraController::OnKeyPressed);
+        m_keyReleasedHandlerId = EventDispatcher::RegisterEventHandler(this, &FreeLookCameraController::OnKeyReleased);
+    }
 
+    FreeLookCameraController::~FreeLookCameraController() {
+        EventDispatcher::UnregisterEvent(EventType::KeyPressed,  m_keyPressedHandlerId);
+        EventDispatcher::UnregisterEvent(EventType::KeyReleased, m_keyReleasedHandlerId);
     }
 
     bool FreeLookCameraController::Initialize() {