From 742c8149f3a4e861312d031f25e1cbad5a732ec4 Mon Sep 17 00:00:00 2001
From: Peter Li <peterino>
Date: Wed, 7 May 2025 15:17:00 -0700
Subject: [PATCH] saving

---
 engine/rend/shaders/meshes.vert.hlsl          |   3 ++-
 engine/ui/build.zig                           |   1 +
 engine/ui/build.zig.zon                       |   1 +
 .../content/_shaders/dxil/meshes.vert.dxil    | Bin 6536 -> 6408 bytes
 projects/content/_shaders/msl/meshes.vert.msl |   2 +-
 projects/content/_shaders/spv/meshes.vert.spv | Bin 2488 -> 2332 bytes
 tools/scripts/cookShaders.py                  |   1 -
 7 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/engine/rend/shaders/meshes.vert.hlsl b/engine/rend/shaders/meshes.vert.hlsl
index 7331023..8e86d2c 100644
--- a/engine/rend/shaders/meshes.vert.hlsl
+++ b/engine/rend/shaders/meshes.vert.hlsl
@@ -57,7 +57,8 @@ Output main(Input input)
     float4 WorldPos = mul(scene[input.Instance].Model, pos);
     output.Position = mul(ViewProjection, mul(scene[input.Instance].Model, pos));
     output.WorldPos = WorldPos.xyz;
-    output.Normal = mul(scene[input.Instance].Model, float4(input.Normal, 1.0)).xyz;
+    // output.Normal = mul(scene[input.Instance].Model, float4(input.Normal, 1.0)).xyz;
+    output.Normal = input.Normal;
     output.DirectionalShadowFragPos = mul(ShadowMapProjection, WorldPos);
     output.Instance = input.Instance;
 
diff --git a/engine/ui/build.zig b/engine/ui/build.zig
index c951af3..d2f454f 100644
--- a/engine/ui/build.zig
+++ b/engine/ui/build.zig
@@ -6,6 +6,7 @@ const dependencyList = [_][]const u8{
     "platform",
     "rend",
     "papyrus",
+    "shaderTypes",
     "sdl3",
 };
 
diff --git a/engine/ui/build.zig.zon b/engine/ui/build.zig.zon
index 1895ffe..507859a 100644
--- a/engine/ui/build.zig.zon
+++ b/engine/ui/build.zig.zon
@@ -7,6 +7,7 @@
         .papyrus = .{ .path = "../papyrus" },
         .rend = .{ .path = "../rend" },
         .sdl3 = .{ .path = "../../lib/sdl3" },
