From 4012eb97ba7cd56796f53136272c03a7ddcaf839 Mon Sep 17 00:00:00 2001
From: Brandon Mak <xenosas@hotmail.com>
Date: Wed, 8 Mar 2023 21:23:03 +0800
Subject: [PATCH 1/3] Auto stash before merge of "SP3-1-Rendering" and
 "origin/main"

Solved shadow bugs and WIP trajectory
---
 Assets/Scenes/Level2.shade                    | 139 +++++++++++++++++-
 Assets/Scenes/Scene2.shade                    |  56 ++++++-
 Assets/Shaders/DeferredComposite_CS.glsl      |  24 ++-
 Assets/Shaders/DeferredComposite_CS.shshaderb | Bin 11109 -> 11569 bytes
 .../GlobalData/SHGraphicsPredefinedData.cpp   |   2 +-
 .../MiddleEnd/Interface/SHGraphicsSystem.cpp  |   3 +-
 .../MiddleEnd/Lights/SHLightComponent.cpp     |  20 +--
 .../MiddleEnd/Lights/SHLightingSubSystem.cpp  |   4 +-
 .../SHTrajectoryRenderableComponent.h         |   4 +
 .../SHTrajectoryRenderingSubSystem.cpp        |  20 ++-
 .../Graphics/Pipeline/SHVkPipelineLayout.cpp  |   4 +-
 .../RenderGraph/SHRenderGraphNodeCompute.cpp  |   2 +-
 12 files changed, 240 insertions(+), 38 deletions(-)

diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade
index d068f3ca..dadf7bf0 100644
--- a/Assets/Scenes/Level2.shade
+++ b/Assets/Scenes/Level2.shade
@@ -21,6 +21,7 @@
       Color: {x: 1, y: 1, z: 1, w: 1}
       Layer: 4294967295
       Strength: 1
+      Casting Shadows: false
       IsActive: true
   Scripts: ~
 - EID: 5
@@ -35,6 +36,7 @@
       Color: {x: 0.901608765, y: 0.867841423, z: 1, w: 1}
       Layer: 4294967295
       Strength: 0.699999988
+      Casting Shadows: false
       IsActive: true
   Scripts: ~
 - EID: 65674
@@ -54,6 +56,7 @@
       Color: {x: 0, y: 0, z: 0, w: 1}
       Layer: 4294967295
       Strength: 1
+      Casting Shadows: true
       IsActive: true
   Scripts: ~
 - EID: 240
@@ -80,6 +83,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -131,6 +135,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -182,6 +187,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -233,6 +239,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -284,6 +291,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -335,6 +343,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -386,6 +395,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -437,6 +447,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -494,6 +505,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -535,6 +547,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -576,6 +589,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -617,6 +631,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -658,6 +673,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -709,6 +725,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -760,6 +777,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -811,6 +829,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -862,6 +881,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -913,6 +933,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -964,6 +985,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1015,6 +1037,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1066,6 +1089,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1117,6 +1141,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1168,6 +1193,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1219,6 +1245,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1270,6 +1297,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1321,6 +1349,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1372,6 +1401,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1423,6 +1453,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1474,6 +1505,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1525,6 +1557,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1576,6 +1609,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1627,6 +1661,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1684,6 +1719,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1735,6 +1771,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1786,6 +1823,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1837,6 +1875,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1888,6 +1927,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1939,6 +1979,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -1996,6 +2037,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2047,6 +2089,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2098,6 +2141,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2149,6 +2193,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2200,6 +2245,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2251,6 +2297,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2308,6 +2355,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2349,6 +2397,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2390,6 +2439,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2431,6 +2481,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2472,6 +2523,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2529,6 +2581,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2570,6 +2623,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2611,6 +2665,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2652,6 +2707,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -2695,6 +2751,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: true
       Sleeping Enabled: true
@@ -2757,6 +2814,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: true
       Sleeping Enabled: true
@@ -2999,6 +3057,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: false
       Interpolate: false
       Sleeping Enabled: true
@@ -3180,6 +3239,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3227,6 +3287,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3268,6 +3329,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3309,6 +3371,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3350,6 +3413,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3391,6 +3455,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3438,6 +3503,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3479,6 +3545,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3520,6 +3587,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3561,6 +3629,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3602,6 +3671,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3649,6 +3719,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3690,6 +3761,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3731,6 +3803,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3772,6 +3845,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3813,6 +3887,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3860,6 +3935,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3901,6 +3977,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3942,6 +4019,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -3983,6 +4061,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4024,6 +4103,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4071,6 +4151,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4112,6 +4193,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4153,6 +4235,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4194,6 +4277,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4235,6 +4319,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4282,6 +4367,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4323,6 +4409,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4364,6 +4451,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4405,6 +4493,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4446,6 +4535,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4493,6 +4583,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4534,6 +4625,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4575,6 +4667,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4616,6 +4709,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4657,6 +4751,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4704,6 +4799,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4745,6 +4841,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4786,6 +4883,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4827,6 +4925,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4868,6 +4967,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4915,6 +5015,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4956,6 +5057,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -4997,6 +5099,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -5038,6 +5141,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -5079,6 +5183,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -5126,6 +5231,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -5167,6 +5273,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -5208,6 +5315,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -5249,6 +5357,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -5373,6 +5482,7 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
+      Gravity Scale: 1
       Use Gravity: true
       Interpolate: false
       Sleeping Enabled: true
@@ -7421,7 +7531,7 @@
   Components:
     Transform Component:
       Translate: {x: 2, y: 0, z: 0}
-      Rotate: {x: -0, y: 0, z: 0}
+      Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
     Renderable Component:
@@ -14149,4 +14259,31 @@
       Perspective: true
       FOV: 90
       IsActive: true
+  Scripts: ~
+- EID: 537
+  Name: ShadowFixRoof
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -0.0146873593, y: 2.83242893, z: 0}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 5.15999985, y: 5.15999985, z: 5.15999985}
+      IsActive: true
+    Renderable Component:
+      Mesh: 142812576
+      Material: 127069936
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 2, y: 0.0500000007, z: 2}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: -0.00999999978, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
   Scripts: ~
