From b30da7e495791557c676d5006d05dd121d5c8c23 Mon Sep 17 00:00:00 2001
From: Sri Sham Haran <s.srishamharan@digipen.edu>
Date: Fri, 4 Nov 2022 19:16:32 +0800
Subject: [PATCH] Fixes

---
 Assets/Materials/TestMat.shmat                     |  2 +-
 Assets/Scenes/M2Scene.shade                        | 14 +++++++-------
 .../src/Serialization/SHSerializationHelper.hpp    | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Assets/Materials/TestMat.shmat b/Assets/Materials/TestMat.shmat
index acfa2dc3..c1bb43c5 100644
--- a/Assets/Materials/TestMat.shmat
+++ b/Assets/Materials/TestMat.shmat
@@ -2,7 +2,7 @@
   FragmentShader: 46377769
   SubPass: G-Buffer Write
   Properties:
-    data.color: {x: 0, y: 0, z: 0, w: 1}
+    data.color: {x: 1, y: 1, z: 1, w: 1}
     data.textureIndex: 64651793
     data.alpha: 0
     data.beta: {x: 1, y: 1, z: 1}
\ No newline at end of file
diff --git a/Assets/Scenes/M2Scene.shade b/Assets/Scenes/M2Scene.shade
index 35608ab6..38c0a523 100644
--- a/Assets/Scenes/M2Scene.shade
+++ b/Assets/Scenes/M2Scene.shade
@@ -31,8 +31,8 @@
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 49.4798889, y: 0.5, z: 17.5}
     Renderable Component:
-      Mesh: 80365422
-      Material: 0
+      Mesh: 149697411
+      Material: 126974645
     RigidBody Component:
       Type: Static
       Mass: 1
@@ -66,7 +66,7 @@
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 2, y: 2, z: 2}
     Renderable Component:
-      Mesh: 80365422
+      Mesh: 149697411
       Material: 126974645
     RigidBody Component:
       Type: Dynamic
@@ -121,8 +121,8 @@
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 2, y: 2, z: 2}
     Renderable Component:
-      Mesh: 80365422
-      Material: 124370424
+      Mesh: 149697411
+      Material: 126974645
     RigidBody Component:
       Type: Dynamic
       Mass: 1
@@ -163,7 +163,7 @@
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 2, y: 2, z: 2}
     Renderable Component:
-      Mesh: 80365422
+      Mesh: 149697411
       Material: 126974645
     RigidBody Component:
       Type: Dynamic
@@ -198,7 +198,7 @@
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 5, y: 5, z: 5}
     Renderable Component:
-      Mesh: 80365422
+      Mesh: 149697411
       Material: 126974645
   Scripts: ~
 - EID: 8
diff --git a/SHADE_Engine/src/Serialization/SHSerializationHelper.hpp b/SHADE_Engine/src/Serialization/SHSerializationHelper.hpp
index 77f10269..b062b348 100644
--- a/SHADE_Engine/src/Serialization/SHSerializationHelper.hpp
+++ b/SHADE_Engine/src/Serialization/SHSerializationHelper.hpp
@@ -258,21 +258,21 @@ namespace SHADE
           {
             auto fragShader =  SHResourceManager::LoadOrGet<SHVkShaderModule>(spec.fragShader);
             auto interface = fragShader->GetReflectedData().GetDescriptorBindingInfo().GetShaderBlockInterface(SHGraphicsConstants::DescriptorSetIndex::PER_INSTANCE, SHGraphicsConstants::DescriptorSetBindings::BATCHED_PER_INST_DATA);
-            /*int const varCount = static_cast<int>(interface->GetVariableCount());
+            int const varCount = static_cast<int>(interface->GetVariableCount());
 
             for (int i = 0; i < varCount; ++i)
             {
               auto variable = interface->GetVariable(i);
               if(variable->type != SHShaderBlockInterface::Variable::Type::INT)
-                return;
+                continue;
               const std::string& VAR_NAME = interface->GetVariableName(i);
               if(VAR_NAME.empty())
                 continue;
-              assetQueue.insert({matNode.as<AssetID>(), AssetType::TEXTURE});
-            }*/
+              assetQueue.insert({spec.properties[VAR_NAME.data()].as<AssetID>(), AssetType::TEXTURE});
+            }
           }
         }
-        assetQueue.insert({matNode.as<AssetID>(), AssetType::MATERIAL});
+        //assetQueue.insert({matNode.as<AssetID>(), AssetType::MATERIAL});
         //SHResourceManager::LoadOrGet<SHMaterial>(node[YAML::convert<SHRenderable>::MAT_YAML_TAG.data()].as<AssetID>());
       }
     }