From 80fb8f7c7323e19ca300d60ae799ca6e986df02a Mon Sep 17 00:00:00 2001
From: Xiao Qi <xiaoqi.loh@digipen.edu>
Date: Sun, 22 Jan 2023 17:00:55 +0800
Subject: [PATCH] Saved and loaded bone offsets

---
 Assets/Models/racoon.shmodel                  | Bin 679720 -> 681640 bytes
 .../Assets/Asset Types/Models/SHRigAsset.h    |   1 +
 .../Libraries/Loaders/SHModelLoader.cpp       |   5 +++++
 3 files changed, 6 insertions(+)

diff --git a/Assets/Models/racoon.shmodel b/Assets/Models/racoon.shmodel
index e15051b6e9f11b309e006fb989fc1cc91b5b026d..3fa9d9bd9e5f0adff8ab6f8cbb8a6fade7883247 100644
GIT binary patch
delta 1330
zcmYk)TSydP6u|Lg?$$bjFNM(}2(?iXWfoY3)d+d3AYasUHH3QTLb_?CR@%;KYpvAU
zru@2S-cq8=Ze`Jp>_vPKM9HU9IaE*yDQJ)nU7$1N!<m=)@9#TvW*+u-U()TNB!3_(
zFeeZla0Hxzxq*3)U5-vy2Yx0v==7`UN3M)m0O-LF1Z4tV;x~eF0S~a5z$f4dh6oPL
z!Xn-=h%E#a&W7CQQwJua7~a@-<?eL3mk;;>{_u5ir04$`AKRC0_I((G1eIcYKO(_l
z0fdbNM+8_{PjFPgDE1Om2^hydf@%Si_?)0dz$d&#a7@5gj1U|b@Eh+CoDeXLc?7ir
zW-ynaPCzVr2~N&}D(!MP=3yp*UyL|0oxl*_#_a?sAQ7twP6=3m6$AkRNmxs8TEHr-
zCO9Kt3GOBc3RsV21oZ+o;y!}20@mOHf^!1aVIskK0o&0{&>$ckodk^nG7$)x1b8u)
z;DUf$OeMG|AP-XrLIU<<8o?z2<+zN%6tD*u6I>QhgDVNH2&lv51kC~}anu4Opx&@7
zxGJF0APcSuK%?J+>jHwtumv{+v>1aHv<L_pKP+e!&}>Xua8tlt<Cg_(0@{r)7PJfK
zHa=R=A>f5EVL_*W*M_p7YZmN3nKPK$>w22n8}qZ%G+GnXTeribR_AM3YI3PVS5^61
zrkU^8)hiAamCO`fz%{&<E2luqFgF{zYAVpS*-x8c!xNq7^QlmQmi=#Cd<L)c?9{gK
zFJ0}mV~FG4PHn51cvDw19I7wO%k)Am%N%D47HT=ldd4(T$S)7J=_<a6$BCnqLzRy5
z*_|T(#D(v;ri*yqKgPAe%kza{-Rua@SEg4>F}uUM>i6<j>X8I9F5*!!#XO=%bhV?H
zUw46{*_JVm_jas!psU3t95oz!OZdqFj{6*{EY6u=CO`D3?<HEc^2Iqfnf{1FrR~xt
F{sK80=feO1

delta 2727
zcmZ{mUuYb45XZ+R+g#Uw)nc*IhZG~ET52lN2Za!dsZk$1!N%0iCf8~a6y>C#C>HMF
zw8kv;l1s8lG);1;X_BVtHUFBVX)>|VlR_aNR0M@k5Q-0)iXtffncJCT_u+o`@VjGn
zKRYwu-}g6r!`F5WFYZhvZ%b}SmLyA)R&ryqY${Tk+1lWo$w8atu6Ojl{@@0Hs<!;M
zH#!)3VDD%G;2-{E(|!Im&`&;=|M`%!kb|`4X1j%rrUG^{AuMzhXLmbuIcR70Q(;%V
zfbCG0QpMRvoS7VSSngV@u<JqI%B-@f_Tud0&SVZct%P@LB2s%hH?ha5Bk)3jC!AV>
zu27)N*+<Z=0k1q0DJ^rF2zo-d-08eX@L4FZ)p>#7a}8|cG+Ugv2zo8IMr%%d9Q1oy
zYhG(BUh{V64T4jayIFNkxdGd*Y`;OPZBC4!&vH|mx8L7q+1~+W<A%I9@Hjy~*X-v5
zpmdOTO4)M5{{D*Z6AW0c^a%hh0XtM+4ZgaG?-FEqe>Jc8OKQHLY}T;9f8ZSigO)3O
z0>pfO2|K7P8T$PfHxZn++*o_QR<1el)!u$(qXzbG+(__+<$|6gsa^7(S2k{_c?C-d
zhWHHn8u1wndE>0IYX+^B@qU6ctW~Gf91ZrjazWXe&f>nhiuVx=hfMk%-b*mTMpFS2
zp+h;R4_h^C_$oe1FlxEckE9S0Q3N=pEEvT55i1DJGV2S@y8F!tJ6&kPkaq}o5R5Ua
z;+2O?I;(8fzz$+H!8yx~`wZvx4~gXMQ?|-b^B6u!FwTcVh0lHx7`$8AXlrrdN3e?E
zJm+l|tz?i%-tj`e2D41yHG(W3EPqe~Ku?hOva&J5hA-h&f(vX?)mes-<jp9XGW0u(
zIf4nxC9PS^D(pysHJJ26{DEMS4X)nE`u-BOOW7)eRwwa$f+^0cdnEfT>`b9w!~VA5
zb%JTu%J(sVXeR6>Wy=j(wd1!0Gpv=bFF?OvyRb{jW({mB-Xyqax#C3tIh?}IE4yx}
zxd(qDnB{@3!%s95wo}<P!?1r1ZxGD!@Kc>vLxW_wkk?Ri4F4mTw_IU(aQZJBKX2s~
zWox|Retr{wC%6<EB=6uYf(1St$Hd_BmX{{d`mltdiDP(@;4&YME@4wA0)ww88#5I0
z0k#k<ve60#54|ZTlwCC(toJZMu*8F;@J}chewB-bnhoOZ!(IXkz5k!b9)jgipbkBP
zFGGO?I7V<K6llZ|f|XF<5DpQ16$(_~Ai>w6zz&=x$b|wA<21oH8p!`uvAo^&cH~6$
zWaMJ?<fh*;UcBCZ+WWKK-tQfMiI<WFUYZ;1TJNrd_H!i%;&JbugLa))@v{AtH=JK~
z9kQSGX7Wo7GMYpC887NEb=~1utdW<W8~MW9O?=_6CVPK+V0??0j@f&>(!>1R=EHpN
h-ADM2&LjM5`zyR;@=N8beDz#@dF&`>oIh&+@;~uV$o>ET

diff --git a/SHADE_Engine/src/Assets/Asset Types/Models/SHRigAsset.h b/SHADE_Engine/src/Assets/Asset Types/Models/SHRigAsset.h
index 424c5468..59c9b51e 100644
--- a/SHADE_Engine/src/Assets/Asset Types/Models/SHRigAsset.h	
+++ b/SHADE_Engine/src/Assets/Asset Types/Models/SHRigAsset.h	
@@ -27,6 +27,7 @@ namespace SHADE
 	{
 		std::string name;
 		SHMatrix transform;
+    SHMatrix offset;
 	};
 
 	struct SHRigNodeAsset
diff --git a/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp b/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp
index 0d3160bc..9e4abc67 100644
--- a/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp
+++ b/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp
@@ -151,6 +151,11 @@ namespace SHADE
         reinterpret_cast<char*>(&data[i].transform),
         sizeof(SHMatrix)
       );
+
+      file.read(
+        reinterpret_cast<char*>(&data[i].offset),
+        sizeof(SHMatrix)
+      );
     }
   }