\ No newline at end of file
diff --git a/Assets/Scenes/Scene2.shade b/Assets/Scenes/Scene2.shade
index 891c9664..c45d8b51 100644
--- a/Assets/Scenes/Scene2.shade
+++ b/Assets/Scenes/Scene2.shade
@@ -26,7 +26,7 @@
   NumberOfChildren: 1
   Components:
     Transform Component:
-      Translate: {x: 0, y: 0.189419448, z: 0}
+      Translate: {x: 0, y: 0.201105013, z: 0}
       Rotate: {x: 0.00523597933, y: -2.96353412, z: -6.40293041e-10}
       Scale: {x: 1.00000191, y: 1, z: 1.00000191}
       IsActive: true
@@ -41,9 +41,9 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0.006237939, y: -0.000393368304, z: 0}
-      Rotate: {x: -0, y: 2.79945588, z: 0}
-      Scale: {x: 1.0000881, y: 1, z: 1.0000881}
+      Translate: {x: 0.00623797067, y: -0.000395311916, z: -2.03726813e-08}
+      Rotate: {x: 1.35041773e-08, y: 2.79945588, z: -9.6043955e-09}
+      Scale: {x: 1.00008798, y: 1, z: 1.0000881}
       IsActive: true
     Renderable Component:
       Mesh: 144838771
@@ -67,6 +67,7 @@
       Color: {x: 1, y: 1, z: 1, w: 1}
       Layer: 4294967295
       Strength: 0
+      Casting Shadows: false
       IsActive: true
   Scripts: ~
 - EID: 4
@@ -81,6 +82,7 @@
       Color: {x: 1, y: 1, z: 1, w: 1}
       Layer: 4294967295
       Strength: 0.600000024
+      Casting Shadows: false
       IsActive: true
   Scripts: ~
 - EID: 5
@@ -97,4 +99,50 @@
       Mesh: 141771688
       Material: 124370424
       IsActive: true
+  Scripts: ~
+- EID: 6
+  Name: TrajectoryTest
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -3.39616156, y: 3.66783714, z: -0.722039163}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    RigidBody Component:
+      Type: Dynamic
+      Drag: 0.00999999978
+      Angular Drag: 0.100000001
+      Gravity Scale: 1
+      Use Gravity: true
+      Interpolate: true
+      Sleeping Enabled: false
+      Freeze Position X: false
+      Freeze Position Y: false
+      Freeze Position Z: false
+      Freeze Rotation X: false
+      Freeze Rotation Y: false
+      Freeze Rotation Z: false
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Sphere
+          Radius: 1
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+    Trajectory Renderer Component:
+      Mesh: 134305891
+      Start Color: {x: 1, y: 0.951541781, z: 0}
+      Start Alpha: 1
+      End Color: {x: 0, y: 1, z: 0.748898745}
+      End Alpha: 1
+      "Color Eval Rate ": 0.192000002
+      IsActive: true
   Scripts: ~
\ No newline at end of file
diff --git a/Assets/Shaders/DeferredComposite_CS.glsl b/Assets/Shaders/DeferredComposite_CS.glsl
index 18f53de4..e9f9eb0c 100644
--- a/Assets/Shaders/DeferredComposite_CS.glsl
+++ b/Assets/Shaders/DeferredComposite_CS.glsl
@@ -1,4 +1,5 @@
 #version 450
+#extension GL_EXT_nonuniform_qualifier : require
 
 struct DirectionalLightStruct
 {
@@ -63,8 +64,6 @@ float CalcShadowValue (sampler2D shadowMap, vec4 worldSpaceFragPos, mat4 lightPV
   // Perform perspective division and convert to 0 to 1 range
   vec3 converted = (fragPosLightPOV.xyz / fragPosLightPOV.w) * vec3(0.5f) + vec3(0.5f);
 
-  // float sampledDepth = texture(shadowMap, converted.xy).r;
-  // float sampledDepth = texture(shadowMap, converted.xy).z;
   vec2 moments = texture(shadowMap, converted.xy).xy;
 
   if (converted.x < 0.0f || converted.x > 1.0f || converted.y < 0.0f || converted.y > 1.0f)
@@ -121,18 +120,21 @@ void main()
   // light layer index
   uint lightLayer =  lightLayerAndNormal.x;
   
+  // Normals are stored in 2 32-bit uints (only first 48 bits are used) where they can be unpacked in 3 floats so we unpack them here.
   vec3 worldNormal = vec3 (unpackHalf2x16 (lightLayerAndNormal.y).xy, unpackHalf2x16 (lightLayerAndNormal.z).x);
 
   vec3 fragColor = vec3 (0.0f);
 
   vec4 shadowMapColor = vec4 (1.0f);
 
+  // Shadow multiplier
+  float shadowValue = 1.0f;
+
   for (int i = 0; i < lightCounts.ambientLights; ++i)
   {
     if ((lightLayer & AmbLightData.aLightData[i].cullingMask) != 0)
     {
       // Just do some add
-      //fragColor += pixelDiffuse.rgb * AmbLightData.aLightData[i].ambientColor.rgb * vec3 (0.5f);
       fragColor += pixelDiffuse.rgb * AmbLightData.aLightData[i].ambientColor.rgb * vec3 (AmbLightData.aLightData[i].strength);
     }
   }
@@ -153,12 +155,16 @@ void main()
       // If the shadow map is enabled (test the bit)
       if ((DirLightData.dLightData[i].shadowData & uint(1)) == 1)
       {
-        // calculate shadow map here
-        fragColor.rgb *= CalcShadowValue (shadowMaps[0], positionWorld, DirLightData.dLightData[i].pvMatrix, worldNormal, DirLightData.dLightData[i].directionWorld.xyz).xxx;
+        uint shadowMapIndex = (DirLightData.dLightData[i].shadowData >> 8);
+        shadowValue = min (shadowValue, CalcShadowValue (shadowMaps[nonuniformEXT(shadowMapIndex)], positionWorld, DirLightData.dLightData[i].pvMatrix, worldNormal, DirLightData.dLightData[i].directionWorld.xyz));
       }
     }
   }
 
