From 64d1c2ab2e0e07e27fd9bb129029dd1a23553b6d Mon Sep 17 00:00:00 2001
From: Brandon Mak <xenosas@hotmail.com>
Date: Sun, 2 Oct 2022 00:47:26 +0800
Subject: [PATCH] Minimize is now working

---
 SHADE_Engine/premake5.lua                     |  6 ++---
 .../MiddleEnd/Interface/SHGraphicsSystem.cpp  | 25 +++++++++++++++++++
 .../MiddleEnd/PerFrame/SHRenderContext.cpp    |  5 ++++
 .../MiddleEnd/PerFrame/SHRenderContext.h      |  1 +
 .../src/Graphics/Windowing/SHWindow.cpp       |  2 ++
 .../src/Graphics/Windowing/SHWindow.h         |  2 +-
 SHADE_Managed/premake5.lua                    |  5 ++++
 7 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/SHADE_Engine/premake5.lua b/SHADE_Engine/premake5.lua
index f11ccf79..d90d69e3 100644
--- a/SHADE_Engine/premake5.lua
+++ b/SHADE_Engine/premake5.lua
@@ -156,8 +156,8 @@ project "SHADE_Engine"
     links{"assimp-vc142-mt.lib", "librttr_core.lib", "spdlog.lib"}
     excludes
     {
-      "%{prj.location}/src/Editor/**.cpp",
-      "%{prj.location}/src/Editor/**.h",
-      "%{prj.location}/src/Editor/**.hpp",
+--      "%{prj.location}/src/Editor/**.cpp",
+--      "%{prj.location}/src/Editor/**.h",
+--      "%{prj.location}/src/Editor/**.hpp",
     }
     links{"fmodstudio_vc.lib", "fmod_vc.lib"}
\ No newline at end of file
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
index 7aad2206..5751e7b0 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
@@ -213,6 +213,15 @@ namespace SHADE
   /***************************************************************************/
   void SHGraphicsSystem::Run(double) noexcept
   {
+    if (window->IsMinimized())
+      return;
+
+    if (renderContext.GetResized())
+    {
+      return;
+    }
+
+
     // Frame data for the current frame
     auto const& frameData = renderContext.GetCurrentFrameData();
     uint32_t frameIndex = renderContext.GetCurrentFrame();
@@ -335,6 +344,9 @@ namespace SHADE
   /***************************************************************************/
   void SHGraphicsSystem::BeginRender()
   {
+    if (window->IsMinimized())
+      return;
+
     // Finalise all batches
     for (auto vp : viewports)
     for (auto renderer : vp->GetRenderers())
@@ -381,6 +393,16 @@ namespace SHADE
   /***************************************************************************/
   void SHGraphicsSystem::EndRender()
   {
+    if (window->IsMinimized())
+      return;
+
+    if (renderContext.GetResized())
+    {
+      return;
+    }
+
+
+
     const uint32_t CURR_FRAME_IDX = renderContext.GetCurrentFrame();
     auto& currFrameData = renderContext.GetCurrentFrameData();
 
@@ -513,6 +535,9 @@ namespace SHADE
 
   void SHGraphicsSystem::HandleResize(void) noexcept
   {
+    if (window->IsMinimized())
+      return;
+
     auto windowDims = window->GetWindowSize();
 
     // Resize the swapchain
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/PerFrame/SHRenderContext.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/PerFrame/SHRenderContext.cpp
index f31653a8..4953447b 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/PerFrame/SHRenderContext.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/PerFrame/SHRenderContext.cpp
@@ -197,6 +197,11 @@ namespace SHADE
     return currentFrame;
   }
 
+  bool SHRenderContext::GetResized(void) noexcept
+  {
+    return isResized;
+  }
+
   bool SHRenderContext::GetResizeAndReset(void) noexcept
   {
     bool b = isResized;
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/PerFrame/SHRenderContext.h b/SHADE_Engine/src/Graphics/MiddleEnd/PerFrame/SHRenderContext.h
index 04cea4e4..afdbef2d 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/PerFrame/SHRenderContext.h
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/PerFrame/SHRenderContext.h
@@ -56,6 +56,7 @@ namespace SHADE
     SHPerFrameData& GetCurrentFrameData(void) noexcept;
     SHPerFrameData& GetFrameData       (uint32_t index) noexcept;
     uint32_t        GetCurrentFrame    (void) const noexcept;
+    bool            GetResized(void) noexcept;
     bool            GetResizeAndReset  (void) noexcept;
 
   };
diff --git a/SHADE_Engine/src/Graphics/Windowing/SHWindow.cpp b/SHADE_Engine/src/Graphics/Windowing/SHWindow.cpp
index a4569c75..2477b111 100644
--- a/SHADE_Engine/src/Graphics/Windowing/SHWindow.cpp
+++ b/SHADE_Engine/src/Graphics/Windowing/SHWindow.cpp
@@ -383,6 +383,8 @@ namespace SHADE
     {
       wndData.isMinimised = true;
     }
+    else 
+      wndData.isMinimised = false;
 
     for (auto const& entry : windowResizeCallbacks)
     {
diff --git a/SHADE_Engine/src/Graphics/Windowing/SHWindow.h b/SHADE_Engine/src/Graphics/Windowing/SHWindow.h
index 8f15bb60..9dcaedd9 100644
--- a/SHADE_Engine/src/Graphics/Windowing/SHWindow.h
+++ b/SHADE_Engine/src/Graphics/Windowing/SHWindow.h
@@ -125,6 +125,7 @@ namespace SHADE
 
     CALLBACKID RegisterWindowSizeCallback(WindowResizeCallbackFn);
     void UnregisterWindowSizeCallback(CALLBACKID const& callbackid);
+    bool IsMinimized() const { return wndData.isMinimised; }
 
   protected:
     static LRESULT CALLBACK WndProcStatic(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
@@ -165,7 +166,6 @@ namespace SHADE
     void OnSize(UINT msg, UINT type, SIZE size);
     void OnPosChange(LPWINDOWPOS pos);
     void OnPaint(HDC hdc, LPPAINTSTRUCT paint);
-    bool IsMinimized() const { return wndData.isMinimised; }
   };
   static SHWindowMap windowMap;
   static SHWindow* windowBeingCreated = nullptr;
diff --git a/SHADE_Managed/premake5.lua b/SHADE_Managed/premake5.lua
index a7b20144..d9a47975 100644
--- a/SHADE_Managed/premake5.lua
+++ b/SHADE_Managed/premake5.lua
@@ -79,3 +79,8 @@ project "SHADE_Managed"
     optimize "On"
     defines{"_RELEASE"}
     links{"librttr_core.lib"}
+
+  filter "configurations:Publish"
+    optimize "On"
+    defines{"_RELEASE"}
+    links{"librttr_core.lib"}