+        .shaderTypes = .{ .path = "../../lib/sdl3/shaderTypes" },
     },
     .paths = .{
         "",
diff --git a/projects/content/_shaders/dxil/meshes.vert.dxil b/projects/content/_shaders/dxil/meshes.vert.dxil
index d8cdacf5ac7538477a724b3c2a94afcff11182e9..3e1902c54dccac8ee0029988a0370893601452d8 100644
GIT binary patch
delta 1612
zcmZuxe@qis9KUOi>$UVJKaNrw*D7>XX1xL;>U6z=9ae}&h(ROv%3!uqsuOf*%nGzr
zkeU?FALtSVB&0KgU?__$ZsVY!Gh*!KoG#7)LuQO_;B-;vAA6Nzb=gZUdHH_d`}}&}
zTtj+8T4GL-K6`)sRc`*F<G17b=AU_XcbyxCAP8$tOhU(^A?RiF`4ubK+)#}LK7{^^
zoscy>1GbS>P)HVLU=Tz>FeCt{a*EdGfh{BkN93Tc&mOp|<b%t-qihEYPNMVC_i}Z{
z;?@kK>(CJ?tai><*T<-lb31BASjt^!&0r!Fb7{YfKkxZ;?T4!mj5UkifpT;h!d3vt
zdCzCs>}ZI6pA>?Ev_!O&et}Bh?KGbwg<I(qP717`*Kr8gNFU&QqWHK+NwH%p%vO7j
z?@*8X^y!WU6*innsxJs&Evf#R7GSCHG`$>4c05yIQBs@OZysu&A>Wy-l?RwH&KCJg
z25lGqL5XzcA^k;I9;lU1GG0!O{66C@t7d04uvcDonuYGHR;PgJGxy(xgcCJ!kEs@C
zs_;Hlx533AwZ2U3mxZ<>|FRlq)`0VUX&%|cF1#hClJJLu7Ybn^BSJqIa7>JeRG4eH
z?8<}a2Njybnn$A*Lxa37h*PQHbP_GB)BwE5M&y{|jLP^;OnfH4ZJIZLnE4}=Qx_O?
zPw?+RxO#J|dE{^0uxuHr(BM{kWmRP?!dlQg^{SF4tF&%6*-A5}ez^AS)P2BaaCP(l
zY<jfV<5}Y<K9%(A9rPf+gTd`^!frC*Lh)GrHeZzK`njI-xBL1#nveAd^SO14N~<+{
z%XU{<ciIbB?cBuEO~umBi%;G;+Um=8|DJXbH*8Y<{KT+nBr`>K#XH`A`Pk?;KYf4r
z*l0et(+KWX?b}sG+U+~5%vAuQvcQ$L!MUQeTC3S>E&FtBX#uF06|gcxU>m0l@1Ed1
zJsy&u;;q+!+aK-RW3K}21uRpqh<6WO9(3Q>{biNXwotv^$o?XANof8M!R$Pe?6>Ff
zA(+FtdCclv%m?#`(_KQN=s)w-%M(qp;e)+1F*jN2^pahW0z;dPJx<N^kVOx9R2X9!
zRCrY4p#}!7QAl%^NJQU3^fnwvgRWKH>~%Di5brn|`;S+s(Vh}RXSsUf6oH-P2B-q*
z<?R6o)`|J5Gm6Gb(FVR4LKx~r<B_7TsBoi)Xk<rUUBrIwkt!gpj!DMV%0`kXsR_yW
zv8coKSJVO&gX$=vx!$PWN^O?C#_XjUukh<6Yy=`5M9a1Ily)r^rqD;9unZ`OZoy>w
zEE2tC0O>@T2ABmb<dsWeZzLjN-1GH$x>B)6DhKrBBu<QrtZ(}uW-|$Hy%EU0IQ+kv
zpw(@$Y6hoGc)a83@Opn>t4D<lSn9+c6@Spe(%vfMJx<i>ATi=xn{j<YQXjV88O&|E
zCz|y@wB%+l7Ouvw8l&dID3#fiC-rk-SpD_syg3WLah#_{j`!6a2wUDLxZo>PO0|wx
zEY_tH^H<EVsBU_j+;ObmO32k=&;4jI)eStqiu{Re57{-x5^K8^<pL~ZC@8gGE9(l%
z+F*PE$^~!GdVR#=H<UjaUhk16gScw-NoU7pT@qOzQQ{3f7_Y+PaF_cHrodnXp*tvZ
z1bGpJ7DKtq{RV;=a3rkKzD96c{UfI7Km@=CBuF?BfL0)3O;SWct*mP%!5WsZ4QN1j
t_)*KzunD49E9(d$ykWuvBpA|PGlpE5k|PA5{c=r25NM+o1pMB?`WLaFBGdo?

delta 1769
zcmZuy4NMbf82+wTt}Xq$!l0!`<}n1T6;}BdiJ^s6KyV^pF#fDm(V|dc><5Ice=DmB
ziP*UyEDnS*RMcWwwj#_HiX!s|+-6W2sjef1%>{_rbee5fpmZj?<dS>e@44rB-{+p>
z3{i&YpwxUx${)F_T#}lY6ED_ZyZ7_`fU^()z)&BAAuc)qWJXuwI+#Wwdh@sOLztWJ
z=PXfrubf<QZW0v$8Grzr1VCzjdM5D*Py(`?=u1+p6Cn%$5c5q~MS_BjS;*?l{EX7(
zn2fgM4#8oLI!d73BG5>h&mxM|C}|%Md<NlVonP7<_3UL8&H>7+&t{<HBrpr?Fix;e
zJfCe*BJ%@O@&LGFv>{Ty!YWsG-Z)>ZO%`E(l5JGEj4DeR$wd3D#t=#vBrtBEh@kz(
z3Q8Hi&lDnq{Ynaol&Kv@Of{!YwHd;xKJj8f4-;A=7W5ivR3Y@#7)xEQ0y>(6gJ9&6
zF_WTtgi?u9%0y2!ffSWV)1g~825%lSp$7rMNvRY$Ar9q`sUT<qupU`ibFv0q2+Ji)
zDJ{vr5U<uH;QA!qq~i#j*nqzx7m4w+OznHVSm0x(182?PY$Rvo5eSGQkJb28>DC+I
zycwO1tuiG%)zL@=WhXEFr9ITNv2|lr`2&+lBDC6qhcqi0?N;A1wJ*lV=IOVj>GMkU
z%oIT{NhIdMQDZpTWok))<JCSHfr^H%KK<y;EYxuHjm8JTKaG<$*0eUue5dy6j{Enx
zSWum%+kA0t4~^8qX%P-Qmsin4n^ZW89qoyU@3Amh5kF`n#z~P*ZDi?XE4|M_ztWsn
zu-kl~JUvuc-rD3x&KsK9@!PO-^3KF~J2}-qDv5hp6n8nwvQnJ=G2?b2E26eD^TJeJ
zXKhJ_`je1>@_J!Y)j1<3Y-;k$JVCtcnsW?m$HymJ{VsxHvYlGk9E-f`CcQKK`|+W6
zqCebDF5XO#eQ~31QzUyj;%1#vnSs-H5}>OS)8j5ey`6l;Oy~Rv8OP~p;`6l8(81un
zIg*|a>Z5v7B<^TdGZ&)z7W{Hl_Yi$gRJX$BTQG%Wj9|SFaf!TgjlHaBe>;q_i5QX~
z;OJYnY<e$|K=a?MNf>G~|KfL-q}nZ$(dUBJBm<PJOAm8EjN%a9LRA#@$X%HLqj|Ti
zc?onq%mp#t@qnhnrrp&7$gu=U51)Y;)gDk$_?)|PgQDf70H-4LSq|OWX1hWX18T#m
zHbp;P8;%YbY>*n~rLG%g|7!JXr9q-boZL#&i5im`p$G+NWvE7<W=+{-{3jqll^eJs
zo1M6(5e2O@iKtOTZKc^|IoQxXJAjf=M)+6i!yA}d4on7OQN!KW!at3sN*O31+hlV3
z$%G+XBxE_G<!bjd#_b~?IT4!yA`$YL2ebWe@yVeGl@Ju!^jQK0n!lB@<WXel>Ek+?
zeapN`yJhIGYe~f=S;3E^)_w;+tL5Q<s<rLmCTZ@8MGGq5?|edzrFc{-9{Qufgv$I{
zQ$BBYr0#UDg*@RF%=%Rs9|i`fI7JOUS&l)4<bOOm(-pXOmiw|taf90G#TDOX_EhZf
z*gq9JE#Ib>E&4KMItmAn%=^Xb7gxNF>`J?YE>0YSRX*&M%ulSMBK{>VeZQ}!(1L%y
zXk@YO^;O$FM)uTwYuM{ip~b&At<hV**>&vpqLDoizai3N<YTE~^Vc2~J9ZixB~*^N
z-S@5Nl`5Um1ExWP*!=+nj#<8?9y_Dz3JgVP#7AgWUpwHED!Zi#wY=qots2s+7h5n(
zJ-^S(P@{BS-S6!8GF+<1&U5Hqf+4B0O)B&fgkY8~{uwU;QbLSiw|NP=tB4s!5ii4t
zRM{!zdl|%-#l|mOWVms#7bzwfy8pApMPh_eFW$Ws|GHOzI6jyC(y@&X5x*k$^)KV3
BYtR4y

diff --git a/projects/content/_shaders/msl/meshes.vert.msl b/projects/content/_shaders/msl/meshes.vert.msl
index 43a33c8..f98d6ae 100644
--- a/projects/content/_shaders/msl/meshes.vert.msl
+++ b/projects/content/_shaders/msl/meshes.vert.msl
@@ -48,7 +48,7 @@ vertex main0_out main0(main0_in in [[stage_in]], constant type_Uniforms& Uniform
     float4 _51 = scene._m0[gl_InstanceIndex].Model * _48;
     out.out_var_TEXCOORD0 = in.in_var_TEXCOORD3;
     out.out_var_TEXCOORD1 = _51.xyz;
-    out.out_var_TEXCOORD2 = (scene._m0[gl_InstanceIndex].Model * float4(in.in_var_TEXCOORD1, 1.0)).xyz;
+    out.out_var_TEXCOORD2 = in.in_var_TEXCOORD1;
     out.out_var_TEXCOORD3 = Uniforms.ShadowMapProjection * _51;
     out.out_var_TEXCOORD4 = gl_InstanceIndex;
     out.gl_Position = Uniforms.ViewProjection * (scene._m0[gl_InstanceIndex].Model * _48);
diff --git a/projects/content/_shaders/spv/meshes.vert.spv b/projects/content/_shaders/spv/meshes.vert.spv
index 93410fd2a38cf660ec4c549d0bd8fbc7d093909a..954489e4a3d7042f5d11273a0c131d20dbe7a300 100644
GIT binary patch
delta 94
zcmdlXJV%I^nMs+Qfq{{Mfq{>~b|Y^)$7BOe4qYoCUjT^3fY_FSg+T&HTLUpjd;$Y2
hgE)}30b*kyww|2Ism!YdWZ5w=GjM`rCQs#51_15x3JCxJ

delta 255
zcmXwzy$*sv5QIn2a298bKVV^Zg^8W9Q$YlJz!$Q#HKFw-?0f|u$<7(WZSrMyXK#1!
zIeX7-7`O-+0GOb9*}J)=7-GfxKz5|X2n*_wY>C2qC+6}r@4dA50&0T@2{j{{*L(Gs
z<iWk_or(IoSHoPfW|9*%ghB_j@WP?ZUx6t#CjP@k@B76i>pdyDk8w6<mLbHLT6SOK
Ee)|3rmH+?%

diff --git a/tools/scripts/cookShaders.py b/tools/scripts/cookShaders.py
index ace7992..a75487b 100644
--- a/tools/scripts/cookShaders.py
+++ b/tools/scripts/cookShaders.py
@@ -83,7 +83,6 @@ def cookList(inputFiles):
         outdir = os.path.join(cookedRoot, fmt[0])
         for f in inputFiles:
             basefile = f[:-5]
-            if 'vert' not in basefile and ''
 
             outfile = os.path.abspath(os.path.join(outdir, os.path.basename(basefile) + '.' + fmt[0] ))
             os.makedirs(os.path.dirname(outfile), exist_ok=True)