+  // calculate shadow map here
+  if (shadowValue != 0.0f)
+    fragColor.rgb *= shadowValue;
+
   float ssaoVal = imageLoad (ssaoBlurredImage, globalThread).r;
   fragColor *= ssaoVal;
 
@@ -167,12 +173,4 @@ void main()
 
   // store result into result image
   imageStore(targetImage, ivec2(gl_GlobalInvocationID.xy), vec4(fragColor.rgb, 1.0f));
-
-  // vec2 normTexCoords = vec2 (gl_GlobalInvocationID.xy) / vec2 (1024.0f);
-  // vec4 shadowMapVal = texture(shadowMaps[0], normTexCoords);
-  // if (normTexCoords.x > 1.0f || normTexCoords.y > 1.0f)
-  //   shadowMapVal = vec4(0.0f);
-
-  // imageStore(targetImage, ivec2(gl_GlobalInvocationID.xy), shadowMapVal.xxxx);
-
 }
\ No newline at end of file
diff --git a/Assets/Shaders/DeferredComposite_CS.shshaderb b/Assets/Shaders/DeferredComposite_CS.shshaderb
index 57401b13063ae5536870be4281bf45663baf213c..1ec2bcf0d56aa6c9634e82958dec3fd7f3f954af 100644
GIT binary patch
literal 11569
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
E2O`qd?f?J)

literal 11109
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
PzIq4stK-?~cj0dVKJ1B)

diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.cpp
index a15687cb..91ec0cea 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.cpp
@@ -186,7 +186,7 @@ namespace SHADE
       .flags = vk::DescriptorBindingFlagBits::eVariableDescriptorCount,
     };
 
-    // For global data (generic data and textures)
+    // For global data (generic data and textures). NOT USED.
     Handle<SHVkDescriptorSetLayout> shadowMapDescLayout = logicalDevice->CreateDescriptorSetLayout({ shadowMapBinding });
     SET_VK_OBJ_NAME(logicalDevice, vk::ObjectType::eDescriptorSetLayout, shadowMapDescLayout->GetVkHandle(), "[Descriptor Set Layout] Shadow Maps");
     
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
index bf2f1ec2..397edf74 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
@@ -942,7 +942,8 @@ namespace SHADE
     else
     {
       // get the shadow map node
-      renderGraph->GetNode(SHGraphicsConstants::RenderGraphEntityNames::SHADOW_MAP_PASS.data() + shadowMapResourceName)->SetDynamicActive(false);
+      if (auto node = renderGraph->GetNode(SHGraphicsConstants::RenderGraphEntityNames::SHADOW_MAP_PASS.data() + shadowMapResourceName))
+        node->SetDynamicActive(false);
     }
 
     return eventPtr->handle;
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightComponent.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightComponent.cpp
index f8578647..de930596 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightComponent.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightComponent.cpp
@@ -120,21 +120,17 @@ namespace SHADE
   {
     lightData.castShadows = flag;
     
-    // If the flag is true 
-    if (flag)
-    {
-      // Create new event and broadcast it
-      SHLightShadowEvent newEvent;
-      newEvent.lightEntity = GetEID();
+    // Create new event and broadcast it
+    SHLightShadowEvent newEvent;
+    newEvent.lightEntity = GetEID();
 
-      // If shadow map index is invalid, that means light is enabling shadow for the first time.
-      newEvent.firstEnable = (lightData.shadowMapIndex == SHLightData::INVALID_SHADOW_MAP_INDEX);
+    // If shadow map index is invalid, that means light is enabling shadow for the first time.
+    newEvent.firstEnable = (lightData.shadowMapIndex == SHLightData::INVALID_SHADOW_MAP_INDEX);
 
-      // pass the flag to the event
-      newEvent.enableShadow = flag;
+    // pass the flag to the event
+    newEvent.enableShadow = flag;
 
-      SHEventManager::BroadcastEvent<SHLightShadowEvent>(newEvent, SH_GRAPHICS_LIGHT_ENABLE_SHADOW_EVENT);
-    }
+    SHEventManager::BroadcastEvent<SHLightShadowEvent>(newEvent, SH_GRAPHICS_LIGHT_ENABLE_SHADOW_EVENT);
     
   }
 
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp
index 27685d69..a2b9cc0a 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp
@@ -526,7 +526,7 @@ namespace SHADE
       if (auto renderer = light.GetRenderer())
       {
         //SHMatrix orthoMatrix = SHMatrix::OrthographicRH()
-        renderer->UpdateDataManual(frameIndex, GetViewMatrix(&light), SHMatrix::OrthographicLH(15.0f, 15.0f, 1.0f, 80.0f));
+        renderer->UpdateDataManual(frameIndex, GetViewMatrix(&light), SHMatrix::OrthographicLH(20.0f, 20.0f, 1.0f, 80.0f));
       }
 
       auto enumValue = SHUtilities::ConvertEnum(light.GetLightData().type);
@@ -636,7 +636,7 @@ namespace SHADE
       shadowMapImageSamplers.emplace_back(NEW_IMAGE_VIEW, shadowMapSampler, vk::ImageLayout::eShaderReadOnlyOptimal);
 
       // Add to container of shadow maps
-      shadowMapIndexing.emplace(lightEntity, static_cast<uint32_t> (shadowMaps.size()));
+      shadowMapIndexing.emplace(lightEntity, static_cast<uint32_t> (shadowMaps.size() - 1u));
 
       usedIndex = static_cast<uint32_t>(shadowMapImageSamplers.size()) - 1u;
     }
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.h b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.h
index f3744d83..fd3d8b02 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.h
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.h
@@ -35,6 +35,9 @@ namespace SHADE
     //! evolving rate of the color
     float colorEvolveRate;
 
+    //! Entity to simulate trajectory of
+    //EntityID 
+
   public:
     /*-----------------------------------------------------------------------*/
     /* PRIVATE MEMBER FUNCTIONS                                              */
@@ -61,6 +64,7 @@ namespace SHADE
     void ClearPositions(void) noexcept;
     bool HasPositions(void) const noexcept;
 
+    void SimulateTrajectory (EntityID eid) noexcept;
 
     RTTR_ENABLE()
 
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp
index cbf593d4..3ff7c1ec 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp
@@ -11,6 +11,8 @@
 #include "Graphics/RenderGraph/SHSubpass.h"
 #include "Graphics/MiddleEnd/GlobalData/SHGlobalDescriptorSets.h"
 #include "Graphics/MiddleEnd/Interface/SHRenderer.h"
+#include "Physics/System/SHPhysicsSystem.h"
+#include "ECS_Base/Managers/SHSystemManager.h"
 
 namespace SHADE
 {
@@ -74,6 +76,8 @@ namespace SHADE
 
   void SHTrajectoryRenderingSubSystem::Run(uint32_t frameIndex) noexcept
   {
+    auto* physicsSystem = SHSystemManager::GetSystem<SHPhysicsSystem>();
+
     auto& comps = SHComponentManager::GetDense<SHTrajectoryRenderableComponent>();
     for (auto& comp : comps)
     {
@@ -86,7 +90,21 @@ namespace SHADE
       //  x += 0.5f;
       //}
 
-      //comp.SetPositions (test);
+      std::vector<SHVec3> positions{};
+      std::vector<SHQuaternion> quats{};
+      physicsSystem->SimulateBody
+      (positions, quats,
+        SHPhysicsSystem::SimulateBodyInfo
+        {
+         .bodyEID = comp.GetEID(),
+         .force = SHVec3 {30.0f, 100.0f, 30.0f},
+         .continuousForce = false,
+        .timeStep = 0.1f,
+        .maxSteps = 100,
+        }
+      );
+
+      comp.SetPositions(positions);
       // If has positions, feed data to buffer.
       if (comp.HasPositions())
       {
diff --git a/SHADE_Engine/src/Graphics/Pipeline/SHVkPipelineLayout.cpp b/SHADE_Engine/src/Graphics/Pipeline/SHVkPipelineLayout.cpp
index d1c37e3a..166b3c6e 100644
--- a/SHADE_Engine/src/Graphics/Pipeline/SHVkPipelineLayout.cpp
+++ b/SHADE_Engine/src/Graphics/Pipeline/SHVkPipelineLayout.cpp
@@ -194,9 +194,9 @@ namespace SHADE
 
             // In reality, the check for variable descriptor sets do not exists in spirv-reflect. Fortunately, when a shader
             // defines a boundless descriptor binding in the shader, the information reflected makes the array dimensions
-            // contain a 1 element of value 1. Knowing that having an array [1] doesn't make sense, we can use this to 
+            // contain a 1 element of value 0. Knowing that having an array [1] doesn't make sense, we can use this to 
             // signify a variable sized binding. 
-            if (reflectedBinding->array.dims[0] == 1)
+            if (reflectedBinding->array.dims_count == 1 && reflectedBinding->array.dims[0] == 0)
             {
               // variable binding has to be the last in the set
               if (i == set->binding_count - 1)
diff --git a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNodeCompute.cpp b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNodeCompute.cpp
index ef1b6b03..72176f4e 100644
--- a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNodeCompute.cpp
+++ b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNodeCompute.cpp
@@ -118,7 +118,7 @@ namespace SHADE
     if (layouts.size() == descMappings.at(SHPredefinedDescriptorTypes::RENDER_GRAPH_NODE_COMPUTE_RESOURCE) + 1)
     {
       Handle<SHVkDescriptorSetLayout> computeResourceLayout = {};
-        computeResourceLayout = layouts[descMappings.at(SHPredefinedDescriptorTypes::RENDER_GRAPH_NODE_COMPUTE_RESOURCE)];
+      computeResourceLayout = layouts[descMappings.at(SHPredefinedDescriptorTypes::RENDER_GRAPH_NODE_COMPUTE_RESOURCE)];
 
       // create compute resources
       computeResource = graphStorage->resourceHub->Create<ComputeResource>();
-- 
2.40.1


From e3a552f983340890ab5f6e73c10f18be5a464ea1 Mon Sep 17 00:00:00 2001
From: Brandon Mak <xenosas@hotmail.com>
Date: Thu, 9 Mar 2023 10:45:57 +0800
Subject: [PATCH 2/3] Wrote scripting interface for trajectory rendering

---
 .../SHTrajectoryRenderableComponent.cpp       |  35 ++--
 .../SHTrajectoryRenderableComponent.h         |  41 +++--
 .../SHTrajectoryRenderingSubSystem.cpp        | 151 ++++++++----------
 .../src/Components/TrajectoryRenderable.cxx   |   5 +
 .../src/Components/TrajectoryRenderable.hxx   |   3 +
 5 files changed, 128 insertions(+), 107 deletions(-)

diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.cpp
index 91c11e60..41678935 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.cpp
@@ -22,19 +22,32 @@ namespace SHADE
   }
 
 
-  void SHTrajectoryRenderableComponent::ClearPositions(void) noexcept
+  void SHTrajectoryRenderableComponent::SimulateTrajectory(EntityID eid, SHVec3 force, float timestep, uint32_t maxSteps) noexcept
   {
-    positions.clear();
+    entityToSimulate = eid;
+    simulationForce = force;
+    simulationTimestep = timestep;
+    simulationMaxSteps = maxSteps;
   }
 
-  bool SHTrajectoryRenderableComponent::HasPositions(void) const noexcept
+  float SHTrajectoryRenderableComponent::GetSimulationTimestep(void) const noexcept
   {
-    return !positions.empty();
+    return simulationTimestep;
   }
 
-  std::vector<SHVec3> SHTrajectoryRenderableComponent::GetPositions(void) const noexcept
+  void SHTrajectoryRenderableComponent::ResetSimulationInfo(void) noexcept
   {
-    return positions;
+    entityToSimulate = MAX_EID;
+  }
+
+  uint32_t SHTrajectoryRenderableComponent::GetSimulationMaxSteps(void) const noexcept
+  {
+    return simulationMaxSteps;
+  }
+
+  SHVec3 SHTrajectoryRenderableComponent::GetSimulationForce(void) const noexcept
+  {
+    return simulationForce;
   }
 
   Handle<SHMesh> SHTrajectoryRenderableComponent::GetMesh(void) const noexcept
@@ -67,16 +80,16 @@ namespace SHADE
     return colorEvolveRate;
   }
 
+  EntityID SHTrajectoryRenderableComponent::GetEntityToSimulate(void) const noexcept
+  {
+    return entityToSimulate;
+  }
+
   void SHTrajectoryRenderableComponent::SetMesh(Handle<SHMesh> newMesh) noexcept
   {
     mesh = newMesh;
   }
 
-  void SHTrajectoryRenderableComponent::SetPositions(std::vector<SHVec3> const& inPositions) noexcept
-  {
-    positions = inPositions;
-  }
-
   void SHTrajectoryRenderableComponent::SetStartColor(SHVec3 color) noexcept
   {
     startColor = color;
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.h b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.h
index fd3d8b02..95d40af1 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.h
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderableComponent.h
@@ -17,9 +17,6 @@ namespace SHADE
     //! Mesh used to render the trajectory
     Handle<SHMesh> mesh;
 
-    //! positions to plot for rendering. Will be cleared every frame.
-    std::vector<SHVec3> positions;
-
     //! Starting color of the trajectory
     SHVec3 startColor;
 
@@ -35,36 +32,48 @@ namespace SHADE
     //! evolving rate of the color
     float colorEvolveRate;
 
+    //! Used for the trajectory simulation. Indicates the time to pass before
+    //! plotting a point in the simulation
+    float simulationTimestep;
+
     //! Entity to simulate trajectory of
-    //EntityID 
+    EntityID entityToSimulate;
+
+    //! Force to use during simulation of
+    SHVec3 simulationForce;
+
+    //! max points to be plotted in the simulation before stopping.
+    //! Note that the plotting might still be halted if the simulation
+    //! detects a raycast hit with a collider. 
+    uint32_t simulationMaxSteps;
 
   public:
     /*-----------------------------------------------------------------------*/
     /* PRIVATE MEMBER FUNCTIONS                                              */
     /*-----------------------------------------------------------------------*/
     void SetMesh(Handle<SHMesh> newMesh) noexcept;
-    void SetPositions (std::vector<SHVec3> const& inPositions) noexcept;
     void SetStartColor(SHVec3 startColor) noexcept;
     void SetEndColor  (SHVec3 endColor) noexcept;
     void SetStartAlpha(float a) noexcept;
     void SetEndAlpha  (float a) noexcept;
     void SetColorEvolveRate(float rate) noexcept;
 
-    std::vector<SHVec3> GetPositions       (void) const noexcept;
-    Handle<SHMesh>      GetMesh            (void) const noexcept;
-    SHVec3 const&       GetStartColor      (void) const noexcept;
-    SHVec3 const&       GetEndColor        (void) const noexcept;
-    float               GetStartAlpha      (void) const noexcept;
-    float               GetEndAlpha        (void) const noexcept;
-    float               GetColorEvolveRate (void) const noexcept;
+    Handle<SHMesh>      GetMesh               (void) const noexcept;
+    SHVec3 const&       GetStartColor         (void) const noexcept;
+    SHVec3 const&       GetEndColor           (void) const noexcept;
+    float               GetStartAlpha         (void) const noexcept;
+    float               GetEndAlpha           (void) const noexcept;
+    float               GetColorEvolveRate    (void) const noexcept;
+    EntityID            GetEntityToSimulate   (void) const noexcept;
+    SHVec3              GetSimulationForce    (void) const noexcept;
+    uint32_t            GetSimulationMaxSteps (void) const noexcept;
+    float               GetSimulationTimestep (void) const noexcept;
 
+    void ResetSimulationInfo (void) noexcept;
     void OnCreate(void) override final;
     void OnDestroy(void) override final;
 
-    void ClearPositions(void) noexcept;
-    bool HasPositions(void) const noexcept;
-
-    void SimulateTrajectory (EntityID eid) noexcept;
+    void SimulateTrajectory (EntityID eid, SHVec3 force, float timestep, uint32_t maxSteps) noexcept;
 
     RTTR_ENABLE()
 
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp
index 3ff7c1ec..f923add4 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/TrajectoryRendering/SHTrajectoryRenderingSubSystem.cpp
@@ -81,94 +81,85 @@ namespace SHADE
     auto& comps = SHComponentManager::GetDense<SHTrajectoryRenderableComponent>();
     for (auto& comp : comps)
     {
-      //std::vector<SHVec3> test{};
-      //test.resize(10);
-      //float x = 0.0f;
-      //for (auto& vec : test)
-      //{
-      //	vec = SHVec3(x, 5.0f, 0.0f);
-      //  x += 0.5f;
-      //}
-
-      std::vector<SHVec3> positions{};
-      std::vector<SHQuaternion> quats{};
-      physicsSystem->SimulateBody
-      (positions, quats,
-        SHPhysicsSystem::SimulateBodyInfo
-        {
-         .bodyEID = comp.GetEID(),
-         .force = SHVec3 {30.0f, 100.0f, 30.0f},
-         .continuousForce = false,
-        .timeStep = 0.1f,
-        .maxSteps = 100,
-        }
-      );
-
-      comp.SetPositions(positions);
-      // If has positions, feed data to buffer.
-      if (comp.HasPositions())
+      if (EntityID entityToSimulate = comp.GetEntityToSimulate(); entityToSimulate != MAX_EID)
       {
-        auto meshHandle = comp.GetMesh();
-
-        // dont do anything if no mesh
-        if (!meshHandle)
-          continue;
-
-        SHTransformComponent* transform = SHComponentManager::GetComponent_s<SHTransformComponent>(comp.GetEID());
-        if (transform)
-        {
-          // convenient variable
-          SHVec3 const& startColor = comp.GetStartColor();
-          SHVec3 const& endColor = comp.GetEndColor();
-          float colorEvolveRate = comp.GetColorEvolveRate();
-
-          // trs to be reused
-          SHMatrix trs = transform->GetTRS();
-
-          // starting color of trajectory
-          SHVec4 currentColor = comp.GetStartColor();
-
-          // Start from 0 and slowly evolve to 1
-          float lerpValue = 0.0f;
-
-          // Will be used for baseInstance later
-          uint32_t oldTransformDataSize = transformData.size();
-
-
-          auto const& positions = comp.GetPositions();
-          for (auto& pos : positions)
+        std::vector<SHVec3> positions{};
+        std::vector<SHQuaternion> quats{};
+        physicsSystem->SimulateBody
+        (positions, quats,
+          SHPhysicsSystem::SimulateBodyInfo
           {
-            // modify position and reuse matrix
-            trs.m[3][0] = pos.x;
-            trs.m[3][1] = pos.y;
-            trs.m[3][2] = pos.z;
-
-            transformData.push_back(trs);
-            colorData.push_back(currentColor);
-
-            // evolve lerp value and clamp to 1
-            lerpValue = std::min (1.0f, lerpValue + colorEvolveRate);
-
-            // evolve color
-            currentColor = SHVec3::Lerp(startColor, endColor, lerpValue);
-            currentColor.w = SHMath::Lerp (comp.GetStartAlpha(), comp.GetEndAlpha(), lerpValue);
-
+           .bodyEID = entityToSimulate,
+           .force = comp.GetSimulationForce(),
+           .continuousForce = false,
+          .timeStep = comp.GetSimulationTimestep(),
+          .maxSteps = static_cast<int>(comp.GetSimulationMaxSteps()),
           }
+        );
 
-          // add draw data for this trajectory 
-          drawData.push_back(vk::DrawIndexedIndirectCommand 
+        comp.ResetSimulationInfo();
+
+        // If has positions, feed data to buffer.
+        if (!positions.empty())
+        {
+          auto meshHandle = comp.GetMesh();
+
+          // dont do anything if no mesh
+          if (!meshHandle)
+            continue;
+
+          SHTransformComponent* transform = SHComponentManager::GetComponent_s<SHTransformComponent>(comp.GetEID());
+          if (transform)
+          {
+            // convenient variable
+            SHVec3 const& startColor = comp.GetStartColor();
+            SHVec3 const& endColor = comp.GetEndColor();
+            float colorEvolveRate = comp.GetColorEvolveRate();
+
+            // trs to be reused
+            SHMatrix trs = transform->GetTRS();
+
+            // starting color of trajectory
+            SHVec4 currentColor = comp.GetStartColor();
+
+            // Start from 0 and slowly evolve to 1
+            float lerpValue = 0.0f;
+
+            // Will be used for baseInstance later
+            uint32_t oldTransformDataSize = transformData.size();
+
+            for (auto& pos : positions)
             {
-              .indexCount = meshHandle->IndexCount,
-              .instanceCount = static_cast<uint32_t>(transformData.size()) - oldTransformDataSize,
-              .firstIndex = meshHandle->FirstIndex,
-              .vertexOffset = meshHandle->FirstVertex,
-              .firstInstance = oldTransformDataSize
-            });
+              // modify position and reuse matrix
+              trs.m[3][0] = pos.x;
+              trs.m[3][1] = pos.y;
+              trs.m[3][2] = pos.z;
+
+              transformData.push_back(trs);
+              colorData.push_back(currentColor);
+
+              // evolve lerp value and clamp to 1
+              lerpValue = std::min(1.0f, lerpValue + colorEvolveRate);
+
+              // evolve color
+              currentColor = SHVec3::Lerp(startColor, endColor, lerpValue);
+              currentColor.w = SHMath::Lerp(comp.GetStartAlpha(), comp.GetEndAlpha(), lerpValue);
+
+            }
+
+            // add draw data for this trajectory 
+            drawData.push_back(vk::DrawIndexedIndirectCommand
+              {
+                .indexCount = meshHandle->IndexCount,
+                .instanceCount = static_cast<uint32_t>(transformData.size()) - oldTransformDataSize,
+                .firstIndex = meshHandle->FirstIndex,
+                .vertexOffset = meshHandle->FirstVertex,
+                .firstInstance = oldTransformDataSize
+              });
+          }
         }
       }
 
-      // clear at the end of every frame since data is already in buffers
-      comp.ClearPositions();
     }
 
     if (!transformData.empty())
diff --git a/SHADE_Managed/src/Components/TrajectoryRenderable.cxx b/SHADE_Managed/src/Components/TrajectoryRenderable.cxx
index 4b762338..9eace4ab 100644
--- a/SHADE_Managed/src/Components/TrajectoryRenderable.cxx
+++ b/SHADE_Managed/src/Components/TrajectoryRenderable.cxx
@@ -13,6 +13,11 @@ namespace SHADE
 
   }
 
+  void TrajectoryRenderable::SimulateTrajectory(EntityID eid, Vector3 force, float timestep, uint32_t maxSteps)
+  {
+    GetNativeComponent()->SimulateTrajectory(eid, Convert::ToNative(force), timestep, maxSteps);
+  }
+
   MeshAsset TrajectoryRenderable::Mesh::get()
   {
     auto mesh = GetNativeComponent()->GetMesh();
diff --git a/SHADE_Managed/src/Components/TrajectoryRenderable.hxx b/SHADE_Managed/src/Components/TrajectoryRenderable.hxx
index 37a350ad..78e3c0f1 100644
--- a/SHADE_Managed/src/Components/TrajectoryRenderable.hxx
+++ b/SHADE_Managed/src/Components/TrajectoryRenderable.hxx
@@ -82,6 +82,9 @@ namespace SHADE
       float get();
       void set(float val);
     }
+
+    void SimulateTrajectory(EntityID eid, Vector3 force, float timestep, uint32_t maxSteps);
+
   };
 }
 
-- 
2.40.1


From bf08be045ac023437f61fa2b267495255567e9c7 Mon Sep 17 00:00:00 2001
From: Brandon Mak <xenosas@hotmail.com>
Date: Thu, 9 Mar 2023 14:56:03 +0800
Subject: [PATCH 3/3] Solved bugs with shadows

Switching a scene causes a crash from shadows.
---
 Assets/Scenes/Level2.shade                    |   4 +--
 Assets/Shaders/DeferredComposite_CS.glsl      |   6 +++-
 Assets/Shaders/DeferredComposite_CS.shshaderb | Bin 11569 -> 11569 bytes
 Assets/Shaders/ShinyHighlight_FS.glsl         |   2 +-
 Assets/Shaders/ShinyHighlight_FS.shshaderb    | Bin 5733 -> 5921 bytes
 .../MiddleEnd/Interface/SHGraphicsSystem.cpp  |  28 ++++++++++--------
 .../MiddleEnd/Lights/SHLightingSubSystem.cpp  |  10 +++----
 .../Graphics/RenderGraph/SHRenderGraph.cpp    |   6 ++--
 8 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade
index dadf7bf0..ef197542 100644
--- a/Assets/Scenes/Level2.shade
+++ b/Assets/Scenes/Level2.shade
@@ -45,14 +45,14 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0.242245644, y: 1.56757355, z: -6.07086945}
+      Translate: {x: 0.236000001, y: 1.56757355, z: -6.07086945}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
     Light Component:
       Position: {x: 2, y: 1.5, z: -5.5999999}
       Type: Directional
-      Direction: {x: 0, y: 0, z: -1}
+      Direction: {x: -0.0780000016, y: 0.159999996, z: -1}
       Color: {x: 0, y: 0, z: 0, w: 1}
       Layer: 4294967295
       Strength: 1
diff --git a/Assets/Shaders/DeferredComposite_CS.glsl b/Assets/Shaders/DeferredComposite_CS.glsl
index e9f9eb0c..2839e106 100644
--- a/Assets/Shaders/DeferredComposite_CS.glsl
+++ b/Assets/Shaders/DeferredComposite_CS.glsl
@@ -73,9 +73,12 @@ float CalcShadowValue (sampler2D shadowMap, vec4 worldSpaceFragPos, mat4 lightPV
 
   float worldNormalDotLight = dot (normalize (worldNormal), normalize(lightDir));
   
-  if (worldNormalDotLight < 0.0f)
+  if (worldNormalDotLight <= 0.0f)
     return 0.7f;
 
+  // if (worldNormalDotLight <= 0.01f)
+  //   return 0.7f;
+
   if (fragPosLightPOV.z > moments.x && fragPosLightPOV.w > 0.0f)
   {
     float p = step (fragPosLightPOV.z, moments.x);
@@ -94,6 +97,7 @@ float CalcShadowValue (sampler2D shadowMap, vec4 worldSpaceFragPos, mat4 lightPV
     return 0.0f;
   }
 
+  // return min (worldNormalDotLight + 0.7f, 1.0f);
   return 1.0f;
 
 }
diff --git a/Assets/Shaders/DeferredComposite_CS.shshaderb b/Assets/Shaders/DeferredComposite_CS.shshaderb
index 1ec2bcf0d56aa6c9634e82958dec3fd7f3f954af..a48a176f5d45e271183945cd393248c18c43ea5f 100644
GIT binary patch
delta 14
VcmdlOwJ~Z#ss`hp&1o8^SpYG;1|a|d

