From 7ecb8b11ada0db7d81a5dcf933f1d10f169e67d2 Mon Sep 17 00:00:00 2001
From: Kah Wei <msntkw@msn.com>
Date: Fri, 13 Jan 2023 21:26:05 +0800
Subject: [PATCH] Added support for rendering bone-less models using the
 animated shader

---
 Assets/Shaders/Anim_VS.glsl                   |   2 +-
 Assets/Shaders/Anim_VS.shshaderb              | Bin 5597 -> 4341 bytes
 .../src/Animation/SHAnimatorComponent.cpp     |   2 +-
 .../MiddleEnd/Interface/SHMeshLibrary.cpp     |   2 ++
 .../src/Resource/SHResourceManager.hpp        |   4 +++-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Assets/Shaders/Anim_VS.glsl b/Assets/Shaders/Anim_VS.glsl
index d12cb34b..c9aa64aa 100644
--- a/Assets/Shaders/Anim_VS.glsl
+++ b/Assets/Shaders/Anim_VS.glsl
@@ -71,5 +71,5 @@ void main()
   boneMatrix     += BoneMatrices.data[aBoneIndices[3]] * aBoneWeights[3];
 
   // clip space for rendering
-  gl_Position = cameraData.vpMat * worldTransform * vec4 (aVertexPos, 1.0f);
+  gl_Position = cameraData.vpMat * worldTransform * boneMatrix * vec4 (aVertexPos, 1.0f);
 }
\ No newline at end of file
diff --git a/Assets/Shaders/Anim_VS.shshaderb b/Assets/Shaders/Anim_VS.shshaderb
index 1560e232d160b78f166e493bb94fb1f6114fd935..c10bdc5a8ad53cb47aeb2f3d9b375b1e1728ae88 100644
GIT binary patch
delta 1248
zcmYk5&2G~`6oto0?1)sA%BC!UDrpxWwL74ygs3PWwOt^!h@WL;wN`3yoshUtejNw}
znqA>ZP@ac3V1?8r66dpLAY&cfd(XKubMMUf=i*sw*84SMiczgB)Q#~>!%Ume>1=zt
zCwd?Zh2tNiN0n=V>B?^>J6lojan#GABZVf=2hTw3^y4h<q+;u)`+Zcsn4?xo^==Y(
z@5TKrOn0L)Lwwb0he`5J^TkpD!`C;E4IhSSJ4&;X3yR9ZJDoJzO!wm5sPFh=a^asu
zaeF`8v_jo{k+7D=2Wa=htmh^L+5nBQ7iJ;WS9vG0ley!wYU1S^(p<w+q-r?MlMjb=
z9IeCArsMG8YQnk{cSP%A2IA%fa)^gEK3B%Mp+6EDC1F0x2EuJ&Llaypei8p~Z9y@E
zB3w>g@r*zbaBfptpBE^eB8XdpXU03h?@GQXuBkW{7)!cs^rym#0Po<mXO^4Pot8}G
zJKbpq6B=tu&x;KyFcsL8#aV>pODe7-+bnzzt9+sq2!~ecHS=6PO>+Y`HIJBw2S<EE
zb|84d1;rm^>)Kx~i`C3WD<Uv~cxXBFPu6c)otPW+gv;87+oO>=`P=|8^S;Vf1US|u
zKC#^L_(5aJ&sQ~NUleDsrc1pl%VWPHoEL6s8cXxXz`OWR{*v%bbI@N1<iNX}m-1QL
z<s8W;51yRsT*4~_%fhx6YRbMA;24g3BOi`_9rxC9^tWYS&O7<cCm)?xaH@4%vhM{7
aAcsa*Wpn-kZi@eilhB<MiGQ@!itrbE35hNM

literal 5597
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

diff --git a/SHADE_Engine/src/Animation/SHAnimatorComponent.cpp b/SHADE_Engine/src/Animation/SHAnimatorComponent.cpp
index 50ce1975..5eff2c45 100644
--- a/SHADE_Engine/src/Animation/SHAnimatorComponent.cpp
+++ b/SHADE_Engine/src/Animation/SHAnimatorComponent.cpp
@@ -86,7 +86,7 @@ namespace SHADE
     currClip = newClip;
     secsPerTick = 1.0f / currClip->GetTicksPerSecond();
 
-    if (!rig)
+    if (rig)
     {
       updatePoseWithClip(0.0f);
     }
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMeshLibrary.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMeshLibrary.cpp
index df21343e..b0ca7f14 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMeshLibrary.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMeshLibrary.cpp
@@ -185,7 +185,9 @@ namespace SHADE
         }
         else
         {
+          const auto OG_SIZE = vertBoneWeightStorage.size();
           vertBoneWeightStorage.resize(vertBoneWeightStorage.size() + addJob.VertexCount);
+          std::fill_n(vertBoneWeightStorage.begin() + OG_SIZE, addJob.VertexCount, SHVec4(1.0f, 0.0f, 0.0f, 0.0f));
         }
         indexStorage.insert
         (
diff --git a/SHADE_Engine/src/Resource/SHResourceManager.hpp b/SHADE_Engine/src/Resource/SHResourceManager.hpp
index 5aff2529..ea6b4ad9 100644
--- a/SHADE_Engine/src/Resource/SHResourceManager.hpp
+++ b/SHADE_Engine/src/Resource/SHResourceManager.hpp
@@ -211,7 +211,9 @@ namespace SHADE
         assetData.VertexTangents.data(),
         assetData.VertexNormals.data(),
         assetData.Indices.size(),
-        assetData.Indices.data()
+        assetData.Indices.data(),
+        assetData.VertexBoneIndices.empty() ? nullptr : assetData.VertexBoneIndices.data(),
+        assetData.VertexBoneWeights.empty() ? nullptr : assetData.VertexBoneWeights.data()
       );
     }
     // Textures