From 27413c380e5395f6fb0b761813b521db769ec445 Mon Sep 17 00:00:00 2001
From: Kah Wei <msntkw@msn.com>
Date: Fri, 18 Nov 2022 21:59:18 +0800
Subject: [PATCH] Renderables now no longer render if disabled

---
 .../Graphics/MiddleEnd/Batching/SHBatch.cpp   | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
index 0db46a84..47a96583 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
@@ -440,15 +440,30 @@ namespace SHADE
         for (auto rendId : subBatch.Renderables)
         {
           // Transform
-          auto transform = SHComponentManager::GetComponent_s<SHTransformComponent>(rendId);
-          if (!transform)
+          auto transform = SHComponentManager::GetComponent_s<SHTransformComponent>(rendId);          
+          if (transform)
           {
-            SHLOG_WARNING("[SHBatch] Entity contianing a SHRenderable with no SHTransformComponent found!");
-            transformData.emplace_back();
+            if (SHSceneManager::CheckNodeAndComponentsActive<SHRenderable>(rendId))
+            {
+              transformData.emplace_back(transform->GetTRS());
+            }
+            else
+            {
+              // Should be deactivated
+              static const SHMatrix ZERO_MTX =
+              {
+                0.0f, 0.0f, 0.0f, 0.0f,
+                0.0f, 0.0f, 0.0f, 0.0f,
+                0.0f, 0.0f, 0.0f, 0.0f,
+                0.0f, 0.0f, 0.0f, 0.0f
+              };
+              transformData.emplace_back(ZERO_MTX);
+            }
           }
           else
           {
-            transformData.emplace_back(transform->GetTRS());
+            SHLOG_WARNING("[SHBatch] Entity contianing a SHRenderable with no SHTransformComponent found!");
+            transformData.emplace_back();
           }
 
           const SHRenderable* renderable = SHComponentManager::GetComponent<SHRenderable>(rendId);