delta 14
VcmdlOwJ~Z#ss`hZ&1o8^SpYGm1|0wZ

diff --git a/Assets/Shaders/ShinyHighlight_FS.glsl b/Assets/Shaders/ShinyHighlight_FS.glsl
index 18f979fe..b2a2e940 100644
--- a/Assets/Shaders/ShinyHighlight_FS.glsl
+++ b/Assets/Shaders/ShinyHighlight_FS.glsl
@@ -77,7 +77,7 @@ void main()
   worldSpacePosition = In.worldPos;
 
   outEntityID = In2.eid;
-  lightLayerIndices = uvec4 (In2.lightLayerIndex, 0, 0, 1);
+  lightLayerIndices = uvec4 (In2.lightLayerIndex, packHalf2x16 (In.worldNormal.xy), packHalf2x16 (vec2 (In.worldNormal.z, 1.0f)), 1);
 
   // float vpHeight = float (In2.screenSpacePos.y) - MatProp.data[In2.materialIndex].highlightPosition;
   // bring the frame of reference to the object's screen space pos 
diff --git a/Assets/Shaders/ShinyHighlight_FS.shshaderb b/Assets/Shaders/ShinyHighlight_FS.shshaderb
index a3a6230df5e550a976d687e26fd3bab001c76575..7bbcb950f9afcf7c089937860865cd4c234a5f2a 100644
GIT binary patch
literal 5921
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

