From f727fc968cfcd1906b4e41c28f0b6688e82724be Mon Sep 17 00:00:00 2001 From: Onek8 Date: Fri, 15 May 2026 00:23:18 -0700 Subject: [PATCH 1/4] Update --- leenkx/Sources/leenkx/trait/physics/bullet/RigidBody.hx | 3 +++ leenkx/Sources/leenkx/trait/physics/jolt/RigidBody.hx | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/leenkx/Sources/leenkx/trait/physics/bullet/RigidBody.hx b/leenkx/Sources/leenkx/trait/physics/bullet/RigidBody.hx index 4d19b55..b50d20f 100644 --- a/leenkx/Sources/leenkx/trait/physics/bullet/RigidBody.hx +++ b/leenkx/Sources/leenkx/trait/physics/bullet/RigidBody.hx @@ -460,6 +460,9 @@ class RigidBody extends iron.Trait { transform.loc.set(tx, ty, tz, 1.0); transform.rot.set(tRot.x(), tRot.y(), tRot.z(), tRot.w()); + } else { + transform.loc.set(currentPos.x(), currentPos.y(), currentPos.z(), 1.0); + transform.rot.set(currentRot.x(), currentRot.y(), currentRot.z(), currentRot.w()); } if (object.parent != null) { diff --git a/leenkx/Sources/leenkx/trait/physics/jolt/RigidBody.hx b/leenkx/Sources/leenkx/trait/physics/jolt/RigidBody.hx index 909a282..bc0b378 100644 --- a/leenkx/Sources/leenkx/trait/physics/jolt/RigidBody.hx +++ b/leenkx/Sources/leenkx/trait/physics/jolt/RigidBody.hx @@ -495,8 +495,11 @@ class RigidBody extends Trait { } var active = physics.bodyInterface.IsActive(bodyId); - if (!active) + if (!active) { + // Activate body if sleeping + physics.bodyInterface.ActivateBody(bodyId); return; + } // Read position and rotation from Jolt into cached state var p = physics.bodyInterface.GetPosition(bodyId); From 53612f7d5ada61ac5ec9ab5f468ed01ecdd0f899 Mon Sep 17 00:00:00 2001 From: Onek8 Date: Fri, 15 May 2026 01:07:18 -0700 Subject: [PATCH 2/4] Update --- Krom/kinc.dmp | Bin 130402 -> 0 bytes leenkx/Sources/iron/object/MeshObject.hx | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 Krom/kinc.dmp diff --git a/Krom/kinc.dmp b/Krom/kinc.dmp deleted file mode 100644 index 9599794978980a351ff429978c4dc2cc1b175b9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 130402 zcmeG_31Cx2)0?(Jfg%9`D}g7AW+HZ7HB4QEm~bCwNj1 zeybuBMMXudii(O-P>|1yihNo=LBdta*?(qdCwcF+Ng6~2eGi&>yE{8GJ3DXodb@8x z?*Yz-UP#KXD}=DYA70~^))-HBLWIN3^JfX+sUbuJ+&8odksl=l;(rZ)D=!xUlEsiP zA>Q~!2tX4B@D~d=H37!J-)i`)2Y*8V@c_U^@VCn%#GJN5G=}>{@R!pbenPxz0k^Ov zR!eP_FXaXyKnxLOhaV8U|D+GBdw~yMe2a1%g7lJ}LX3d2V!1Fa8p;)4ONfE+hjj2y z*r=>{i{TPLbc!S~TBM3G@HZL|28$es$q>o#n+3l%F$7Z5MG9uB@~Q)|7NW1xjWl}$ zttlc6=!_NPfPQeASW{tMnrka6DmsX+!Y(?A4x*j>O9GjaMHh$}19GN7Y_1q366Adv zgp)+JjKzE%L`TTmMYM&xPV%nGf|!wKfCiGGmdApnW~y5E*}>&dyLPYx{L@-XXK^Li zK&LaHY^I2RzXm>Qyzt13D@hJ;twmai?4qLap=rvOLISwYzvU_hCvUq>h-Sc@Wwo&+ zd9`M5fct_^j?F?C2aVRNODqEOc%V(`-<=R`1cWFg{B`B+Wxg0_=Y(7xPWkMQ$`2;sQafbSvvMMnop{Ba=1`1ypNI0D+u9tM1CZHc$&a01~& z+xx$^gm1qUSh;{hdPUGd~U5{&NiYd4ykjaIwUXh6erFkwo8hn-C9oGvF5zeybzP zCH_`0x}Hafz9Sdv4Ehy#+2k+$6cc{j@%JQt0W{WuzbTsVOTd;}TtbLmd}|$v*Q#tA$piY?^Z?-(&Vc&8%z$qv{H;g#P(G;NL7fQS zJs0ph81S8hA9=V!;+I4Hj{2SOo%aioe3b#;rRbN{n}hb;3gp>-1L4~q65?{BKJyg) zQ9&e8&`bAGde-Fxomree{Pch-II^132 zW8bieApE>%pihaNM7V777k)g1Ke>FM#GeDt*Z4aLKk@&BD2IL;UN-p)Kh`Lzm(s%t z5@pJGM-&;p_l_J8w1!q0z82sb(*xNPzlemsP~?#N<^9|QJQdkEpX)(By5 zM~Gg0Yh791$fL_8emUs-2IyF$zjAyC{d4G(<7Jb-@M94ddU$P$3uO~zs0U=z9e%Usn5BU406Mo@Fcz(|};O8m& zhxQPC;J>LQ;k&mmQG)#?*eTl(;r!Zy!L~82$2Gt{{z+WmK85o;U&h3{efM;?F!u;N zQB%i2V|bGV7<_1eSEK?Yvc)#1g!>)h|9vgA)z6d_ukee4_A|yG$tQufxNl}AIU~fz$HT?t+f(k0Gw`wqvJHfR z%7w1;*?_!eQ+?&t7ZWzr7auz{h&a3Ki5Ac=;`+kb5P!U?vct1~0EX(SZ1Yn| zhsCwT3uo6B8{%7b9i!nD2J<5Rco}^Z>aasVUI*2)Tu00tSx0>F=!o)V241U_%_9t? zL-bL@1M*r;yd0gyvb~+f@tsdZ9x(8#uHQgAyfYxLI>bv@MW=MDm^*UA-7zrW<@yRm zhgh!sfV|d`ZFp*luea3_UGHgs*Ifo){&Z-x4J_A30eLk`lXjSI6}#)#7dt=uYV`*O zUe7irn@1R^zL3|>fV?bJF3~_teWZbS>5e|n*XXR*VRhRS^ig$xgdcTPw)sYi*CgSZ zHA!SY@$=KM2411qhCLv!+sQV-Z#?{Tn3!^C$c+08ybd=c9U=^*LoC-24X=_)?bmIp zO=%!r{kVZ>-D}X|FAcn^+Xp}&HA%y(vJSftui_|?awtmd-PZ2wv%Bc)tGa#zZT_)< zydLZ#?ax516N}2iMC?nA!+$jJs;&;PzG`lRA9Yo(uYF{Po-pBgHe7uC+^=n$ z!90uBM^(42L|&H#}`Jjm|G3Js#{;!rt}NQD_+@QZE<{UZP6vV zYw7=;BrklvZVSlk%}gp+J<-!sPkjH&@j9gjUe$fRa2n;|fV{@4XSs%0ky}%&?ojvk z7#Q1X>#Mr9f#q5gkk~Bzg5$q21@TzK@f;RtCKwe9U zm#dLz7S~uzD5>9TjfNMtmDTmV_$;4Q0zc}iZ1ZiXIEjWk#Ji+u5i(C{O;BF8+cXMN1@Fh4#+D} zjlXJ%k3Xs}dn9C+m^lKp3oC8w2ucr~JG{^t;|7-kr7Kh8+f8{`^Lm zL2N8nSwLQIsj-6)kuyODOO_vPeT`m+)#Zh@asGCn0F`ZiHTeyjMa;BYM8lkswv3bH zg>7Z`fV^I(a#_R0!so)p>T0s3)g}i%UOiH?!Nd`ueJ_-?$KXy&RC&W28e@L(ywVLvdH~*y736e$y{70oyrxK6lvym`fz`HO zq4aGU{_GQ=vdzy>{a%ZBzd6k7wc4L?oq<<%pD)y5*MPhpB^|mg;{ItCanS=~+ump3 zRieg32m|>jw8L8i@)C*{*kIQP(R9zj`o#ubU#NL(gn@WrechwsRno(!Pr5s2v}{v6 z8zSC6u{B~Yv?&c7zWU;}gdy_6S_gWiH29A(NIM=^`o4(i_0##LzK46 z+P=l%;}uH37nfwd(DJHOu3>8IaF&R=xQ56Z^z-el0Y__x!I;d zhlSzdiQmJ;^$CrpW*B(+^BYDLT@1V~*a1K4s%-NS*GgXCH~N0pP|V#_lv=3aB}5%@ z2*xT5edVhBuD~R~a%g!Og%SJ74jo})YU?mjFevNFat$x6uLqPJBJ}a9ymo^+d{fH{ z=;$ve@hXfEvuB+pA|E-g#??Lb^%csq{9Qm^J&2dhB4Qu3h$pkZ`{5qobu!mQnCZX1 zoR#bAbFz7R4dMByhR8W*+Y28U%H_`=8mj|s%(aLcN_M>1|0H?YfY*e8yju1nA7v4p)?36YKOcB}j)7Nred-?~ z3}lBF0=QjD&U3NKv!wnMq4Eyzp7B?z~M);I%IxuVdGd z9Y%|$-J(U}xEJrehhacldm*oLfAPgse!jYs@6D?xx;$S`TzqZInK6BQItQbX5RlhUYQNkvP zP>F$8b^RgQ#=`-4MMJs`{^r166#SvA5%5P>&xK{v@UG{Z3d%6!6g5~b5(tMFqHT{UDB-B2Co^&JK|7LaiXFE z%2rW9c>opOy@;<%p}jDxDa0L~m+EN+!knLvAugjF7faL`W74F$rtGaR!*kz9KJbo8 zAE`Levdvr>{@qpon(vwlk=md*b{G)4;{AhtJ_k5_>*CQ!prGq}^;)m$R(oNSH9e3P z(m@)S|E42vu5NwJL2*l;f+k4p-mNnpn*EC{ykqjSk~aP%uKZkVTMuiv?}dx|`hh<< zVG-xujT+ToE5@!7_?*3*?t70AFPSK)xlBJ0hZvSVWCqo{|I>xg`+rN}$;F zL@%-b#!JQ6?>3#?`TlsZ*ppIs`nv~zBMc$xpa1R`tx)N3ebxh|7Gh{8Sv4Z=c?yS# z=3+Cvk0l)YNXU{&5?b%7Bk@ZcND;+4c#iOLC@AvRPz5?ywUi0g0iz_VqFi`e4lYhF z$s%p!e=E^M;V;BEZ+51Pa4w5bB2v2UcRYl8iEbiZ43+PLXTfhgyoa6vZ;fZd-2gEW zV(`s(yze6h!RtVM;J&}OQN+Q!@V!Mp2=#+^jWgkWbKhM8gkA7{c?P_ToCfb3r-;e$ z2X9<>`3;v`k^v9a_aNtBcmqBg-hEF2I#mqPyD=IXJwu@3E5#U~qqmSyv_bkzhZ6b9 z5=wofLyhLbvyla5@lgn+Buv2tJ2OZcA00;s8cBkB%~kcHx35s@26qjl!~Ox@8*(yF z-9)92%2Yy;1fP`Auoos%`UIa&LZLzW#QiimU~fJeq112|h^ntC? zM1wv;$&Wj}sGaiJRVdHB&j(hv@lY&du!sfE%X@wJdBq+cwd%vAw++Md;sZ6!cxLZU1 zJ+|yQ;Co%tzO=o_P^gRsiN=ETV?hUcPZJ82NgxS&JnYTtsf1FeR1>Ie^bJ0{3dL)p zU16^)1GMg=5K39FmqI-R9Pw!T389q5M@6p>cmb%|Ey^UY!er3t$(17+%8?72Aj{Q0 zr=jQ*?Kl_eW0V+wl5$Y*F$biaq2i1Wyjr@|7r*wsxYd>traA zFMlXHrMkvvSKA*7MW>TxOG$GT9iY9`wt4UxaJ4<+IG~fPDMcvW6x(QQTYNeQr8ara z37`914UH$g(qj)4TlFl^Qaa3xVb3H9TKfUO6I%o9M`S{4n*(vwtLCT22G}W(g0#`! zW&ws1o&=d0O017Be zF3@m7U)`sxP^k0(4}-H)nb51!_rr&HwWZfURkM~jgNgl2-v|%S-$31_z%zkbnV^v` zHU!GlreUq%=^djb#1WgXw4pp*IKDD^ED%O_*jnC#f;Dd`v#!L9JQG;GJSnjfb#6I22im23sw z8;D-%7X;CaHo#w=3UmCFOH;<}W1=P$?0?)}D!nOv-K6S)p|~OQ;dZFhM2qZC*e)pi z2%qnz5Qp{FxpVfW2B27*(D$F}ELfy#7b2^v^ONysaI}T4e|9qdY%`V-F19z<)IqX6 z^SBA}*+_&1_SILPem3X=FNPEXdg?t64*P?htj`4WXIRG5p?{{GKgadY%4?whO8C!+ zH~rb^S&yba)7Oj9pXJXae`T9Xut1&N#<|#^ak@W$J#`v5B2oAW=ko{86o2MV{(non z>CaBjnl}BJzFv&}EKm6{>wNNOe6}R#Vt>Zz^VCEF!<$t2W1e8(jDDc$&-^InG>bO< z*=bfGN*vRl>Fb64SwoJlN%QpX+64LRTTXV?AwS3I(R&l*nVE%qDW37FJN7mG8EfqH zhNeF|J?qExXZm`%MFrI~nsB~7T+W|yn9t^}btqH%EzZs9#hGyuU$|+n5T~<0!$ky) zW4fHq@IXo6^?=i5{*2}Qw?fmOot`!SPx5E^r(iu`lX6Uxr|bJyTzmZO0Oz4;I)BFa zr491_i|Zs8aR&9iM!_yUJ}0+QbXCxdfoI>= zgYn}!)s^eV;}qQ7^V5fu3mbXU8Siv~rawDfYCCg1~2n^HE`SgA^4-F>bi!B3@<&GybewoghMfw!#oIER zr(jGR>8)77G0$b+I>z*8g5S%)X4ZUPLu+AG-<$qSua{u{jK96)C|g{mKU=r>LFv!R z738q$_UV~HC|c3^2lz8x+1&Tl`WXAE40VYzpzohK?<2h>D!6z-$9qhFCQN@;*>D2J znEp(!o?!lrzYXVB--zSfJl-tWzg+q`Hz%m^<{TC8jaD~tiq4tl&x)6y)$yi3)9WReKjUxfy3{vzIXC+= zwLQSMkIzjQdF30b^k=b(&OgncJ=uA3_nZHKKg+h}nEnh*$Mk3XgjElk{!Fi@VE&B1 z{q0uY0O#E7&+_)4E5~0I>it=(@@%#}+p6?uaf;5F=FjlG6TGCgOGOx5wGKhx_am_OTkbdU5)_G1J&H~TZ*@04yh zUt`e)dVJ0ospy<({tV^E`TpX}$E4pXsJF*EkA~+Z$Uu)FJ%+8q9&6uu^M>a2eJ5rj zA@}ck^XzwyRaES(QBQ~g^Rk=wpX*u~-M;H_WRSFJ?xyKxDg0f71=FeiPjyL_8UN6D?+19dpbMQSN z`yqmyoBbJwz0gf}o&$P(PLEV{&NP3<^8Z=zn>B8;e+J4m{aI)hX8JR|zJmF)$m7kW zKTA}QbF)7yuXslGGemd7D{fA3Tsc9;XBeaCoN4~d(o25Ti;E!=qaKp;UoHh9LHB;` z)}m*nUP={=exJgv6wFuo3KevAs^>7@*D(E=*TAZIWBN0_qJsIef@AHaKNH6lRN2{| z;W1}&$hnWwOH_JYkAD7KMT@P9-kIjlW~y?|2Uvp(qk(zPHkSU2;p82(Pe6mByS4YA z{Q>I~yd|pH$D{wi`lychpAg{vPOwY27S0#)d5$Sto|fm=)u!WFy_^f1(rtl)_^nI4 zqSZN&bJPUIfR%K9s~ys`C*>g)%>*xWAk$!fme*mWe2$Yj!A&>ChxGWI zT&n0**Pop!=WW0IMMayWKj4op?tjy1J>KN{Vfh-eNA!}HgF z8=pr_`D&?iRT(exIK^KMjPM)A2({NP4k*4>h3}2#8x_y%?i|hjjOFI@tkW2Qp~}zx zh54d5T7PDBa0Y^gpx}J$$Cxks3v3@SCzrErgt$z8yIJ`W&d+Lq^Qr4={eCci#tzdW z+{ngzdF6Ic6w|*PL_zu%<>0uz;raCcK4WU<+w;a70+GNv2D zgazk!D?0x)f5zoISvYO%9jEnr0GEsH-t=eGU-9|{r630@N1#{Ey@`x@2*dVJ0ot>{$OpPe@6Yd`_8-E!S~znnKKzKHhS zW4W-sp1I;|d=;bbxv}#HZ0-9_oaj5Z&$u2R&$Pgq?4s}cJ8eDYZH%2K4;%cwulze73xip%t8X8)`@c6KuTv)7vc@$UzyZl!3! zHwIzL4`xb#wqtu*5kAkY$|%hEoUL#Oe@`b(zQ@3J?>Um)l={y^nDa547FzC*#lDr@)^X&vPt#q(pvKj_tOfY?}0E zM%g*t7;g+O!Vmeu#dO6XJw5Y0N7B!k^2_yZ`ZLp?1+v+{+n@1q|JJaY_pgLu5r@kU zEvV9;aeAOKVH)odV!B3r)1MhNa(ahNe`bz1t7D;mmp_}WJ{-XFV4kCkb^dGJ5ei$6 z>En%M;_q;By#KYCSIo>pC)?Zv2DcV?L6Dt+uUlL*ZGqZnI9aBGT{MlJs$e-0BIHzn|)&5MS zbJ<$)je^#lP35@N5M3#FruefQkth+R0J z^SAF0a4SI-^wz7|&tXv$>VM__fK%~4Ezf(!8^)8Ww4(IT9-Tkqc*gJ0+4FE7E_T`| zrPxFGdl$X)QvoAuAm`(#VDF!uPVdvQ%>QQSwR_W_&BFJnt!}+FIP}4Ptv?$yxcA`s z4K8lE@3L=iy!YOk^Glv9{t<1bSGV|~*(q7s@u?YOGUJ`8qjM%^rDVtVzcH@Yz(IZD zM@>vkOOBu1rBnQ%l(dwj?3DQaDJdBfCb#XCnU&Jcl{`uy;kWkIiGHE>!ePaG{&(vz z`_j9Ra7IpYTACMQcXIoZCG$T%``6T_wTo7_oQxO~QnE5q(yr*}MVfie>w{;HdAn85 zg`a+M|E>pr@F9%?&R(=#doSPj%94TOAKklR#G#2(Zbr0;PzDX9(cPBBI_DjErT@7P zFS8BnRS!`nrDj~waiW*X?u^$~Om3d~^NPl8>a^Mr^AVzqO-|Ji37b;8-?@V@= zee}?PC8H1{c~W|kE7eP+@V+ME($4pN6S;Qxr{C6_{HsJs&2UZ3iSgp>*^-;k=#8tt zZcs07Ug53Jw)Qd_Gf|_UCBHi6H*LRd)HHW?o2YNbZ$&JSI6d7<=a$w9Uo8-MBZ zz}uNW=DKU_Kpc>GTuzS5D|O7iSAJdo!?G_w=zUMu9~19$Ax@SHxOMWPG&uI)@kgFs zbJs7Q_fOBBe+97`my)Knu`Tse4)>c7^Ifrh`joWJo#rE%QKPe_xO~#IxcAkyZC;H! z7`t(0(;Cq){*EY_X(<}zjBi?Nc8^x$9=h`0Wg}vqeRYe%NSc_VLHfLj_`kkuSIzl& z^RBbTdBS8zEz^~fF;*+i1?{K&c6>z7uB*!y^jq-tHM@~g@~E*Ow6Em16`BSc2|9juI6K2ntA?tm3YQ~T$t`r~A zoe6LJwqj$;2fw&})y-2T9hJ{JN;R}^ugr8;W=2Xzjt{v(bj!T!XIxfy;&lse*!s(? z+p!2_0-9J0t(!3F<^719k&~X3m6PNZvG1Ze75Chn z`&^5a&m7VLPu%dYmZHuyW+*v4g;^96cJzdF{Ctf@{n;U={`@HKituA z$q!4HjNH1r**llb^&n1q_UN23UeO~TS^d~uJ&qlId`O+f<#i_QMT}nkd-h7oxyg$& zwEnpp|M$qWp07@uF{b&E8)OY+`3El+U%SifVtcQ?47Uxi4M zaaJ^jef<5E&S8;dx@`}cNwIrZLUiO*RwJ>$z;nnvtpRFL>+gJBmxULlcEax+Jb_tF`>XJTU4!Y>DPUQ@8*4cCH>hyt!M zCu^d{pVn&EETQ$I|0zFfc5tDY>v6cp&O4{R z+SI;r`NB0QJ!BuFmHvf@jTcUM<*xhB>H7TG!&h&cEpaj@Wg(td{$C#*+~oY>PkvNU zXzge1G9w0&h7NG{?&Za(Klzc}%jSzI=dHe@YIDiYBjU|HOsbdEkQ!#Qj@)m27EvJ(&_tBf7>(l zn)fF?bdmHVJ<_v%J)sj1qz;Zckk}wGqj1En*4`750Cvh!GIG5{uKhM{$o|BYzuRxi zdifep#&X0N;2PLtm>1)zZ+EZ0^Qu?gbgjDc_Z8PH=pr!&^iIj`;q2>0>OVJO_#J)H zjvt1d-3;=p9l6m!@9pLgRx=9GAnztVi9}-1DW zRkZc+0x6FQN*umNIOX>XFEg6hys8S>_L*OL8b z4)czOdMb}AbG>{c#X!m%v^M@-lWzCM8*kJ`F~QK7UhS~8F7@~QK|h4-<@9D?$q^bK z7SD=poYoF`&u7Ui55J8xdzmk>8MHu@83a)|C)J|i>vPM*aw{2c@tse!(j!vzhmUf z{TznwbM*5j9A~-0Uw5i6SFeV-P`;`f z$6Ake|4YWPMNRa6o%?`Aji%EVg;>ZCp>Z5*i+j>nk8H1BcYA%el?g?PuLQ1e0@=AD*2 zFXVoUc3k3Sir`n}d7(TdFYn}JSc#TX&G%GFI5iQ)hiHeD^BB#am8h^s?Hpw;O>yEF zF4hNy%wMAh*zSz+{=%L;-ljy&UST6x?}xvyb1LhV7tRu?K-R;%NHu#b7`TuUgpz>d1q?C z)PSi0Qv-jG28`<#?q+V?JpYR8>C2=1z8$Yi=c_L`Hm&QEyQ*~y*U=4s&3d#FgV!s3 zQvIGFIu9^WaY?ei|j0`_9%`!2(-dV=V{w{waQ>x20+B4rZ#32IBfh(F+~G@L@jJWrlifGff&JrZ zA9|R<;l?Tf4ACKraX-Puckw%+LT64f}Tt$w7n0^*3?8et(iTtm1iI(#V&G z!3;|b`$0JzOd#XBQ~AwvXqs*v!i%T&eemV3qclc$n-hze$-KkE~y>FK#>A+_eAp*T+>S^yZtyukeu) z%{T|nB{hWo(K7wCKh2o&rUpz6m>MuOfEuV35q4HYxW#E4hZ*04=Me%`67W#c%E`7nJBGvsktu=hh84fXFqB0cRn z$xPn}&Gy}>5i@LRz|?@L0aF8}22NfB)$IrI{Im54z4yxV(#cm5?;r1etIB?my}X`o ze#+QSIc4+Ff6;rg!tkD~H>~2h9~5jqNTT5!D-H*%NwXgmOhab6sR2_1rUpz6m>M{B z8dw(foLmp#{!5)_^xvZr;+!T&@cU_gu7q<|>e8*p7VG*&g?lVQV5NMw$`lCSU=q3WCqgx4-j_(5nN{7!M226*~F$PS><0ZB9 zha191eZ&Px9}ysZ=gapWuNX6CjCP;zEdlUxA8>q-^pQc*Zw->35G36bBpp6Ys?(oQ zU;Bcj?+=oGAV~VbAn9d6(hmhm-vAGQ);^5oD-M#rF-ZERAn9KPN&h-X`sN_%__g*x z<@+W``qnDa;nNT+vq$}M$4P(TX(_nX6fhj{hGuB>*V?j?5Cu4l((<`9_yL& zo!zc)mHSc>PZ;&eISA&K6J335@KCQ0015G-qVIu9@<@H(xY`TZQZ6ZEB&Z zC`upi%SU&NXI1!WnFta|ADAmj!tq7>~2hRnH}dgF&+&P_>5md=g_Sf3Lyg zrspI2D1GO_a#%q;pu~_#``rT0&+RgYT~mo3ANO2xCxs29yurWxdl-f4dl>$pS2F#L z=TLV!pPM&bzwxhf+kYfu^y!V%^54z9Q z&ja0B^1$jrAcUjAsr^o~kq?I%@;s1Z0O^tS!1F&03k~ao9A@*y#Xvv$ zzi6j?vE8vz~5spcyFy{Ue;bo>ntyShn-<1M3;VDpi(+V zR2Pr&73BF9d-(>bC;kq*LxsKQ*VCO>Ki&lMMymm~JB;H#l{VdYpSR}|^Ly+@rI=w; z1EvN{4VW4@?KEKQcd>xH{$ia^>rbV}2g>=jjYkOv?RW9Ij(VSi>E+EOdfe}FFFVcF zw>)Zn${%C}8DPng1e&*0>s;P-Ew#?Y=#FdYj`hLuCe&+y?G9tBv%ZzTeYm;4rB~r; z725Z-G{dQCF=n!MRmpkj9VROd@t0^?}0+* zYtM)Gl~kA^&$AXc5By!oBExw%91bRvInNqQLuR_E0aF8}222f@8u<5W!1!I)V45g; z*MqOTR%rJb1j`dBea4mg)X^#!yDhB<*YS_cr}KZ@#oxXs*Y&qkJm+emUUcU4xnJBT z&kG8N4&GH&yz|X?oZlbxhj;%cM4#o{q2#gh`z|~5@Lg43VN#yHh@S! z0{Ur5!lhy!t#^FS77+y&T*h<&2T)Morg?m{)1PEvNf~ zMeB&JM?nD)3+^lTAn)EcEsaP^jT>-3uT+vYLESgI@^SBe&Ui6g^c6RX-eMr!4Hoh6 z$MWJfvyKqM^kionetL`k@K1=D;U|C#T*gUthrY90>mL37(HWdiW)A+dcbZRLEjHH! z%Oz~JWVwZ)@;g-6T3?$>h{2Qe@^JZv;K6Wk6|{Mg^rP}?>0rID`%GWoluL-n7R28I z<-<8$FJGmfSVa%huzqT(@j|$GF&E>E@(Y6=5rr?zZ#T%tX`jdhwY=}GSXA4O@uc{43Q$ZRlE#neztZE6ZyW)pu+kUJx7ef`uhCpD7pW! zp`ew$G=*Sadc!*H`_!E8i+Acs{1PRvyHfcmePvkYYR-djNQWlN8@~)U_2{`)p9Auu zB;DY>l{ZYkTAm8r|D$Ke5D8VKzh2oI|Y?b5wj@9!K2dy2(Onv3nD z`u@%>a~G<5E8+Ts@=713%B^7`Z@C>{y%_zSQ_1O8`Fn|O;LR%gyAj~?hKN350PJK( zf0ryqiLqj|$P`&3MYIFoNdC^qzq(=GpIt+cL1n0n#rJKI`&fd}aW^&Yx2Et?uxET8 z(iH(a6H@lfK_T>Cl4m@dLg4yhd)_JQzk}#3t`uEGCt=*59i{Sd{uv+9{%ZTXWRDLd z`}SvRpVv}lS9MhW^Zd3@gixgXib5A2Wxrk45pv{n3L7vnA_JGOkN-~YW-Yy3^LTyw9tAoRn{n1M%?kD7;}eTq2)GjKls2``Z|mFH%9yXQZFGo!U3FUp(8>pL~K@h=IiCRucWm@&%AbHVBpc6}D%Qsa2`Ja*>i&pwO8^p(UlrJaOld`iRyupMK z43O=y^qB9w4y=FAjr#Xcm`>3EitnMpN0Lm3$=~0E`Y#;*u_N2>`O?ntcnOr7>A7P# zopQ|Y#`y`K(;3>flO4sXcA++8)ApmW-NW#+jrH*urZ&;~DdzEj!P4_hd~Cf)4(4Nj z;v#CN6hHAZ@ol}8({xogIi%R_ppAWtqJgXhNGX80;g|KBuM{hZ6?VVK{R;w@;K_ z%pEpGklVjvMUUGJ=2xI@BC!#|OUWCj_Rn6?RMA)M4d*ZTgvzyYxAjwOw-6uOxmDj$ zyzM$kO&I0b)|==tzFV9v^Ak4A7bv=z{^}BoxM#gB?5=G>pnj1)x3{I|Q$AyUFC8V< za5a5WzMtgGXhr;)j#0m?J}y7f)3)bKU$&zVVEwWln69YXOqPr3alX9oNk6Q|_Xq3c z;ds`gzw)(I1PAmU;C$$XqT=XUB@1hL^OQT4xIgtcQb|`r`gFpBK z;gzK*dtf{jua58HSRF+Dak*JNp0FWAzRaVZB7^ZO8pR#{GoWu=Nz81DXS9Mo zJEM99QRL-2-;3h$F-JXfK7|I;W0bx_)hCt%9~~|a;$gWQZW_zffErieYf)LvdoS(<~I~9UJAfH>4EiJ*}mPz3=~$sYfH#J;$akm_MHiB_5fIy$d==2<>GN{7F9w55OF_mve7i0T9L! zYy~{XnkcbVJ&)Xvsn`QEyiiCUKieP={yhnQtKlyO{!kwLu1YL4irByM0DKe3w7ef5|8t&it1^S>s@Y_--<4)*jHMEG@KUzc-5NZf>2n_&Y zU+d9)pbzCne7r^-*Or3fw7+xO`a*cW3(#}gla7!!UJUU*>r?7KIA`r?dz$0M{W0Tneuf-hr2LM*{tNR*ekd#3U4iEL+W=`?zuZ2seE9xa z;ePTJMZXh7jb5~u^k7r+JAU=0VP5CG*U5Pr=FfDEdJ`3tZ>Q2H(_uW81E8!(Zr3#N zbek9{(@|cgAtMxG&5zo8=TkAtNT2<_5rV18_5tIOo_uZq8u2*Hyn7#5EZ6%up3fiU zun~Sr}B3TjQRQ^f=$rjF)xv=O}s)tbanrvu+cL3%ndZLpj2)$IM2#?u=y3Ur$u2;08R(vD(5;@MVEI|DMgLRw5G;cseHuFT zDlROee#Nf}q`xq#RFyA(?{K-ERdL%Vy66AbcYNpNqW^QL@$ulC(Gy;WGM+X5qotF! zH|zKOwYO*g{6$6@ijMyNbiZs$K=xBSen|a|>RT1F%Jnx3l#lcK%DHb1-*frV1jf~W za)frBLv*L{kVCZ*oQEN=S4Lat3!ocSg6)DrI(N^Q&&oN~_;{d^K7|X^cq{Q}s$9pn zaW*yH@+S}DF&loKSznJSf5PT&T(9KvG!U&M$4!cF;TsdA9LyK}2-2`!y31>SXm6qm z$&YEM$BWyMe=1hxK@_}-|kW#?i&WVa>!`x9Cy3<6jle#SATj+#lUxLEK1 z*w5OJR#cQi;Splr?mQx+`6W5siwe7OeWT2I>=(U$hy1;<-4Nn9y-(#nDk1ab^A&yV z0p<6$A6~j73j5_k)ebNpuN+EZ9)DW5?~?tqw^Vy2#7-HGy7rA|vSSLb&VOAO{{9(# zIBJP{ z!0H(OVtaP7mzN*&RWPxP>r@d0waX3x?gg z%in%@e1BDkc#;8@_aw7>vtc`y4~+n~XC6o?(HIL%KNNY9;fDQyavQp~Q;YX!-%sxS zpKNSjSsrWgcQTB8(N5SOVwj3U_Jv`*ni6mmsQ#}_p&I*(j~yic%l2lpuPBv|^J8$) zGc21B|JRB73z#2u8@rIgTowPBb3*!G4r6}2VwB&v76r!lyqF-{slsnZN*J?wzm8s= z?&RN*KI)J0B@@k0siJeCh48K45k1U@{j?a>9x)$oN48GgEBSG{zjlgQMb9MsBK192 zoEO0~4twdV^1pl+;Uk{xFESwoixeJ5f2jI9+@7*tgUQ7of#7@$nXVC@6`8%M0eoyZ zKbq#hjOihV4gHr3F44b#%JO$^v|H+%>9d@S&ydrx+gp{tYYqsk8%)PAUie)Y?lWMx z{BG)BK_$U|u;B;PI)Wx1?F#3I@Pb?T5AR>&4_pjw;d(llhWU^#)@v^n#{3x17t3Wo zLeC-4lO#1Lj4I*1oyp(((uwbd3X9hV@+wHbUVrP$ATeViDBlj%PsB)kh8dspV>Ye4 ziQ9;7qEc=gD_QMt;Bgg9)yj+I;dow;Td(BN)`iTV;){PGK0JQl{0uqWP%On2fRbxq zQ=`5J<$3S;OVzi^`9|pjvY+YiJjx;^m&P6_r{cF$)uSROJP|{s-{LUKzquwoU*7lz zLv(n&-re4dKsWZIWGBx*pnraZAwOrU$2W#_BmGtBG~Q(N*ki<}?M~7M$9th)#d|SM z*^Sr4P8r2NgOI+R=J^KXgwKy-JCEmlyitW)kCUE#vHClt^% zbYDnU^{eWW`v;uvrKKuiN`nV!9H#Ic3W4)+m|CUyUJp_2qd!Dm?>mx8@^JXJ@p^gv<>&ana$i2bQ^vdz z+CHT98D2kmec5v-nhW>s|J(fb{n#(&cx|53;$D6CvSh%CaVV!p!RNP5m3})hQvZDp z@e9pIKXdW>nQ}f&oj<7cWilQLr)^)g<6dois5;Q{k$LCQ^JDvxvTYc+S3EC;9Crx6~P-)W)n9h01MpBeybxCw-x_aN!v#`Z*C zC^@)1tvXGX^H{AQ0%dk4QhT{b>6QJcTM(X6UZ%rxd4kAm)C==td6`bk1}aa!lArk) z<uVqBi}4HZB03Sma+bF~9Wc&QdbTRPyAN|do6NdO(V2XJW|}%deem+uy*_r(K%5; zOW~M~$&v(G!%P?$MTd+nZy0kkQ*GwS`fbkZ-QS`R7vx2YIaf1J+cX1O^2WFgbz{D~Lp`{n%H zVfnP>;(3z74@r;Ce&olP-ZjVQ`7B;U{e$Cg=$i9z(dFVlpHj8{IX^!q z7)F20^(scH@rax9GhZVgyYee6Kl?+Avb)wrdij|z(g>J>Bo9E>D#Cm#`CCl!TAv39Kqa zyPf~0)Q3&^d8>k)&oPzS3Fr4jhxKSz^01#`f9Ncv^02>TSorR7*{=VVLC=x>IikmM z7$NIt&Um7iujKf7+G;5;`)`($<&JGm_$(*$HPSbROLD62AE)eihwLSZ`d<^>`xyM)$NX~oexviqaycI7?>{;^_{xrL1mkmT;*pBK^gMFrd(E;X z^nKFCr}q1#ju!fP77jD?o=3h%uSZx9mKQ^7L!z^9ZJwMLQ_22Go3dHL)wBsrhuC?=&K~o8ufBypN(1f{mYy`OUDYfvPm{bh{~OIG-Nsb)t^` z90bl^VySumO74_!WEJq6x89WJfme}KWz?MIgkN3yX1}INHJXv8222h7i5mESh4u^E diff --git a/leenkx/Sources/iron/object/MeshObject.hx b/leenkx/Sources/iron/object/MeshObject.hx index 5e72464..e8903c1 100644 --- a/leenkx/Sources/iron/object/MeshObject.hx +++ b/leenkx/Sources/iron/object/MeshObject.hx @@ -19,12 +19,11 @@ class MeshObject extends Object { #if lnx_particles public var particleSystems: Array = null; // Particle owner public var render_emitter = true; - #end #if lnx_gpu_particles - public var particleChildren: Array = null; public var particleOwner: MeshObject = null; // Particle object + public var particleChildren: Array = null; public var particleIndex = -1; - #end + #end #end public var cameraDistance: Float; public var cameraList: Array = null; public var screenSize = 0.0; From 8ccebf48142c72debabc10cc878d3a5e356f1b50 Mon Sep 17 00:00:00 2001 From: Onek8 Date: Sat, 16 May 2026 10:50:02 -0700 Subject: [PATCH 3/4] Update --- .gitignore | 4 +- leenkx/Shaders/std/light.glsl | 22 ++- leenkx/Sources/iron/object/LightObject.hx | 6 +- leenkx/Sources/leenkx/renderpath/Inc.hx | 114 ++++++-------- .../leenkx/renderpath/RenderPathDeferred.hx | 1 - .../leenkx/renderpath/RenderPathForward.hx | 3 +- leenkx/blender/lnx/make_renderpath.py | 31 +++- leenkx/blender/lnx/props_renderpath.py | 14 ++ leenkx/blender/lnx/props_ui.py | 143 ++++++++++-------- 9 files changed, 186 insertions(+), 152 deletions(-) diff --git a/.gitignore b/.gitignore index 4149b49..22b7f70 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ __pycache__/ *.pyc *.DS_Store **/workspace.xml -**/vcs.xml \ No newline at end of file +**/vcs.xml +**/stderr.txt +**/kinc.dmp \ No newline at end of file diff --git a/leenkx/Shaders/std/light.glsl b/leenkx/Shaders/std/light.glsl index 17bb226..c908982 100644 --- a/leenkx/Shaders/std/light.glsl +++ b/leenkx/Shaders/std/light.glsl @@ -148,10 +148,9 @@ vec3 sampleLight(const vec3 p, const vec3 n, const vec3 v, const float dotNV, co vec3(1.0, 0.0, t.y), vec3(0.0, t.z, 0.0), vec3(t.w, 0.0, t.x)); - const float PI = 3.1415926535; - float ltcspec = ltcEvaluate(n, v, dotNV, p, invM, lightArea0, lightArea1, lightArea2, lightArea3) / PI; + float ltcspec = ltcEvaluate(n, v, dotNV, p, invM, lightArea0, lightArea1, lightArea2, lightArea3); ltcspec *= textureLod(sltcMag, tuv, 0.0).a; - float ltcdiff = ltcEvaluate(n, v, dotNV, p, mat3(1.0), lightArea0, lightArea1, lightArea2, lightArea3) / PI; + float ltcdiff = ltcEvaluate(n, v, dotNV, p, mat3(1.0), lightArea0, lightArea1, lightArea2, lightArea3); vec3 direct = albedo * ltcdiff + ltcspec * spec * 0.05; #else vec3 direct = lambertDiffuseBRDF(albedo, dotNL) + @@ -244,7 +243,7 @@ vec3 sampleLight(const vec3 p, const vec3 n, const vec3 v, const float dotNV, co #ifdef _ShadowMap if (receiveShadow) { #ifdef _SinglePoint - vec4 lPos = LWVPSpotArray[0] * vec4(p + n * bias * 2, 1.0); + vec4 lPos = LWVPSpotArray[0] * vec4(p + n * bias * 10, 1.0); direct *= shadowTest(shadowMapSpot[0], #ifdef _ShadowMapTransparent shadowMapSpotTransparent[0], @@ -256,7 +255,7 @@ vec3 sampleLight(const vec3 p, const vec3 n, const vec3 v, const float dotNV, co ); #endif #ifdef _Clusters - vec4 lPos = LWVPSpotArray[index] * vec4(p + n * bias * 2, 1.0); + vec4 lPos = LWVPSpotArray[index] * vec4(p + n * bias * 10, 1.0); #ifdef _ShadowMapAtlas direct *= shadowTest( #ifdef _ShadowMapTransparent @@ -436,10 +435,9 @@ vec3 sampleLightVoxels(const vec3 p, const vec3 n, const vec3 v, const float dot vec3(1.0, 0.0, t.y), vec3(0.0, t.z, 0.0), vec3(t.w, 0.0, t.x)); - const float PI = 3.1415926535; - float ltcspec = ltcEvaluate(n, v, dotNV, p, invM, lightArea0, lightArea1, lightArea2, lightArea3) / PI; + float ltcspec = ltcEvaluate(n, v, dotNV, p, invM, lightArea0, lightArea1, lightArea2, lightArea3); ltcspec *= textureLod(sltcMag, tuv, 0.0).a; - float ltcdiff = ltcEvaluate(n, v, dotNV, p, mat3(1.0), lightArea0, lightArea1, lightArea2, lightArea3) / PI; + float ltcdiff = ltcEvaluate(n, v, dotNV, p, mat3(1.0), lightArea0, lightArea1, lightArea2, lightArea3); vec3 direct = albedo * ltcdiff + ltcspec * spec * 0.05; #else vec3 direct = lambertDiffuseBRDF(albedo, dotNL) + @@ -454,7 +452,7 @@ vec3 sampleLightVoxels(const vec3 p, const vec3 n, const vec3 v, const float dot #ifdef _ShadowMap if (receiveShadow) { #ifdef _SinglePoint - vec4 lPos = LWVPSpot[0] * vec4(p + n * bias * 2, 1.0); + vec4 lPos = LWVPSpot[0] * vec4(p + n * bias * 10, 1.0); direct *= shadowTest(shadowMapSpot[0], #ifdef _ShadowMapTransparent shadowMapSpotTransparent[0], @@ -466,7 +464,7 @@ vec3 sampleLightVoxels(const vec3 p, const vec3 n, const vec3 v, const float dot ); #endif #ifdef _Clusters - vec4 lPos = LWVPSpot[index] * vec4(p + n * bias * 2, 1.0); + vec4 lPos = LWVPSpot[index] * vec4(p + n * bias * 10, 1.0); if (index == 0) direct *= shadowTest(shadowMapSpot[0], #ifdef _ShadowMapTransparent shadowMapSpotTransparent[0], @@ -516,7 +514,7 @@ vec3 sampleLightVoxels(const vec3 p, const vec3 n, const vec3 v, const float dot #ifdef _ShadowMap if (receiveShadow) { #ifdef _SinglePoint - vec4 lPos = LWVPSpotArray[0] * vec4(p + n * bias * 2, 1.0); + vec4 lPos = LWVPSpotArray[0] * vec4(p + n * bias * 10, 1.0); direct *= shadowTest(shadowMapSpot[0], #ifdef _ShadowMapTransparent shadowMapSpotTransparent[0], @@ -528,7 +526,7 @@ vec3 sampleLightVoxels(const vec3 p, const vec3 n, const vec3 v, const float dot ); #endif #ifdef _Clusters - vec4 lPos = LWVPSpotArray[index] * vec4(p + n * bias * 2, 1.0); + vec4 lPos = LWVPSpotArray[index] * vec4(p + n * bias * 10, 1.0); #ifdef _ShadowMapAtlas direct *= shadowTest( #ifdef _ShadowMapTransparent diff --git a/leenkx/Sources/iron/object/LightObject.hx b/leenkx/Sources/iron/object/LightObject.hx index 0749fab..01b4a6a 100644 --- a/leenkx/Sources/iron/object/LightObject.hx +++ b/leenkx/Sources/iron/object/LightObject.hx @@ -97,12 +97,8 @@ class LightObject extends Object { this.shadowMapScale = 1.0; #end } - else if (type == "point" || type == "area") { + else //if (type == "point" || type == "area" || type == "spot") { P = Mat4.persp(fov, 1, data.raw.near_plane, data.raw.far_plane); - } - else if (type == "spot") { - P = Mat4.persp(fov, 1, data.raw.near_plane, data.raw.far_plane); - } Scene.active.lights.push(this); } diff --git a/leenkx/Sources/leenkx/renderpath/Inc.hx b/leenkx/Sources/leenkx/renderpath/Inc.hx index 5e90488..29b5116 100644 --- a/leenkx/Sources/leenkx/renderpath/Inc.hx +++ b/leenkx/Sources/leenkx/renderpath/Inc.hx @@ -10,6 +10,8 @@ class Inc { static var path: RenderPath; public static var superSample = 1.0; + static var pointIndex = 0; + static var spotIndex = 0; static var lastFrame = -1; #if lnx_shadowmap_atlas @@ -164,7 +166,7 @@ class Inc { continue; } for(k in 0...6) { - LightObject.pointLightsData[j ] = light.tileOffsetX[k]; // posx + LightObject.pointLightsData[j ] = light.tileOffsetX[k]; // posx LightObject.pointLightsData[j + 1] = light.tileOffsetY[k]; // posy LightObject.pointLightsData[j + 2] = light.tileScale[k]; // tile scale factor relative to atlas LightObject.pointLightsData[j + 3] = 0; // padding @@ -177,39 +179,12 @@ class Inc { } public static function bindShadowMapAtlas() { - var hasAtlas = false; - for (atlas in ShadowMapAtlas.shadowMapAtlases) { path.bindTarget(atlas.target, atlas.target); - hasAtlas = true; } - - if (!hasAtlas) { - #if lnx_shadowmap_atlas_single_map - path.bindTarget("empty_shadowmap", "shadowMapAtlas"); - #else - path.bindTarget("empty_shadowmap", "shadowMapAtlasSun"); - path.bindTarget("empty_shadowmap", "shadowMapAtlasPoint"); - path.bindTarget("empty_shadowmap", "shadowMapAtlasSpot"); - #end - } - #if rp_shadowmap_transparent - var hasAtlasT = false; - for (atlas in ShadowMapAtlas.shadowMapAtlasesTransparent) { path.bindTarget(atlas.target, atlas.target); - hasAtlasT = true; - } - - if (!hasAtlasT) { - #if lnx_shadowmap_atlas_single_map - path.bindTarget("empty_shadowmap_transparent", "shadowMapAtlasTransparent"); - #else - path.bindTarget("empty_shadowmap_transparent", "shadowMapAtlasSunTransparent"); - path.bindTarget("empty_shadowmap_transparent", "shadowMapAtlasPointTransparent"); - path.bindTarget("empty_shadowmap_transparent", "shadowMapAtlasSpotTransparent"); - #end } #end } @@ -271,11 +246,6 @@ class Inc { } #end } - // update point light data before rendering - updatePointLightAtlasData(false); - #if rp_shadowmap_transparent - updatePointLightAtlasData(true); - #end for (atlas in ShadowMapAtlas.shadowMapAtlases) { tilesToRemove.resize(0); @@ -352,6 +322,24 @@ class Inc { } path.endStream(); path.currentG = null; + + updatePointLightAtlasData(false); + + #if lnx_shadowmap_atlas_lod + for (tile in tilesToChangeSize) { + tilesToRemove.push(tile); + + var newTile = ShadowMapTile.assignTiles(tile.light, atlas, tile); + if (newTile != null) + atlas.activeTiles.push(newTile); + } + updatePointLightAtlasData(false); + #end + + for (tile in tilesToRemove) { + atlas.activeTiles.remove(tile); + tile.freeTile(); + } } #if rp_shadowmap_transparent @@ -432,6 +420,8 @@ class Inc { path.currentG = null; + updatePointLightAtlasData(true); + #if lnx_shadowmap_atlas_lod for (tile in tilesToChangeSize) { tilesToRemove.push(tile); @@ -461,39 +451,33 @@ class Inc { path.bindTarget(n, n); break; } - var lightIndex = 0; - for (l in iron.Scene.active.lights) { - if (iron.object.LightObject.discardLightCulled(l)) continue; - - if (l.data.raw.type == "point") { - var n = "shadowMapPoint[" + lightIndex + "]"; - path.bindTarget(n, n); - var n = "shadowMapPointTransparent[" + lightIndex + "]"; - path.bindTarget(n, n); - } - else if (l.data.raw.type == "spot" || l.data.raw.type == "area") { - var n = "shadowMapSpot[" + lightIndex + "]"; - path.bindTarget(n, n); - var n = "shadowMapSpotTransparent[" + lightIndex + "]"; - path.bindTarget(n, n); - } - lightIndex++; + for (i in 0...pointIndex) { + var n = "shadowMapPoint[" + i + "]"; + path.bindTarget(n, n); + var n = "shadowMapPointTransparent[" + i + "]"; + path.bindTarget(n, n); + } + for (i in 0...spotIndex) { + var n = "shadowMapSpot[" + i + "]"; + path.bindTarget(n, n); + var n = "shadowMapSpotTransparent[" + i + "]"; + path.bindTarget(n, n); } } - static function shadowMapName(light: LightObject, index: Int, transparent: Bool): String { + static function shadowMapName(light: LightObject, transparent: Bool): String { switch (light.data.raw.type) { case "sun": return transparent ? "shadowMapTransparent" : "shadowMap"; case "point": - return transparent ? "shadowMapPointTransparent[" + index + "]" : "shadowMapPoint[" + index + "]"; + return transparent ? "shadowMapPointTransparent[" + pointIndex + "]" : "shadowMapPoint[" + pointIndex + "]"; default: - return transparent ? "shadowMapSpotTransparent[" + index + "]" : "shadowMapSpot[" + index + "]"; + return transparent ? "shadowMapSpotTransparent[" + spotIndex + "]" : "shadowMapSpot[" + spotIndex + "]"; } } - static function getShadowMap(l: iron.object.LightObject, index: Int, transparent: Bool): String { - var target = shadowMapName(l, index, transparent); + static function getShadowMap(l: iron.object.LightObject, transparent: Bool): String { + var target = shadowMapName(l, transparent); var rt = path.renderTargets.get(target); // Create shadowmap on the fly if (rt == null) { @@ -536,12 +520,13 @@ class Inc { lastFrame = RenderPath.active.frame; #end - var lightIndex = 0; + pointIndex = 0; + spotIndex = 0; for (l in iron.Scene.active.lights) { if (!l.visible) continue; path.light = l; - var shadowmap = Inc.getShadowMap(l, lightIndex, false); + var shadowmap = Inc.getShadowMap(l, false); var faces = l.data.raw.shadowmap_cube ? 6 : 1; for (i in 0...faces) { if (faces > 1) path.currentFace = i; @@ -553,18 +538,18 @@ class Inc { } path.currentFace = -1; - if (!iron.object.LightObject.discardLightCulled(l)) { - lightIndex++; - } + if (l.data.raw.type == "point") pointIndex++; + else if (l.data.raw.type == "spot" || l.data.raw.type == "area") spotIndex++; } #if rp_shadowmap_transparent - lightIndex = 0; + pointIndex = 0; + spotIndex = 0; for (l in iron.Scene.active.lights) { if (!l.visible) continue; path.light = l; - var shadowmap_transparent = Inc.getShadowMap(l, lightIndex, true); + var shadowmap_transparent = Inc.getShadowMap(l, true); var faces = l.data.raw.shadowmap_cube ? 6 : 1; for (i in 0...faces) { if (faces > 1) path.currentFace = i; @@ -576,9 +561,8 @@ class Inc { } path.currentFace = -1; - if (!iron.object.LightObject.discardLightCulled(l)) { - lightIndex++; - } + if (l.data.raw.type == "point") pointIndex++; + else if (l.data.raw.type == "spot" || l.data.raw.type == "area") spotIndex++; } #end #end // rp_shadowmap diff --git a/leenkx/Sources/leenkx/renderpath/RenderPathDeferred.hx b/leenkx/Sources/leenkx/renderpath/RenderPathDeferred.hx index 9f56277..3c5b778 100644 --- a/leenkx/Sources/leenkx/renderpath/RenderPathDeferred.hx +++ b/leenkx/Sources/leenkx/renderpath/RenderPathDeferred.hx @@ -1104,7 +1104,6 @@ class RenderPathDeferred { } #end path.setTarget(target); - path.clearTarget(0x00000000); path.bindTarget("tex", "tex"); #if rp_compositordepth diff --git a/leenkx/Sources/leenkx/renderpath/RenderPathForward.hx b/leenkx/Sources/leenkx/renderpath/RenderPathForward.hx index 17a3473..2187521 100644 --- a/leenkx/Sources/leenkx/renderpath/RenderPathForward.hx +++ b/leenkx/Sources/leenkx/renderpath/RenderPathForward.hx @@ -754,8 +754,7 @@ class RenderPathForward { } #end path.setTarget(target); - path.clearTarget(0x00000000); - + #if rp_compositordepth { path.bindTarget("_main", "gbufferD"); diff --git a/leenkx/blender/lnx/make_renderpath.py b/leenkx/blender/lnx/make_renderpath.py index 3c92657..12d1023 100644 --- a/leenkx/blender/lnx/make_renderpath.py +++ b/leenkx/blender/lnx/make_renderpath.py @@ -8,6 +8,7 @@ import lnx.assets as assets import lnx.log as log import lnx.make_state as state import lnx.utils +from lnx.props_renderpath import auto_atlas_size if lnx.is_reload(__name__): lnx.api = lnx.reload_module(lnx.api) @@ -68,12 +69,32 @@ def add_world_defs(): if rpdat.rp_shadowmap_atlas_single_map: assets.add_khafile_def('lnx_shadowmap_atlas_single_map') wrd.world_defs += '_SingleAtlas' - assets.add_khafile_def('rp_shadowmap_atlas_max_size_point={0}'.format(int(rpdat.rp_shadowmap_atlas_max_size_point))) - assets.add_khafile_def('rp_shadowmap_atlas_max_size_spot={0}'.format(int(rpdat.rp_shadowmap_atlas_max_size_spot))) - assets.add_khafile_def('rp_shadowmap_atlas_max_size_sun={0}'.format(int(rpdat.rp_shadowmap_atlas_max_size_sun))) - assets.add_khafile_def('rp_shadowmap_atlas_max_size={0}'.format(int(rpdat.rp_shadowmap_atlas_max_size))) - assets.add_khafile_def('rp_max_lights_cluster={0}'.format(int(rpdat.rp_max_lights_cluster))) + if rpdat.rp_shadowmap_atlas_auto: + max_lights = int(rpdat.rp_max_lights) + cube_size = int(rpdat.rp_shadowmap_cube) + cascade_size = int(rpdat.rp_shadowmap_cascade) + cascades = int(rpdat.rp_shadowmap_cascades) + + auto_point = auto_atlas_size(max_lights, cube_size, 6) + auto_spot = auto_atlas_size(max_lights, cascade_size, 1) + auto_sun = auto_atlas_size(max_lights, cascade_size, cascades) + auto_max = max(auto_point, auto_spot, auto_sun) + + assets.add_khafile_def('rp_shadowmap_atlas_max_size_point={0}'.format(auto_point)) + assets.add_khafile_def('rp_shadowmap_atlas_max_size_spot={0}'.format(auto_spot)) + assets.add_khafile_def('rp_shadowmap_atlas_max_size_sun={0}'.format(auto_sun)) + assets.add_khafile_def('rp_shadowmap_atlas_max_size={0}'.format(auto_max)) + else: + assets.add_khafile_def('rp_shadowmap_atlas_max_size_point={0}'.format(int(rpdat.rp_shadowmap_atlas_max_size_point))) + assets.add_khafile_def('rp_shadowmap_atlas_max_size_spot={0}'.format(int(rpdat.rp_shadowmap_atlas_max_size_spot))) + assets.add_khafile_def('rp_shadowmap_atlas_max_size_sun={0}'.format(int(rpdat.rp_shadowmap_atlas_max_size_sun))) + assets.add_khafile_def('rp_shadowmap_atlas_max_size={0}'.format(int(rpdat.rp_shadowmap_atlas_max_size))) + + if rpdat.rp_shadowmap_atlas_auto: + assets.add_khafile_def('rp_max_lights_cluster={0}'.format(int(rpdat.rp_max_lights))) + else: + assets.add_khafile_def('rp_max_lights_cluster={0}'.format(int(rpdat.rp_max_lights_cluster))) assets.add_khafile_def('rp_max_lights={0}'.format(int(rpdat.rp_max_lights))) if rpdat.rp_shadowmap_atlas_lod: assets.add_khafile_def('lnx_shadowmap_atlas_lod') diff --git a/leenkx/blender/lnx/props_renderpath.py b/leenkx/blender/lnx/props_renderpath.py index 90ea357..5da4b1d 100644 --- a/leenkx/blender/lnx/props_renderpath.py +++ b/leenkx/blender/lnx/props_renderpath.py @@ -1,5 +1,6 @@ from typing import Optional +import math import bpy from bpy.props import * @@ -44,6 +45,18 @@ def update_point_atlas_size_options(scene: bpy.types.Scene, context: bpy.types.C return atlas_sizes_from_min(int(rpdat.rp_shadowmap_cube) * 2) +def auto_atlas_size(max_lights: int, tile_size: int, tiles_per_light: int) -> int: + """Automatically calculate the minimum atlas texture size needed to fit max_lights of a given type.""" + tiles_needed = max_lights * tiles_per_light + grid_size = math.ceil(math.sqrt(tiles_needed)) + needed_pixels = grid_size * tile_size + for size_entry in atlas_sizes: + size = int(size_entry[0]) + if size >= needed_pixels: + return size + return int(atlas_sizes[-1][0]) + + def update_preset(self, context): rpdat = self.lnx_rplist[-1] @@ -332,6 +345,7 @@ class LnxRPListItem(bpy.types.PropertyGroup): ('64', '64', '64'),], name="Max Lights Shadows", description="Max number of rendered shadow maps that can be visible in the screen. Always equal or lower than Max Lights", default='16') rp_shadowmap_atlas: BoolProperty(name="Shadow Map Atlasing", description="Group shadow maps of lights of the same type in the same texture", default=False, update=update_renderpath) + rp_shadowmap_atlas_auto: BoolProperty(name="Automatic Atlasing", description="Automatically compute atlas sizes based on max lights and shadow map sizes", default=True, update=update_renderpath) rp_shadowmap_atlas_single_map: BoolProperty(name="Shadow Map Atlas single map", description="Use a single texture for all different light types.", default=False, update=update_renderpath) rp_shadowmap_atlas_lod: BoolProperty(name="Shadow Map Atlas LOD (Experimental)", description="When enabled, the size of the shadow map will be determined on runtime based on the distance of the light to the camera", default=False, update=update_renderpath) rp_shadowmap_transparent: BoolProperty(name="Transparency", description="Enable shadows for transparent objects", default=False, update=update_renderpath) diff --git a/leenkx/blender/lnx/props_ui.py b/leenkx/blender/lnx/props_ui.py index b36be29..1c2dd4c 100644 --- a/leenkx/blender/lnx/props_ui.py +++ b/leenkx/blender/lnx/props_ui.py @@ -1745,92 +1745,113 @@ class LNX_PT_RenderPathShadowsPanel(bpy.types.Panel): layout.prop(rpdat, 'rp_shadowmap_atlas') colatlas = layout.column() colatlas.enabled = rpdat.rp_shadowmap_atlas + + colatlas.prop(rpdat, 'rp_shadowmap_atlas_auto') + colatlas.prop(rpdat, 'rp_max_lights') - colatlas.prop(rpdat, 'rp_max_lights_cluster') + + if not rpdat.rp_shadowmap_atlas_auto: + colatlas.prop(rpdat, 'rp_max_lights_cluster') + + if rpdat.rp_shadowmap_atlas_auto: + # Automatic mode: compute sizes from max lights + max_lights = int(rpdat.rp_max_lights) + cube_size = int(rpdat.rp_shadowmap_cube) + cascade_size = int(rpdat.rp_shadowmap_cascade) + cascades = int(rpdat.rp_shadowmap_cascades) + + auto_point = lnx.props_renderpath.auto_atlas_size(max_lights, cube_size, 6) + auto_spot = lnx.props_renderpath.auto_atlas_size(max_lights, cascade_size, 1) + auto_sun = lnx.props_renderpath.auto_atlas_size(max_lights, cascade_size, cascades) + + if auto_point > 2048 or auto_spot > 2048 or auto_sun > 2048: + size_warning = True + colatlas.prop(rpdat, 'rp_shadowmap_atlas_lod') - colatlas_lod = colatlas.column() - colatlas_lod.enabled = rpdat.rp_shadowmap_atlas_lod - colatlas_lod.prop(rpdat, 'rp_shadowmap_atlas_lod_subdivisions') + if rpdat.rp_shadowmap_atlas_lod: + colatlas_lod = colatlas.column() + colatlas_lod.prop(rpdat, 'rp_shadowmap_atlas_lod_subdivisions') - colatlas_lod_info = colatlas_lod.row() - colatlas_lod_info.alignment = 'RIGHT' - subdivs_list = self.compute_subdivs(int(rpdat.rp_shadowmap_cascade), int(rpdat.rp_shadowmap_atlas_lod_subdivisions)) - subdiv_text = "Subdivisions for spot lights: " + ', '.join(map(str, subdivs_list)) - colatlas_lod_info.label(text=subdiv_text, icon="IMAGE_ZDEPTH") - - if not rpdat.rp_shadowmap_atlas_single_map: colatlas_lod_info = colatlas_lod.row() colatlas_lod_info.alignment = 'RIGHT' - subdivs_list = self.compute_subdivs(int(rpdat.rp_shadowmap_cube), int(rpdat.rp_shadowmap_atlas_lod_subdivisions)) - subdiv_text = "Subdivisions for point lights: " + ', '.join(map(str, subdivs_list)) + subdivs_list = self.compute_subdivs(int(rpdat.rp_shadowmap_cascade), int(rpdat.rp_shadowmap_atlas_lod_subdivisions)) + subdiv_text = "Subdivisions for spot lights: " + ', '.join(map(str, subdivs_list)) colatlas_lod_info.label(text=subdiv_text, icon="IMAGE_ZDEPTH") + if not rpdat.rp_shadowmap_atlas_single_map: + colatlas_lod_info = colatlas_lod.row() + colatlas_lod_info.alignment = 'RIGHT' + subdivs_list = self.compute_subdivs(int(rpdat.rp_shadowmap_cube), int(rpdat.rp_shadowmap_atlas_lod_subdivisions)) + subdiv_text = "Subdivisions for point lights: " + ', '.join(map(str, subdivs_list)) + colatlas_lod_info.label(text=subdiv_text, icon="IMAGE_ZDEPTH") + size_warning = int(rpdat.rp_shadowmap_cascade) > 2048 or int(rpdat.rp_shadowmap_cube) > 2048 colatlas.prop(rpdat, 'rp_shadowmap_atlas_single_map') - # show size for single texture - if rpdat.rp_shadowmap_atlas_single_map: - colatlas_single = colatlas.column() - colatlas_single.prop(rpdat, 'rp_shadowmap_atlas_max_size') - if rpdat.rp_shadowmap_atlas_max_size != '': - atlas_size = int(rpdat.rp_shadowmap_atlas_max_size) - shadowmap_size = int(rpdat.rp_shadowmap_cascade) + if not rpdat.rp_shadowmap_atlas_auto: + # show size for single texture + if rpdat.rp_shadowmap_atlas_single_map: + colatlas_single = colatlas.column() + colatlas_single.prop(rpdat, 'rp_shadowmap_atlas_max_size') + if rpdat.rp_shadowmap_atlas_max_size != '': + atlas_size = int(rpdat.rp_shadowmap_atlas_max_size) + shadowmap_size = int(rpdat.rp_shadowmap_cascade) - if shadowmap_size > 2048: - size_warning = True + if shadowmap_size > 2048: + size_warning = True - point_lights = self.lights_number_atlas(rpdat, atlas_size, shadowmap_size, 'point') - spot_lights = self.lights_number_atlas(rpdat, atlas_size, shadowmap_size, 'spot') - dir_lights = self.lights_number_atlas(rpdat, atlas_size, shadowmap_size, 'sun') + point_lights = self.lights_number_atlas(rpdat, atlas_size, shadowmap_size, 'point') + spot_lights = self.lights_number_atlas(rpdat, atlas_size, shadowmap_size, 'spot') + dir_lights = self.lights_number_atlas(rpdat, atlas_size, shadowmap_size, 'sun') - col = colatlas_single.row() - col.alignment = 'RIGHT' - col.label(text=f'Enough space for { point_lights } point lights or { spot_lights } spot lights or { dir_lights } directional lights.') - else: - # show size for all types - colatlas_mixed = colatlas.column() - colatlas_mixed.prop(rpdat, 'rp_shadowmap_atlas_max_size_spot') + col = colatlas_single.row() + col.alignment = 'RIGHT' + col.label(text=f'Enough space for { point_lights } point lights or { spot_lights } spot lights or { dir_lights } directional lights.') + else: + # show size for all types + colatlas_mixed = colatlas.column() + colatlas_mixed.prop(rpdat, 'rp_shadowmap_atlas_max_size_spot') - if rpdat.rp_shadowmap_atlas_max_size_spot != '': - atlas_size = int(rpdat.rp_shadowmap_atlas_max_size_spot) - shadowmap_size = int(rpdat.rp_shadowmap_cascade) - spot_lights = self.lights_number_atlas(rpdat, atlas_size, shadowmap_size, 'spot') + if rpdat.rp_shadowmap_atlas_max_size_spot != '': + atlas_size = int(rpdat.rp_shadowmap_atlas_max_size_spot) + shadowmap_size = int(rpdat.rp_shadowmap_cascade) + spot_lights = self.lights_number_atlas(rpdat, atlas_size, shadowmap_size, 'spot') - if shadowmap_size > 2048: - size_warning = True + if shadowmap_size > 2048: + size_warning = True - col = colatlas_mixed.row() - col.alignment = 'RIGHT' - col.label(text=f'Enough space for {spot_lights} spot lights.') + col = colatlas_mixed.row() + col.alignment = 'RIGHT' + col.label(text=f'Enough space for {spot_lights} spot lights.') - colatlas_mixed.prop(rpdat, 'rp_shadowmap_atlas_max_size_point') + colatlas_mixed.prop(rpdat, 'rp_shadowmap_atlas_max_size_point') - if rpdat.rp_shadowmap_atlas_max_size_point != '': - atlas_size = int(rpdat.rp_shadowmap_atlas_max_size_point) - shadowmap_size = int(rpdat.rp_shadowmap_cube) - point_lights = self.lights_number_atlas(rpdat, atlas_size, shadowmap_size, 'point') + if rpdat.rp_shadowmap_atlas_max_size_point != '': + atlas_size = int(rpdat.rp_shadowmap_atlas_max_size_point) + shadowmap_size = int(rpdat.rp_shadowmap_cube) + point_lights = self.lights_number_atlas(rpdat, atlas_size, shadowmap_size, 'point') - if shadowmap_size > 2048: - size_warning = True + if shadowmap_size > 2048: + size_warning = True - col = colatlas_mixed.row() - col.alignment = 'RIGHT' - col.label(text=f'Enough space for {point_lights} point lights.') + col = colatlas_mixed.row() + col.alignment = 'RIGHT' + col.label(text=f'Enough space for {point_lights} point lights.') - colatlas_mixed.prop(rpdat, 'rp_shadowmap_atlas_max_size_sun') + colatlas_mixed.prop(rpdat, 'rp_shadowmap_atlas_max_size_sun') - if rpdat.rp_shadowmap_atlas_max_size_sun != '': - atlas_size = int(rpdat.rp_shadowmap_atlas_max_size_sun) - shadowmap_size = int(rpdat.rp_shadowmap_cascade) - dir_lights = self.lights_number_atlas(rpdat, atlas_size, shadowmap_size, 'sun') + if rpdat.rp_shadowmap_atlas_max_size_sun != '': + atlas_size = int(rpdat.rp_shadowmap_atlas_max_size_sun) + shadowmap_size = int(rpdat.rp_shadowmap_cascade) + dir_lights = self.lights_number_atlas(rpdat, atlas_size, shadowmap_size, 'sun') - if shadowmap_size > 2048: - size_warning = True + if shadowmap_size > 2048: + size_warning = True - col = colatlas_mixed.row() - col.alignment = 'RIGHT' - col.label(text=f'Enough space for {dir_lights} directional lights.') + col = colatlas_mixed.row() + col.alignment = 'RIGHT' + col.label(text=f'Enough space for {dir_lights} directional lights.') # show warning when user picks a size higher than 2048 (arbitrary number). if size_warning: From 6aa0f19fb2d4ff6ee4183a309df1b609fd4073f6 Mon Sep 17 00:00:00 2001 From: Onek8 Date: Sat, 16 May 2026 14:48:36 -0700 Subject: [PATCH 4/4] Update --- leenkx/blender/lnx/exporter.py | 31 ++++++++++++++++++++++--------- leenkx/blender/lnx/make.py | 7 +++++-- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/leenkx/blender/lnx/exporter.py b/leenkx/blender/lnx/exporter.py index d497b68..0496f23 100644 --- a/leenkx/blender/lnx/exporter.py +++ b/leenkx/blender/lnx/exporter.py @@ -111,6 +111,15 @@ FCURVE_TARGET_NAMES = { current_output = None +class BuildExportCache: + """Shared cache across all scene exports in a single build. + Created once in make.py, passed to each LeenkxExporter instance.""" + def __init__(self): + self.exported_mesh_files: set = set() + self.exported_action_files: set = set() + self.processed_mesh_names: set = set() + + class LeenkxExporter: """Export to Leenkx format. @@ -131,9 +140,11 @@ class LeenkxExporter: # Class names of referenced traits import_traits: List[str] = [] - def __init__(self, context: bpy.types.Context, filepath: str, scene: bpy.types.Scene = None, depsgraph: bpy.types.Depsgraph = None): + def __init__(self, context: bpy.types.Context, filepath: str, scene: bpy.types.Scene = None, depsgraph: bpy.types.Depsgraph = None, build_cache=None): global current_output + self.build_cache = build_cache or BuildExportCache() + self.filepath = filepath self.scene = context.scene if scene is None else scene self.depsgraph = context.evaluated_depsgraph_get() if depsgraph is None else depsgraph @@ -185,12 +196,12 @@ class LeenkxExporter: LeenkxExporter.preprocess() @classmethod - def export_scene(cls, context: bpy.types.Context, filepath: str, scene: bpy.types.Scene = None, depsgraph: bpy.types.Depsgraph = None) -> None: + def export_scene(cls, context: bpy.types.Context, filepath: str, scene: bpy.types.Scene = None, depsgraph: bpy.types.Depsgraph = None, build_cache=None) -> None: """Exports the given scene to the given file path. This is the function that is called in make.py and the entry point of the exporter.""" with lnx.profiler.Profile('profile_exporter.prof', lnx.utils.get_pref_or_default('profile_exporter', False)): - cls(context, filepath, scene, depsgraph).execute() + cls(context, filepath, scene, depsgraph, build_cache).execute() @classmethod def preprocess(cls): @@ -473,7 +484,6 @@ class LeenkxExporter: if btype is not NodeType.MESH and LeenkxExporter.option_mesh_only: return - is_local_to_linked_scene = bobject.name in self.scene.objects and bobject.name not in self.scene.collection.children and self.scene.library if bobject.type == 'CAMERA' and bobject.library: struct_name = bobject.name + '_' + (os.path.basename(self.scene.library.filepath) if self.scene.library else self.scene.name) else: @@ -1149,8 +1159,9 @@ class LeenkxExporter: self.export_particle_system_ref(bobject.particle_systems[i], out_object) aabb = bobject.data.lnx_aabb - if aabb[0] == 0 and aabb[1] == 0 and aabb[2] == 0: + if oid not in self.build_cache.processed_mesh_names or (aabb[0] == 0 and aabb[1] == 0 and aabb[2] == 0): self.calc_aabb(bobject) + self.build_cache.processed_mesh_names.add(oid) out_object['dimensions'] = [aabb[0], aabb[1], aabb[2]] # shapeKeys = LeenkxExporter.get_shape_keys(objref) @@ -1295,7 +1306,7 @@ class LeenkxExporter: skelobj.animation_data.action = action fp = self.get_meshes_file_path('action_' + armatureid + '_' + aname, compressed=LeenkxExporter.compress_enabled) assets.add(fp) - if not bdata.lnx_cached or not os.path.exists(fp): + if (not bdata.lnx_cached or not os.path.exists(fp)) and fp not in self.build_cache.exported_action_files: # Store action to use it after autobake was handled original_action = action @@ -1357,6 +1368,7 @@ class LeenkxExporter: # Save action separately action_obj = {'name': aname, 'objects': bones} lnx.utils.write_lnx(fp, action_obj) + self.build_cache.exported_action_files.add(fp) # Use relative bone constraints out_object['relative_bone_constraints'] = bdata.lnx_relative_bone_constraints @@ -1696,6 +1708,7 @@ class LeenkxExporter: mesh_obj = {'mesh_datas': [out_mesh]} lnx.utils.write_lnx(fp, mesh_obj) bobject.data.lnx_cached = True + self.build_cache.exported_mesh_files.add(fp) @staticmethod def calc_aabb(bobject): @@ -2057,7 +2070,7 @@ class LeenkxExporter: fp = self.get_meshes_file_path('mesh_' + oid, compressed=LeenkxExporter.compress_enabled) assets.add(fp) # No export necessary - if bobject.data.lnx_cached and os.path.exists(fp): + if bobject.data.lnx_cached and os.path.exists(fp) or fp in self.build_cache.exported_mesh_files: return # Mesh users have different modifier stack @@ -2227,6 +2240,7 @@ class LeenkxExporter: inner_angle = math.atan(math.tan(half_angle) * (1.0 - blend)) out_light['spot_size'] = outer_cos out_light['spot_blend'] = max(0.0001, math.cos(inner_angle) - outer_cos) + out_light['fov'] = light_ref.spot_size if light_ref.shadow_soft_size > 0.0: out_light['light_size'] = light_ref.shadow_soft_size * 10 elif objtype == 'AREA': @@ -2282,7 +2296,6 @@ class LeenkxExporter: # outside the collection, then instantiate the full object # child tree if the collection gets spawned as a whole if bobject.parent is None or bobject.parent.name not in collection.objects: - is_local_to_linked_scene = bobject.name in self.scene.objects and bobject.name not in self.scene.collection.children and self.scene.library if bobject.type == 'CAMERA': asset_name = bobject.name + '_' + (os.path.basename(self.scene.library.filepath) if self.scene.library else self.scene.name) else: @@ -2925,7 +2938,7 @@ class LeenkxExporter: if collection.name.startswith(('RigidBodyWorld', 'Trait|')): continue - if self.scene.user_of_id(collection) or collection.library and not self.scene.library or collection in self.referenced_collections: + if self.scene.user_of_id(collection) or collection in self.referenced_collections: if collection not in self.inlined_collections: self.export_collection(collection) diff --git a/leenkx/blender/lnx/make.py b/leenkx/blender/lnx/make.py index 99d220e..6a7d6c6 100644 --- a/leenkx/blender/lnx/make.py +++ b/leenkx/blender/lnx/make.py @@ -19,6 +19,7 @@ import webbrowser import bpy from lnx import assets +from lnx.exporter import BuildExportCache from lnx.exporter import LeenkxExporter import lnx.lib.make_datas import lnx.lib.server @@ -265,19 +266,21 @@ def export_data_impl(fp, sdk_path): continue for o in scene.collection.all_objects: if o.type in ('MESH', 'EMPTY'): - if o.name not in export_coll_names: + if o.name not in export_coll_names or o.library: export_coll.objects.link(o) export_coll_names.add(o.name) depsgraph = bpy.context.evaluated_depsgraph_get() bpy.data.collections.remove(export_coll) # Destroy the "zoo" collection + build_cache = BuildExportCache() + for scene in bpy.data.scenes: if scene.lnx_export: # Reset shader comparison arrays to prevent cross-scene shader merging assets.reset_shader_cons() ext = '.lz4' if LeenkxExporter.compress_enabled else '.lnx' asset_path = build_dir + '/compiled/Assets/' + lnx.utils.safestr(scene.name + "_" + os.path.basename(scene.library.filepath).replace(".blend", "") if scene.library else scene.name) + ext - LeenkxExporter.export_scene(bpy.context, asset_path, scene=scene, depsgraph=depsgraph) + LeenkxExporter.export_scene(bpy.context, asset_path, scene=scene, depsgraph=depsgraph, build_cache=build_cache) if LeenkxExporter.export_physics: physics_found = True if LeenkxExporter.export_navigation: