From b35ca86ae91b2f0bd3212e46dafcca331b1e72fe Mon Sep 17 00:00:00 2001
From: Kah Wei <msntkw@msn.com>
Date: Tue, 1 Nov 2022 00:53:15 +0800
Subject: [PATCH] BatcherDispatcher should now account for mesh changes
 properly

---
 .../src/Graphics/MiddleEnd/Batching/SHBatch.cpp       | 11 +++++------
 .../src/Graphics/MiddleEnd/Batching/SHSuperBatch.cpp  |  6 +++---
 .../Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
index 1bda7c90..22d1875b 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
@@ -74,11 +74,12 @@ namespace SHADE
 
   void SHBatch::Remove(const SHRenderable* renderable)
   {
-    // Check if we have a SubBatch with the same mesh yet
+    // Check if we have a SubBatch with the existing mesh yet (if changed, we use the old mesh)
+    Handle<SHMesh> prevSubBatchMesh = renderable->HasMeshChanged() ? renderable->GetPrevMesh() : renderable->GetMesh();
     auto subBatch = std::find_if(subBatches.begin(), subBatches.end(), [&](const SHSubBatch& batch)
-      {
-        return batch.Mesh == renderable->GetMesh();
-      });
+    {
+      return batch.Mesh == prevSubBatchMesh;
+    });
 
     // Attempt to remove if it exists
     if (subBatch == subBatches.end())
@@ -88,9 +89,7 @@ namespace SHADE
 
     // Check if other renderables in subBatches contain the same material instance
     bool matUnused = true;
-
     Handle<SHMaterialInstance> matToCheck = renderable->HasMaterialChanged() ? renderable->GetPrevMaterial() : renderable->GetMaterial();
-
     for (const auto& sb : subBatches)
     {
       // Check material usage
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHSuperBatch.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHSuperBatch.cpp
index 434e7163..df389879 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHSuperBatch.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHSuperBatch.cpp
@@ -37,9 +37,9 @@ namespace SHADE
 
     // Check if we have a batch with the same pipeline first
     auto batch = std::find_if(batches.begin(), batches.end(), [&](const SHBatch& batch)
-      {
-        return batch.GetPipeline() == PIPELINE;
-      });
+    {
+      return batch.GetPipeline() == PIPELINE;
+    });
 
 
     // Create one if not found
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
index 97380fa3..16e2b1e8 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
@@ -709,8 +709,8 @@ namespace SHADE
       if (!renderable.HasChanged())
         continue;
     
-      // Remove from old material's SuperBatch
-      Handle<SHMaterialInstance> prevMaterial = renderable.GetPrevMaterial();
+      // Remove from the SuperBatch it is previously in (prevMat if mat has changed)
+      Handle<SHMaterialInstance> prevMaterial = renderable.HasMaterialChanged() ? renderable.GetPrevMaterial() : renderable.GetMaterial();
       if (prevMaterial)
       {
         Handle<SHSuperBatch> oldSuperBatch = prevMaterial->GetBaseMaterial()->GetPipeline()->GetPipelineState().GetSubpass()->GetSuperBatch();