literal 5733
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
M;rpNVi%l>84-+|3h5!Hn

diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
index 397edf74..bc50d0a7 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
@@ -865,32 +865,30 @@ namespace SHADE
     std::string       depthResourceName            = "ShadowMap_Depth " + std::to_string(EVENT_DATA->lightEntity);
     std::string       shadowMapResourceName        = "ShadowMap " + std::to_string(EVENT_DATA->lightEntity);
     std::string       shadowMapBlurredResourceName = "ShadowMap Blurred" + std::to_string(EVENT_DATA->lightEntity);
-    Handle<SHSubpass> gBufferWriteSubpass          = renderGraph->GetNode(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_PASS.data())->GetSubpass(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_WRITE_SUBPASS);
-    Handle<SHSubpass> gBufferWriteVfxSubpass       = renderGraph->GetNode(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_PASS.data())->GetSubpass(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_WRITE_VFX_SUBPASS);
+
+    // we need to wait for the device to finish using the graph first
+    device->WaitIdle();
+
 
     if (EVENT_DATA->enableShadow)
     {
       // When the light first enables shadow rendering, we need to prepare the relevant objects to render shadows; namely renderpasses and subpasses, pipelines and descriptor sets 
       if (EVENT_DATA->firstEnable)
       {
-        // we need to wait for the device to finish using the graph first
-        device->WaitIdle();
+        Handle<SHSubpass> gBufferWriteSubpass = renderGraph->GetNode(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_PASS.data())->GetSubpass(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_WRITE_SUBPASS);
+        Handle<SHSubpass> gBufferWriteVfxSubpass = renderGraph->GetNode(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_PASS.data())->GetSubpass(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_WRITE_VFX_SUBPASS);
+
 
         // Create new renderer for the light component and give it to the light component
         Handle<SHRenderer> newRenderer = resourceManager.Create<SHRenderer>(device, swapchain->GetNumImages(), descPool, SHRenderer::PROJECTION_TYPE::ORTHOGRAPHIC);
         lightComp->SetRenderer(newRenderer);
 
-        // assign shadow map index to light component
-        lightComp->SetShadowMapIndex(lightingSubSystem->GetNumShadowMaps());
-
-
         // Add the shadow map resource to the graph
         renderGraph->AddResource(depthResourceName, { SH_RENDER_GRAPH_RESOURCE_FLAGS::DEPTH }, false, SHLightingSubSystem::SHADOW_MAP_WIDTH, SHLightingSubSystem::SHADOW_MAP_HEIGHT, vk::Format::eD32Sfloat);
         renderGraph->AddResource(shadowMapResourceName, { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT, SH_RENDER_GRAPH_RESOURCE_FLAGS::STORAGE }, false, SHLightingSubSystem::SHADOW_MAP_WIDTH, SHLightingSubSystem::SHADOW_MAP_HEIGHT, vk::Format::eR32G32B32A32Sfloat);
         renderGraph->AddResource(shadowMapBlurredResourceName, { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT, SH_RENDER_GRAPH_RESOURCE_FLAGS::STORAGE }, false, SHLightingSubSystem::SHADOW_MAP_WIDTH, SHLightingSubSystem::SHADOW_MAP_HEIGHT, vk::Format::eR32G32B32A32Sfloat);
 
 
-
         // link resource to node. This means linking the resource and regenerating the node's renderpass and framebuffer.
         auto shadowMapNode = renderGraph->AddNodeAfter(SHGraphicsConstants::RenderGraphEntityNames::SHADOW_MAP_PASS.data() + shadowMapResourceName, { depthResourceName.c_str(), shadowMapResourceName.c_str(), shadowMapBlurredResourceName.c_str() }, SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_PASS.data());
 
@@ -929,6 +927,10 @@ namespace SHADE
         // add the shadow map and the blurred version to the lighting system
         uint32_t const NEW_SHADOW_MAP_INDEX = lightingSubSystem->AddShadowMap(renderGraph->GetRenderGraphResource(shadowMapBlurredResourceName), EVENT_DATA->lightEntity);
 
+        // assign shadow map index to light component
+        lightComp->SetShadowMapIndex(NEW_SHADOW_MAP_INDEX);
+
+
         // Get deferred composite node compute and modify descriptor set
         auto nodeCompute = renderGraph->GetNode(SHGraphicsConstants::RenderGraphEntityNames::DEFERRED_COMPOSITE_PASS.data())->GetNodeCompute(SHGraphicsConstants::RenderGraphEntityNames::DEFERRED_COMPOSITE_COMPUTE.data());
         nodeCompute->ModifyWriteDescImageComputeResource(SHGraphicsConstants::DescriptorSetBindings::SHADOW_MAP_IMAGE_SAMPLER_DATA, lightingSubSystem->GetViewSamplerLayout(NEW_SHADOW_MAP_INDEX), NEW_SHADOW_MAP_INDEX);
@@ -964,12 +966,12 @@ namespace SHADE
       std::string       shadowMapBlurredResourceName = "ShadowMap Blurred" + std::to_string(EVENT_DATA->lightEntity);
 
       // Remove render graph node
-      //renderGraph->RemoveNode(SHGraphicsConstants::RenderGraphEntityNames::SHADOW_MAP_PASS.data() + shadowMapResourceName);
+      renderGraph->RemoveNode(SHGraphicsConstants::RenderGraphEntityNames::SHADOW_MAP_PASS.data() + shadowMapResourceName);
 
       // Remove render graph resource
-      //renderGraph->RemoveResource(depthResourceName);
-      //renderGraph->RemoveResource(shadowMapResourceName);
-      //renderGraph->RemoveResource(shadowMapBlurredResourceName);
+      renderGraph->RemoveResource(depthResourceName);
+      renderGraph->RemoveResource(shadowMapResourceName);
+      renderGraph->RemoveResource(shadowMapBlurredResourceName);
 
       // Register light component shadow map index into light system as recyclable 
       lightingSubSystem->RemoveShadowMap (EVENT_DATA->lightEntity);
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp
index a2b9cc0a..b17964e4 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp
@@ -62,15 +62,13 @@ namespace SHADE
       // write view projection matrix if renderer is available
       auto lightRenderer = lightComp->GetRenderer();
       if (lightRenderer)
-      {
         lightPtr->pvMatrix = lightRenderer->GetCPUCameraData().viewProjectionMatrix;
 
-        // Boolean to cast shadows in first 8 bits (1 byte)
-        lightPtr->shadowData = lightData.castShadows;
+      // Boolean to cast shadows in first 8 bits (1 byte)
+      lightPtr->shadowData = lightData.castShadows;
         
-        // Next 24 bits for shadow map index
-        lightPtr->shadowData |= (lightData.shadowMapIndex << 8);
-      }
+      // Next 24 bits for shadow map index
+      lightPtr->shadowData |= (lightData.shadowMapIndex << 8);
       break;
     }
     case SH_LIGHT_TYPE::POINT:
diff --git a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.cpp b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.cpp
index 34206e5b..c44c9464 100644
--- a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.cpp
+++ b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.cpp
@@ -111,7 +111,6 @@ namespace SHADE
     renderGraphStorage->graphResources->at(resourceName).Free();
     renderGraphStorage->graphResources->erase (resourceName);
 
-    resourceHdl.Free ();
     /*
      * IMPORTANT NOTES
      * 
@@ -134,8 +133,11 @@ namespace SHADE
       // Get handle to node since it exists
       auto nodeHdl = nodes[nodeIndexing[nodeName]];
 
+      nodes.erase(nodes.begin() + nodeIndexing[nodeName]);
+
       nodeHdl.Free();
-      nodeIndexing.erase(nodeName);
+
+      ReindexNodes();
     }
   }
 
-- 
2.40.1