From c945817dcfb3bcba6e3d5fdff7d3cee5160e0efa Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Sat, 18 Jul 2026 20:39:14 -0700
Subject: [PATCH] feat: realistic clouds and fix frozen distant birds

Rewrite cloud shader with domain-warped FBM, cirrus layer, self-shadowing
and forward scattering. Detect flight-path doodads from bone translation
range so unclassified birds get sky-bird treatment, exempt them from the
LOD3 bone freeze, and raise their render cap from 140 to 320 units.
---
 assets/shaders/clouds.frag.glsl        |  82 +++++++++++++++----------
 assets/shaders/clouds.frag.spv         | Bin 8476 -> 15196 bytes
 assets/shaders/lens_flare.frag.glsl    |   8 ++-
 assets/shaders/lens_flare.frag.spv     | Bin 1768 -> 1240 bytes
 include/rendering/render_constants.hpp |   9 +--
 src/rendering/m2_renderer.cpp          |  33 +++++++++-
 src/rendering/m2_renderer_render.cpp   |   4 +-
 7 files changed, 94 insertions(+), 42 deletions(-)

diff --git a/assets/shaders/clouds.frag.glsl b/assets/shaders/clouds.frag.glsl
index 1e443a2f..964578ab 100644
--- a/assets/shaders/clouds.frag.glsl
+++ b/assets/shaders/clouds.frag.glsl
@@ -35,9 +35,11 @@ float gradientNoise(vec2 p) {
 float fbm(vec2 p) {
     float val = 0.0;
     float amp = 0.5;
-    for (int i = 0; i < 6; i++) {
+    // Rotate between octaves so ridge artifacts don't align to the axes
+    const mat2 rot = mat2(0.8, 0.6, -0.6, 0.8);
+    for (int i = 0; i < 5; i++) {
         val += amp * gradientNoise(p);
-        p *= 2.0;
+        p = rot * p * 2.02;
         amp *= 0.5;
     }
     return val;
@@ -48,56 +50,68 @@ void main() {
     float altitude = dir.z;
     if (altitude < 0.0) discard;
 
-    vec3 sunDir = push.sunDirDensity.xyz;
+    vec3 sunDir = normalize(push.sunDirDensity.xyz);
     float density = push.sunDirDensity.w;
     float windOffset = push.windAndLight.x;
     float sunIntensity = push.windAndLight.y;
     float ambient = push.windAndLight.z;
 
-    vec2 uv = dir.xy / (altitude + 0.001);
-    uv += windOffset;
+    // Project the view ray onto a flat cloud layer. The +0.08 bias tempers the
+    // extreme UV stretching right at the horizon.
+    vec2 uv = dir.xy / (altitude + 0.08);
+    vec2 wind = vec2(windOffset, windOffset * 0.6);
 
-    // --- 6-octave FBM for cloud shape ---
-    float cloud1 = fbm(uv * 0.8);
-    float cloud2 = fbm(uv * 1.6 + 5.0);
-    float cloud = cloud1 * 0.7 + cloud2 * 0.3;
+    // --- Cumulus layer: domain-warped FBM for billowy, irregular shapes ---
+    vec2 p = uv * 0.8 + wind;
+    vec2 q = vec2(fbm(p), fbm(p + vec2(5.2, 1.3)));
+    float shape = fbm(p + q * 1.4);
 
-    // Coverage control: base coverage with detail erosion
-    float baseCoverage = smoothstep(0.30, 0.55, cloud);
-    float detailErosion = gradientNoise(uv * 4.0);
-    cloud = baseCoverage * smoothstep(0.2, 0.5, detailErosion);
-    cloud *= density;
+    // Coverage: density opens the threshold; erosion breaks up the edges
+    float coverage = smoothstep(0.42 - density * 0.22, 0.74 - density * 0.10, shape);
+    float erosion = fbm(uv * 3.1 + wind * 1.6 + q);
+    float cumulus = coverage * smoothstep(0.22, 0.55, erosion + coverage * 0.4);
+
+    // --- Cirrus layer: thin, stretched, faster-drifting streaks ---
+    vec2 cuv = vec2(uv.x * 0.32, uv.y * 1.5) + wind * 1.8 + vec2(3.7, 9.1);
+    float cirrus = fbm(cuv) * fbm(cuv * 2.3 + 4.0);
+    cirrus = smoothstep(0.16, 0.5, cirrus) * 0.30 * (0.35 + 0.65 * density);
+
+    float cloud = clamp(cumulus + cirrus * (1.0 - cumulus), 0.0, 1.0);
+
+    // Overall visibility still follows DBC density (0 = clear sky)
+    cloud *= clamp(density * 1.6, 0.0, 1.0);
 
     // Horizon fade
-    float horizonFade = smoothstep(0.0, 0.15, altitude);
-    cloud *= horizonFade;
-
+    cloud *= smoothstep(0.0, 0.15, altitude);
     if (cloud < 0.01) discard;
 
-    // --- Sun lighting on clouds ---
-    // Sun dot product for view-relative brightness
-    float sunDot = max(dot(vec3(0.0, 0.0, 1.0), sunDir), 0.0);
+    // --- Lighting ---
+    float sunUp = clamp(sunDir.z, 0.0, 1.0);      // day factor
+    float sunView = max(dot(dir, sunDir), 0.0);   // view alignment with the sun
 
-    // Self-shadowing: sample noise offset toward sun direction, darken if occluded
-    float lightSample = fbm((uv + sunDir.xy * 0.05) * 0.8);
-    float shadow = smoothstep(0.3, 0.7, lightSample);
+    // Self-shadowing: re-sample the shape a step toward the sun; if the cloud
+    // is denser upstream, this point sits in its own shadow.
+    float towardSun = fbm(p + q * 1.4 + sunDir.xy * 0.35);
+    float shadow = clamp(1.0 - (towardSun - shape) * 2.2, 0.35, 1.0);
+
+    // Thick cores read darker — sunlight doesn't penetrate deep cloud
+    float coreDarken = mix(1.0, 0.55, cumulus * cumulus);
 
-    // Base lit color: mix dark (shadow) and bright (sunlit) based on shadow and sun
     vec3 baseColor = push.cloudColor.rgb;
-    vec3 shadowColor = baseColor * (ambient * 0.8);
-    vec3 litColor = baseColor * (ambient + sunIntensity * 0.6);
-    vec3 cloudRgb = mix(shadowColor, litColor, shadow * sunDot);
+    vec3 shadowColor = baseColor * ambient * 0.75;
+    vec3 litColor = baseColor * (ambient + sunIntensity * 0.85 * sunUp);
+    vec3 cloudRgb = mix(shadowColor, litColor, shadow) * coreDarken;
 
-    // Add ambient fill so clouds aren't too dark
-    cloudRgb = mix(baseColor * ambient, cloudRgb, 0.7 + 0.3 * sunIntensity);
+    // Forward scattering: thin cloud near the sun glows warm
+    float scatter = pow(sunView, 6.0) * sunIntensity * sunUp;
+    cloudRgb += vec3(1.0, 0.92, 0.82) * (1.0 - cumulus) * scatter * 0.9;
 
-    // --- Silver lining effect at cloud edges ---
-    float edgeLight = smoothstep(0.0, 0.3, cloud) * (1.0 - smoothstep(0.3, 0.8, cloud));
-    cloudRgb += vec3(1.0, 0.95, 0.9) * edgeLight * sunDot * sunIntensity * 0.4;
+    // Silver lining on sunlit cloud edges
+    float edge = smoothstep(0.0, 0.35, cloud) * (1.0 - smoothstep(0.35, 0.85, cloud));
+    cloudRgb += vec3(1.0, 0.95, 0.88) * edge * scatter * 0.6;
 
     // --- Edge softness for alpha ---
-    float edgeSoftness = smoothstep(0.0, 0.3, cloud);
-    float alpha = cloud * edgeSoftness;
+    float alpha = cloud * smoothstep(0.0, 0.25, cloud);
 
     if (alpha < 0.01) discard;
     outColor = vec4(cloudRgb, alpha);
diff --git a/assets/shaders/clouds.frag.spv b/assets/shaders/clouds.frag.spv
index 70b318db25fe1f5010d293d77dcd5466ce533839..89836f399e7b31f900c66c69d3155a8b4c546f94 100644
GIT binary patch
literal 15196
zcmZ9T3%H%*nTD5;IG^fN>ae$<2yuwBM(kiGLxwoE#-SM97~1M3#!PiI34&HTRi;WS
zrD@aB(r8d;jiIPS9m~{IX(^=??J$n*eXo4a>U-^V?JxiPKF{-i|NDIF|KD$AXJyF|
zqnGY<mgp?sS+TR{s808_YG(vU2W(XLIBCj(Q^uY$?bxx~ZNIgGl{!myb!t}bEZtd(
zqvMlDpYSP(>lhC~u7XaS3v?zCiLcM_HMujgbLZl)GrApvIj`6%j9?=g*2i%Y^LnnB
z^Lnk!yBer?KN_nvUXw^`eT=oxTaUTi7;@t^7~{shKQZ~5<d^=>H}=?qI@Pb$G~&^$
zL)`i4tUZ!{h;-4E9ed}jORh#dnttN*U)g+8^6ki(WcTDdbn}x3lJC;Z`+E66H~;&5
zgNyUt`IEc(^a-hZD!G{F1v|Xu;=zt5Hg~MSnoQ%^$M9t>=BIYEzvpL=FVT3{aOPru
zg6E${+{XxSem=vO^O;}B7|B?jcj6+B9|XUQqw8JYo7v=x7EYOvHTf3#rI)PT^LRPA
z8u4hZAVzaX{C%5TOr4n5nZvl8A(!*!5??cEiQQA<56Jc4eKU`vKE1E{$mesE6W_Jv
z*EP)ZU9%e*dhz@P96jG>Vts13lcQLMbN)B^vJ5%rG{381@^`n`b8?OQiBr?U#(SN3
zc#zl{%*B7rSnlyT<CDKiJ~TA9>skJ_#d&XiUnf^1o^#$N9ye}&?>%uL#xM8yZsA9e
zUo+|GUOtliJ139t>6a#7v~XdshLy;Nh6Z~zth$)*>DTGzEA;a97W2LNHzvnZFW-!u
z=c=dQl6+|B_q}}U?)fM6uD1>OrI)Nako#p@ay8=dv@`LzajW&t*_FK0ncm9>$d`M3
zbgzaz$uGU+l3qU8J%4^LpF}=1v`Md~L%aI5d;G`AneQXH{^!USEnJ~@y)Th>I=lDI
zzp#7$p}qY3<QtrQVlTgv{Op(Z=Y1X3y=Si?_jy+*m+Q<U9vT|zop%fQxN)cS@>|Jy
zZ+r9HM(#Z7<TB4a#H`P5-nS1Ddyg()cwd{_x5cvN<GK0le~w_gf!PBc!6tyY_KqER
zj=Z;hrhGZy|AW|9#)JB7UeEBkT%q~CftXV}dokqpN9}!oGege#ZUnO@-O3OjV7$rf
zw{!IMHgn6}#t`$G#_uw-vDg4}_`Lp%;WKP6v8Dwa?_r4V*IA}p<Gl?N_ho(7k(%#o
zm^G^%pkkl(MU2dCA8>xXJkYr49%?#!fqgu>hl%B)dz9Gu)SbbI?lEGy=pHAI&K?)t
z6U1`+(Z%iKPcmFnhcA82XzTqHv1@BTnhK`=Hw<ydxea@o*m>m6Zs$HrZ0+{^ocmnE
z<i6a_eS!FC#%zYy^%^fS#MQsWDnCV0zGoi)4~3dtSwwZWGhPD!ZR1?qUHD^W<6a)d
z^}`J`?uEj+-}S+{2Ri4gjk}hbyw9E?mv>KmgZJ>Y#*=pMHF;|gw^n2C4QpM38-<iR
zX>r}bmu&cQ4R`I-j{=u-1Y3qUc-C(DrrC~j&TQwd2qx~cx&l{pzE#M*{<aL~RO54-
zxmP83esvcy4^(F|v32{oD%jo)^K(<)(|y3y%Ei||szb9PLq7HHODxw99_@Zj>l(;M
zy9Tk`Ab7m3MJ|3kSZZ2_TwGtdf7T_o_Nhg8Ah~$;b8y3|pF_aZ%B9AS5yy{wYCM!!
zuKM|>rqz#pwCfYgRX=^?;`)il4axOVYadOnRxTblCf4KO#p99W;??6(4XYlH22(2+
zkN->@kMgPeSYo;A@e@s}NBL+!Oe|MDZbmL%J&qyQW37D)a<y{tIF?wC_5D79T)cWb
zv0>HYNnmQ_;_*|&@hG3VKTRxGJ)YdOdX$fLYht<Taa(fn>Tx@AJ=WT{Cs!+%J#A-V
zpFdwducJ8bLT;U78Q$Nc8S27MD7@?Dyz-fIfY>>mBj-$PxpO+dbEpfyXXEV=YG-nE
zgtu2ZpS=B5y}k5;)^}cnoC9ZH&RW@*#pi-&U$7siKTqde`>ws#-s=8a`@Ow1_rjmy
zUSz!9G^cTW`>e<82|F`~I?p=`{Pe~FcXr~BnT?w@j2jI%(6||ev$hT4+!LJhyvAiu
z_$;}6_Jl7q9(i|9khcbLYc<ZjcquVccJ~D94*t!Cd*6wtM}G@k&JpYi;^0~H?=(%_
z6Xt@6*FE7%a<A|E>6~ino^Tbp^Q%j*eTLY&>$CT}hSg{9SunM7@%4LRujig1pL(As
zmg@(P_JyW(4dkP}hFES8JpFPWxp;lf=97!-EBDX!#MWN>>L1C)tDjdIR{i`5Os!mM
ze2qAM<WuA8#B$ZopPN=c^3nc;Sg!iHiCnz)l3U32Qft4JT&-L@-cGE?+E?Es7q1@Q
zYFPF7Hkewuczl;Q9_3T_d&F|p<NHmkNBL-fN-S4B-bpTAJ>EsG$6EW{<Z9*O@g8D5
z*7th^f2k0!9+zrZ^*9nttz0}VO&pK%se2h>x$1G*rq!c-wD)msx$5zLF!Abf5xE{~
z?GKQvl}rDAnAqpfSNiWG<ko5b_Wr(=p)ULrg?HVYS3Yz8ir6`wBj-HXa_4k@=TH~^
z*NwMFsGZ5t5q?JD?XT+XrP&kCB%g!cK9;pQ3ru`2c=m)@<mu1Z6V3zMkn^%9oJMXB
zwU_3z=Nru79^^GM|2tsfZ!>bwyi5EdL(ctW72Yf7@|eA2N9IuH{Of_Q-Z<dS4*W5*
zaT^TdHijE$+&YDG@7M^=y~8;-Y+Uw^)yU<ucZ_a4^6uUtZw=zsYMgs^9I@}?G7Reu
zzJ0^JKgF|8>;x|72(}Ax@T}eVrm1_!1TgWscT6Pr`ra4Lsiy87dyqT7y6hdFCARMR
zjDD_R^%?ySFtu{=^?72i=iVWodZ!c1^@B${qiJ0O`DiB*%MF5O@AwCD@%lVYAs5$I
z?w@^$t-bc&v&qG)pK}^k{hSM?RxUMufjEBTQ{xwj<*J|an^r&a(M~0nt9}k37q30%
zAacFb+7BjID;JL+CD!BNTqp0@SIEVy$FDZ5db|)!tz10*7jZnwr|z#2%T<pTH?1D!
zqdk;Zu6jI-T)cWbf?SWa_9MyF%EjYR#Cojn_czGJtH;Y4Rz1!JQ!5vbmlMaMeCob}
zSgv~fcGK!nKH6i5<*LVH$;GS3A#y#|+K(ewE0;chBC*e(uk`7Y$gR^p@BMu+LtXgK
z6y9}nUir*<3bAuKN6wkna_4k@=TH~^UmI_aP;38mgkPud_E+`x((E1UlFvbJAIn;;
z2PQrjJbT9m<mu1ZJ2nKfw`T8Hh1?!$Fa3P`{oC&F50rYA!kqrBS8jv}BlRvjjQ98B
z{?0u7@{Qky)0|7aep36&<WIx-d-Px*Aoh1$t8&aex*D-sxnOG$i@UG6e_h%9c+CE_
zJ=apF#~T<|Hx9V79e=p?ayJg+J`6X|xcP;1|Jnr3{mb)iX<YWNACk*w|GKsD$h-TO
zyfuis_QrW`77|lxcmJ~P;14w1XGA=E)kENNj$n@v2hV!`vT5r6^#quB-M^kB_xirq
z&Z(yEU;j(){OZyRS6iynvF_R@)@WGm6KjI0m5Z+r5_>)OFZtBFHnChkc(m&@t!p43
z?bBRaZV){C*KfhZYfpHNTwGtdf1W3{_PPhG&s^fwPhZ2TpMEg4a;b4Nas0@q#*K*O
zs-KOURzLF5{()=DRX;C*iPygOGPz!A?XQrlm5aw$iS=0bfX$d+ym}ndu<CIOFtu{=
zIF>jb<x}@o#B$Z+)=jHN`DkC~+H%$7U%<qx$2Z9JSZjZiT&-L@zD2CZ`hIW6{NmN)
z4h^dwcLY-_7mqs=$D@4e-i27Mdfc^X^(Y_hJ6v0?dVCK|yn6gAxgKlnwBn9hx$HGd
zf%*LTN^czrW}WUe-rv6e>cTHqc-PH&<um6B#Lnp)IcLRkj`KT*y6`JE-X5WL`2J<D
zbUu0et9pBB_OI*V=fK&=vQ{^MiO&Vk{$)Q-f6o4O3z)q%`&atCy)^Z0z{PWY_a6Vf
z)$51vYrOlBdzt?}>p8h@Ke6Yj%Q|gD{4{!B(QN`I?!Vtgw`tRH=;<~m5#NlFzn_gE
z_I$al!B}GVJpa8n_w`o9YUP5BBNq4HdEN6SvcB#k9<%3-!>>BmWk2x2#sPP><qzL8
zx&4Q6o52k<Zc5?Y^EQQZ&-1*48h0(fr@RPkFLL?pc?UNhs=MdOTZ6c@8s}O21Tm#{
z_dM$keq6(SuEevy{R_C9BiKpA!Ly#9ZkoF1eFjXt?s?P5y}tLWbE>I(-l^oyuP%Gu
z4~eb2_LgfJR(s2jz|_jc*R{l6&pl5*_5PSxt{*(w`AzE@$VdC{#Bzh++4D{(7q5Nf
z403UO<^GvYZ0&X5_zAgq^>b6hs-K&|)XJsCTZ!XGJ~iG(ELZ*9-n9CWk9H=pT=jDn
zxp?iBv&i*QYd?ovtz0~wN36%XZ`?^PUOnE`u<G${Ftu{=cn@(r%BSvoiRG%t`<hmd
z^3i^gSgv~f61jNw_@Cr@thIlIT&-L@ewA2{_5EH%E?zzUqG8qJgJ5dq;_+ePc$81w
zj}XgMkB>I39_6FGh*++A{2IA<_4sviJ=WSUAy+GxetH?P&!4aK@7d(m>7M8PeGWri
z_&J4l-JDlGbAFfDIh`Zt%x$@II=^$M3;+Gb+auHt-}9yv-u|lIUV1_MH=upV=Wwol
zENitNnD|`q>?!+`r$1-UI|$6)nmunKxjocgnz?qtjQ!s4`Q-i>Pb}_tPTVJ+Z0C8*
zKCum)I_G+U@tej0cedsaeagK!j2i<t(75Lc=RUDHoco05z1+C$6Hk%LXP<bb@yNUT
zguFF~>(My(=ljHz+TACtJ2*?+#l08BvnMPGF6Rg~k~nzQZkeX3`^0i!;&q=`k=*Nh
z4>+fqx=*Y`?)>VqPwYi(-Sv5#)Uf(IP6kse7hii5dp-9F`P91)v0OiRv{RbaHIR??
z1H^KJ;MpfuCl{~J-dg11`pW&YHnFwWUON>`y!ttyVb#xpU~1)3<H5x7BcB=%A(pFt
zKH9YUk&pI6#B$ZodgS7@zidFRms)!txmvk++>lt0wbvd7CSE-r(Xi_ANHDc>@pu$*
zJj$o;qlx9J$77mSkMhxOL@ZZ5ZbB|zJ#I>_$6EVl<Z9*OaSX8@>-#+fCSE-r->~ZO
z1TeL7@pvL}Jj$o;lZfT2$4@q`9_6Fml31>K+=^VhdfbLwkG1w~$<@lGr|&@Q^XDr)
zdq;BXw5NN2_c7Fk|489oH|LeloVyV_r*q_-2`zU{=XVZu;RhOTk5D^&pRiXtpS=B5
zy}dO1#Pjg(6ZWyJm3>)!E_n6{`*Hg7bQZ|IYp=DpW}isEx0mL;-MP5?lGjYldw^M!
ze;*nkux52RXD?zkdops)-o*TLefV9_2Z#qb=A3<qJx^VJuQ-uw`uD2LF_oB~?i_M`
zB$LTA$NuEbqb}zhK+I3~9Ov>Jb>R;r=7;Zb(t8L7IMz822D4Uwub6WVA?Bxhj{Lx|
zb3O*<yy|k!VZ{6_UNeq<|JCmUruHMqJx^V}k9icaxZjQS`<TaY^yT+4<&I{Ex$hb0
z`<P<6Cx?jd<D3zU)N&jcKi&G}2Z;5YJ?KO*zr*NxEAXv1mb!Bi7(bm&8S(=h^S#GY
z$kjT0smr}MjYQt}I{oET;&;)=`8i`6_p}~7=5xkYTvVN2W`O@&<E&*Ye|XQyojHu#
z5^kVzXB6%{ur1*HoZ)%18h0(vf`1=9ja)vTGtOx|RCm4QtwG#cjnm&QCT7a+=M3u(
zeo4daW#Ycqeuwaz;Bt;&vx$Re?XGB=`Z;3`n0Wo1F_+xy+asJ)P5qqlJ#yz)m-qN7
zV(YH`{ON|(e*O%YTDkc89kJK*bB28CeU@0RA3WOUn$|UtkM;+|a)aRcoN+a|`0-$=
za~`?4zH<NknAqCuUi}Ah@#^QLhE+d*1XC-Q8ebufANkbyCt|tk=hddwk9@S(5zAFS
zH;{|#CmwGk*GsMaCUUiM@pucd9uF^T@fULO>hX<+RgZ6isg;Yzw}|6WK6SrMELT0g
z)3kb&kM=fVx$5x_a`EbM0l6M)?RS!^m5ax_i1k?C@4u3ZSC32Z?1)v5Bf!+k#p6=M
z@hG3VM-t0bkE5DakMhy}j5*~7%X@Y&n0WR0b8<b_+V3Y<E0_NJ3u2!?U+KROl3S;r
z3B12=VyFxMSm9ka=atW#j}tqmbL5;STJD_A?;PsF|Elr!2(`mMXPi-Z`>T3;=>@H4
zO(*wrhJ7q+H3Lk1E_n8_Gs)AR^EqP{n7uWhGp3Q-L+zzL7f_wkG2`_%W@P{0gIGKs
z&LGya9_0K#B9n>3f4=eV<!aq?<a@P|_qUOA&LZch`(CK^ce`gY2B_<9@>#@padhAC
zd;beKo&zSH|IctPv6#b`2lrdoX&%S(0o3^a1%iE<T-^WHlKL(p_WvGS$T9U@Ow3Q$
zv%GtEo#*T1&aG}LE9vzvBX%t^oJ)K*7(ZRFUf*-orl!k@)wm|v_vaAv)BV4Feg<$a
zO1<ADm$&9%-y;{d&dhr?@l^~zmj(L~vAFtR*Ak1*W7s3Cc|Ngq$z@G$Am*p{S<3g>
z&q?8LEWDiSDW7}oCSu=fb*cMiV&|1hJ$De_#*hoPfLOfNeJ8oN|34#j-$icia;fV+
zVt#sc-$P<usp01>SC`L#3yH-)&hRtf0~~$%8BlH!L(J#NIG+K<(k~t*wjN)>9&4Cz
iuwORJdv_|IR2Fc29L)38%UjEC)bS8Ux%Y6i6XS2?a)ikM

literal 8476
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
MgPouINbElPA5tzsDF6Tf

diff --git a/assets/shaders/lens_flare.frag.glsl b/assets/shaders/lens_flare.frag.glsl
index 98b99b5c..4af7cdb1 100644
--- a/assets/shaders/lens_flare.frag.glsl
+++ b/assets/shaders/lens_flare.frag.glsl
@@ -16,7 +16,11 @@ void main() {
     float dist = length(center);
     float alpha = smoothstep(0.5, 0.0, dist);
     float glow = exp(-dist * dist * 8.0) * 0.5;
-    alpha = max(alpha, glow) * push.color.w;
-    if (alpha < 0.01) discard;
+    // Fade to zero before the quad boundary — the glow term alone stays
+    // visibly nonzero at dist 0.5, which draws the billboard as a bright
+    // square behind the sun.
+    float edgeFade = 1.0 - smoothstep(0.30, 0.48, dist);
+    alpha = max(alpha, glow) * edgeFade * push.color.w;
+    if (alpha < 0.004) discard;
     outColor = vec4(push.color.rgb, alpha);
 }
diff --git a/assets/shaders/lens_flare.frag.spv b/assets/shaders/lens_flare.frag.spv
index 1b19ee3aab62cf4bf1ccfff92a38014af143e19e..b3e16db22147919651af6247149f21352de02966 100644
GIT binary patch
literal 1240
zcmZva%T82L5JeA-Jd|!h5lIyAN)t7L?SqGehSuvNjnE_-zkq~^17)CdO^9R1_$7}0
zC!;ZvxK`g&#DOQ-sj6Lds`j~c2W!odlm^mRYNWkXoeQZ3li-H?w%dE%YrX$)&{|o&
zXT|w6*e|qZJdLC?Sn+oM%{vogpac`t$ul5z@#N=#XFCn0R^_H<w!zs~ZWIJp%Ut~*
zP8HTofG)G_XPvX0AG0Q5<*!rY9sSFA!`K2$Q?Ev2a|Q7^tUBb|Iaa^iBC)j%z<Ct$
zR284*XREl3{Cq$DbXu?WugAxo$S)9o`TnD$o;&!?@cYf-`L@s~Z(f~uv1fsKbsD=Q
zxhdlN*aC!Z;|IX+V15}}0FOG1SAco@uVU@x%+R@ke|YhzeTlEt#<%V<);sD_hj9s_
z&r^K+m|tS|zNH5m8EbHUd*AEv-Y=LT>=vx`?%o|7<@@8Avrip`YMcZE;0dVmqkVol
z^S<Ai?#kMa^!DDB9Dk;_@yvfX|0j9(8uPB<JMStmANLD<bIz*sC)@J|uvQIC;J(%1
zd(7Vi^T4_~FP6IvymJfqh62QlC4BSVE2(x@Yry@xWB2H{v(H0dF7B@5dtd$=^WEbn
zkaxd7*+2*D`ArXVTR_ge=>I{PzFbKUcl->*d}q7w=b3+%-?^PRObYHr=6q{#JDKyp
Zc**y$*DmnB_2$*vL2HRMcY>yM@E2YvJAD8E

literal 1768
zcmYk6+fGwa5QdkW<&2y>Vi6S)#S<vXu@F-)NI;F=Hce?{CzUp|X!OPl<2!lnOZX@n
zqlw?Q*(-FBVP^jM*UYTh1MO`y-65O_ePJMMhm$iB+CTzWSE>s;uXh$2&HaVNrTa1l
zLwib;GZeZ*2U>YwN)8S5A<M`xJaGzOwUaf3A6)7Py`ivEEbQ(UcAgi@^?I?<{8X(J
ztI1)dxSt$V%FX0MMP5$}FF7n%kM~;%oiJMK>Yt@XxpLU79EH$HO?!FsR=XpNVDBf5
zCMxyE(4}hqpp^ON(eJ9YkEk?$1HE_LIMDCnN8eMgHIimhOW)cBQ`}iJlFxK~%Jsda
zMxE!pD#0hi3D@bBYt<Sprgdh~^{h@Oh_kC5H@7oNDA2p_m_j@+vOL-|{^CT;KE!%j
zF#8beZ^7(AY#1ppC*L5?TGo%XMnT1=(=T|!nZWJ>%OR8S{l5D0a`@I3Q}lb$_NBj)
z`MyVN9^bnI2xmjSJ;j_cKAwh8`BzT-y!EeRo5Nk0!tyQgzPNGo-bA|}#_dCYHp9m8
zZ(-+<*q8ns;;f9{M&}TZed*65#?5~RZGLOUz8_%s{+wAIV>%D9<vl@r$G+@C-<gZ~
zo~LMY#Jtb2%`5*g-`+X<R*#(DAf0G)IeWQr*3QzsZ}r{#R^PqXU*o>oJ@NbOkyU>X
z@%t!WGi(T3p0Rbhu%=kdaSmIopO^TSQN+1!A;!F8U*g`8Gl7Wp^9ub*#5>N=+U|fH
z@A?Mg@$Lm|?|#X0UBniP@k?3!8~vO6G9pJjV(z@SyA}Jsifs?_j7M$`+n9aXk2B06
zvEDScJx2c;ww!(@YW*3+yzZD><9Q<P&|PE}nM2&Km}3FkSnS~*wt2+kOvEDJf7bT!
zoj1FCj}S5E`HP;H(4Ifc%-A9#=00ivr9*A8JUQIM6(sg%9d~jy!*}^^?(SNKiF<sf
zI~)62$F{GR*|*q8WBlSoY!ll&-i=s3!_2kE9Id^Dcz+WyZf<Ac-;=R_WLQT219^#X
A5C8xG

diff --git a/include/rendering/render_constants.hpp b/include/rendering/render_constants.hpp
index b4f5084d..7ebc128e 100644
--- a/include/rendering/render_constants.hpp
+++ b/include/rendering/render_constants.hpp
@@ -20,10 +20,11 @@ constexpr float    M2_MAX_RENDER_DISTANCE_LOW_DENSITY  = 2800.0f;
 constexpr float M2_LOD3_DISTANCE        = 150.0f;  // Beyond this: no bone updates
 constexpr float M2_BONE_SKIP_DIST_FAR   = 100.0f;  // Beyond this: every 4th frame
 constexpr float M2_BONE_SKIP_DIST_MID   = 50.0f;   // Beyond this: every 2nd frame
-// Flying ambient models have obvious, rapid wing motion.  Keep them animated at
-// full rate while visible and finish their distance fade before the generic
-// no-bone LOD, so a bird can never remain on screen in a frozen pose.
-constexpr float M2_SKY_BIRD_MAX_RENDER_DISTANCE = 140.0f;
+// Flying ambient models have obvious, rapid wing motion.  They are exempt from
+// bone frame-skipping and the LOD3 bone freeze (their flight path is baked into
+// bone animation), so they stay fully animated out to this range instead of
+// despawning at the generic no-bone LOD boundary.
+constexpr float M2_SKY_BIRD_MAX_RENDER_DISTANCE = 320.0f;
 
 // ---------------------------------------------------------------------------
 // M2 culling geometry
diff --git a/src/rendering/m2_renderer.cpp b/src/rendering/m2_renderer.cpp
index 23303fcc..4bf93c04 100644
--- a/src/rendering/m2_renderer.cpp
+++ b/src/rendering/m2_renderer.cpp
@@ -1395,7 +1395,38 @@ bool M2Renderer::loadModel(const pipeline::M2Model& model, uint32_t modelId) {
     gpuModel.isBrazierOrFire             = cls.isBrazierOrFire;
     gpuModel.isGroundFire                = cls.isGroundFire;
     gpuModel.isTorch                     = cls.isTorch;
-    gpuModel.isSkyBird                   = cls.isSkyBird;
+    // Data-driven flight-path detection: name tokens miss many flying doodads
+    // (buzzards, swallows, bird swarms, ...). A small mesh whose bone animation
+    // translates it tens of units is a flight-path doodad — it visibly freezes
+    // mid-air whenever distance culling stops its bone updates, so give it the
+    // same treatment as named sky birds.
+    bool flightPathDoodad = cls.isSkyBird;
+    if (!flightPathDoodad && !cls.disableAnimation) {
+        glm::vec3 meshExtent = tightMax - tightMin;
+        const bool smallMesh = meshExtent.x < 6.0f && meshExtent.y < 6.0f &&
+                               meshExtent.z < 6.0f;
+        if (smallMesh) {
+            constexpr float kFlightPathRange = 15.0f;
+            for (const auto& bone : model.bones) {
+                for (const auto& seq : bone.translation.sequences) {
+                    for (const auto& v : seq.vec3Values) {
+                        if (std::abs(v.x) > kFlightPathRange ||
+                            std::abs(v.y) > kFlightPathRange ||
+                            std::abs(v.z) > kFlightPathRange) {
+                            flightPathDoodad = true;
+                            break;
+                        }
+                    }
+                    if (flightPathDoodad) break;
+                }
+                if (flightPathDoodad) break;
+            }
+            if (flightPathDoodad) {
+                LOG_DEBUG("Flight-path doodad detected (unnamed sky bird): ", model.name);
+            }
+        }
+    }
+    gpuModel.isSkyBird                   = flightPathDoodad;
     gpuModel.ambientEmitterType          = cls.ambientEmitterType;
     gpuModel.boundMin = tightMin;
     gpuModel.boundMax = tightMax;
diff --git a/src/rendering/m2_renderer_render.cpp b/src/rendering/m2_renderer_render.cpp
index 379ded66..480112f6 100644
--- a/src/rendering/m2_renderer_render.cpp
+++ b/src/rendering/m2_renderer_render.cpp
@@ -476,8 +476,10 @@ void M2Renderer::update(float deltaTime, const glm::vec3& cameraPos, const glm::
         // LOD 3 skip: models beyond 150 units use the lowest LOD mesh which has
         // no visible skeletal animation.  Keep their last-computed bone matrices
         // (always valid — seeded on spawn) and avoid the expensive per-bone work.
+        // Sky birds are exempt: their flight path is baked into bone animation,
+        // so freezing bones freezes the whole bird mid-air.
         constexpr float kLOD3DistSq = rendering::M2_LOD3_DISTANCE * rendering::M2_LOD3_DISTANCE;
-        if (distSq > kLOD3DistSq) continue;
+        if (distSq > kLOD3DistSq && !instance.cachedIsSkyBird) continue;
 
         // Distance-based frame skipping: update distant bones less frequently
         uint32_t boneInterval = 1;