From e15cfb3e320a0f66f8f2bf458d1d4678a47c13df Mon Sep 17 00:00:00 2001 From: Sameh Khamis Date: Sun, 8 Nov 2026 13:11:25 -0800 Subject: [PATCH] Let shapes choose lit or flat shading, and say how a renderer that cannot drape falls back ShapeItem.lit picks the renderer's fixed light or a flat colour; omitted, extruded shapes and boxes are lit and the rest flat, as they were. The Cesium draw port lights unclamped colour and image fills by it; clamped shapes still drape unlit. A new reference scene, shapes-lit, draws a lit and a flat box and square. LineItem.mode now says a renderer that cannot drape at all draws draped lines and clamped shapes as overlay, and clampState() says overlay. The Cesium port says overlay when its context has no depth textures, which only a WebGL 1 context can lack. --- docs/RENDERER-CONTRACT.md | 8 +++ src/render/cesium/draw.js | 22 +++++--- .../conformance/goldens/visual/manifest.json | 3 +- .../goldens/visual/shapes-lit-tilted.png | Bin 0 -> 14247 bytes src/render/conformance/scenes.js | 47 ++++++++++++++++++ src/render/contract/draw.d.ts | 16 +++++- 6 files changed, 87 insertions(+), 9 deletions(-) create mode 100644 src/render/conformance/goldens/visual/shapes-lit-tilted.png diff --git a/docs/RENDERER-CONTRACT.md b/docs/RENDERER-CONTRACT.md index f95d6fce6..3655a7985 100644 --- a/docs/RENDERER-CONTRACT.md +++ b/docs/RENDERER-CONTRACT.md @@ -48,6 +48,14 @@ optional, so a renderer written before it still conforms: - A line item's `depthFailDash` (`{ length, pattern16? }`) dashes the parts behind the surface in `depthFailColor`, as the Draw tool's rubber band is. A renderer that predates it draws those parts solid. +- A shape's `lit` chooses shading by the renderer's fixed light (true) or a + flat colour (false); omitted, extruded shapes and boxes are lit and the + rest flat, as before. The Cesium port lights unclamped shapes only + (clamped ones drape unlit). The `shapes-lit` scene draws both. +- `SetSpec.drawOrder` stacks sets drawn over depth: a higher one draws over + a lower one and is picked first; equal ones keep the order they were + made in. The Cesium port stacks opaque icons and points by it; + translucent ones blend order-independently there. - A rectangle shape's `rotation` (radians counter-clockwise) turns it about its centre in longitude and latitude, as a KML ground overlay turns, and its image fill turns with it. The Cesium port drapes image fills too, each diff --git a/src/render/cesium/draw.js b/src/render/cesium/draw.js index 82207172a..210db8ec4 100644 --- a/src/render/cesium/draw.js +++ b/src/render/cesium/draw.js @@ -3155,6 +3155,8 @@ export function createCesiumDraw({ const id = pickId(record, item); const solid = item.extrudeHeight !== undefined || item.geometry.kind === 'box'; + // `lit`: shaded by Cesium's light, or flat; by default solids are lit. + const lit = item.lit ?? solid; if (imageFill && !item.outlineOnly) { const material = ownMaterial( Cesium.Material.fromType('Image', { @@ -3175,8 +3177,7 @@ export function createCesiumDraw({ Cesium.MaterialAppearance.MaterialSupport.TEXTURED, translucent: true, closed: solid, - flat: !solid, - faceForward: !solid, + flat: !lit, }), asynchronous: false, }), @@ -3196,8 +3197,10 @@ export function createCesiumDraw({ appearance: new Cesium.PerInstanceColorAppearance({ translucent: color.alpha < 1, closed: solid, - // Flat shapes unlit: lit, their two triangles shade apart. - flat: !solid, + // Flat shapes unlit by default: lit, their faces shade by + // the light (a lit box's sides differ, an unlit one's match). + flat: !lit, + faceForward: !solid, }), asynchronous: false, }), @@ -3299,10 +3302,17 @@ export function createCesiumDraw({ /** * The Cesium port draws clamped items where it is given them; it does not * drape them onto 3D tiles yet, so over shown tiles it is `overlay`. - * Terrain and the ellipsoid always take draped items. + * Terrain and the ellipsoid take draped items wherever Cesium drapes at + * all: its draped lines and image fills need depth textures, which every + * WebGL 2 context has; without them it says `overlay`. (It still builds + * them as ground primitives there: the overlay drawing itself is not + * built, since only a WebGL 1 context without the extension lacks them.) */ const clampState = () => - tilesets().some((tileset) => tileset.show) ? 'overlay' : 'draped'; + scene.frameState?.context?.depthTexture === false || + tilesets().some((tileset) => tileset.show) + ? 'overlay' + : 'draped'; const clampListeners = listenerList(report); // The state last told, while anyone listens; measured after each drawn // frame, when what the base holds can have changed. diff --git a/src/render/conformance/goldens/visual/manifest.json b/src/render/conformance/goldens/visual/manifest.json index 0adb87527..c5827f8cc 100644 --- a/src/render/conformance/goldens/visual/manifest.json +++ b/src/render/conformance/goldens/visual/manifest.json @@ -15,6 +15,7 @@ "models-oblique.png", "city-orbit.png", "city-city.png", - "city-street.png" + "city-street.png", + "shapes-lit-tilted.png" ] } diff --git a/src/render/conformance/goldens/visual/shapes-lit-tilted.png b/src/render/conformance/goldens/visual/shapes-lit-tilted.png new file mode 100644 index 0000000000000000000000000000000000000000..d4a634122d3ee06336e93c5f13dd02cf4874cf16 GIT binary patch literal 14247 zcmZ|0c|6oz_&3fZYej@s%964#At6%8F8fXjAtrmquGDQ$j5UJ_G0e!$SWDdYoh&o5 z?_(Wn_?;Q<-}Cyup6~PL%sJ=Uuj`!izRo99TT}Tg?PXdrGP1KOk00rfkwF5<$jDz% zL%=_ewXu|BWDH~~j~?i~CSOXW`|y0wc&ygV2UfzDZ^7qHh!}iR%sj zORCj3?_Jb|Z+sVta>)&3z$J1i>RjOZ%By(&-;6L0l_z?ckHc0Uw|KLX^FF2&(2TIj zXD{S#cStJ|>lHhw+zpt;;pbCRhm!EiP1Sw@hGU!ZDJy<&1IZ|^ zlaW))TeVOyK6~@uj|GZcfj>EuGw&Ek<3SN*kdC|B3S~%pFc2xV5>Yu!aS;q_ zlR>D<$ztVMNrcj26b!EjGoQ{sOeYP~Dv*)0KIfRDB#EdOP6j~@_==fO%M*wFf~c?m zfoM>g2N8u1T40c`>rZl2q6KWgFs%fP!mNNMLz<+3_F2H@@rDY| z(neiJlz7V-TGE=F*8`ZT|qp&cAl1 zJ9g8}z`$9r!%LS)dR<5)g9xrpb%~Q4oM;K;@SiOm=6pudkyaCU$v1e8jWoB72N)!6 zqvhL)irj#$ny`xdd6E({(SS>>l+7cCZxZB6^g$ni*SM2zRnm~SZYTmj4El;*KJjoU z@GzqWi}|r%c5eWg>;x~-9P58;Xzu*0=9>|Cl0tR9fYOFYbOeONM^(wH4I(%+H!nyM zO5REdI3}Xb&Ga}#C4h{LyR$kcmcug2*I~GSxt#nI0Y9I;HC|Q|fsv+Pd`AXhd&kmr zV!1{TEzvYw2{}X!fZSF_z#c}{SC0dn;o>Pkobn$t2&DgJ-P{ebpeI0!C*NGo9ZT|u zgXa35aEgED83N@?XoO+Z5g?nQRiidY89)YMeLzNTNg<<2)R`Csht^>)LBPV%z8iZ}DxaB4bs1?A3a>~FpS2b=vJkH~FKxsOO4|bBr zGcPx(Uw7P$8z-fzycD41+QwA?bzE@Efs)=G^&XC#Q1&Qi?Z|pOUgf{yWg$x}B;TIF-2C z5L6db*K;vFQbOH22eyb$73n<3@}*mUQLbZ7dG+qN_WS~D!bRvek29H9$tpIGPXcx_ z$nbwFN8cu=Pa+#wR}8q?$IRS6F$_6yF_}^c5|mQnKUpeZ--?yk4n8jBQ$XNz!O(tE zmXcGe0|z4{T<|9jW+12Fr=~d8jSNx*WU_mZ>T|5zGzgWJBWg0Roe>uc^8r2vQx!tT zVV4Y4-P{y=eO$y2_`zi3o>?48CT(M2(n8(NI$|7v?9Ee-4z!a!HOfvBkQWGO=sJ9f zSmDX3+mh>Eo|akcb_+PsE&^zGDQLFzn35A<>bcRGdYr94fHEOGX&J|x(h`_C^c}sG zdb|aPfnA9Ch}>$2v{LvASSc}D;Ycb!Ag|s9g3@|yleR!$1afz0njlpst5r~2mzQ6&qS2O-}3tUZ+|yIu;}7rFOjko#0rLMNrD7nJYp zpGlbGL@uHEBnhMNWn;X2G91eTwx`ZSY0@wmMF*$$ZSpip*nh)fplH}pAV!WIP(pM- zo7}16je!F&R!ly-2O%X79Pr^2>+ff~^@UgyweJ9nzYtRhAn{3O1a{)iN_t=b1O&rj zk3kT-7|bypTU-_-$F^=8*^T4z4XcKSfD=7PdM^K!RrN_pipsg zoI7!FL>ee#a=Iw$|LPVBgo^poiR&klyatwCTc2|H&&5kXX`DFkIa0v|RS@joZ0u?% z3ZOIb5O$yqq|q+Fdy!%wdxv}CSU(2`^Y@!bV7`yuBf#R>Iaz+|kQANWq3{O+c( zA%qRK`AORq5{)bTyc1M*Rrl|}ey#R;cb6aFU;?~VGJ~o50)N5Gn6H5H8-IVKkP$XP zRXdZ&F=C1%?{NdO9Dod?Z99L@JmS@VTui&G|5^Xr=MOKKho$Ad*l+<&^np^j9lj!s z0&rd~laRl>-Mo5Fz|3W=pO(j8JpIgLqI^Zb+jgzB3SJ4SL}vbgXYMU7&5*6As4rew zf;i+l@gOFj0f;GRX$?v9Tx&stdCVb?kQc)p%ieCx<@1@A_EHl~^8yIoZTlRzCnh!M ztm4p8Hd0963!RDr>o0-zq8*q0Y8c2fv8==G_ldm!t9jPG6vYj)HQ_Fq6HMvv8E)}` zLOGDcr&xQm6VhtiqxJDmlGSV$*ltej{`xK?;0`A_{h(UZJ9%%Kt_@LOVHr@ zgN!orhhiWDu7eDak9}a+_&891PUOdw4#TaRL5172ec<@+0JoVAAn%5t8s*D}`WUSEByRMnUQy?t<06LHs76C_28 zJSfH<@oZK8(@@#hOAp^i`R#Ol57^aEPCNWJMk`<}MyqCjZp{Dr+B1=JV^tq1=xpsB zuzh{^`w!a(+h6ky__p(W3973Cx&NheE~K;S=+C+rwrr<E7&BDMZL zVB_D~oyITh{=F01_ltL8-m|jDJ2I(Vs8={+2wg>be({qwcPu%u$*Hv^AnPvO!G*zH z(m}Y>g1m};s)Mig+#Ojl{u|}PIu@`p(dm!fsNFxb3phH}dH6S0xpqJ3SM6He_Z4re zH4RCa1z)XdSxJLKeHBh9_HX8|218u?XRP?IHVqeo4T5r(GvA)UejxiUh2~+P{FJ~r-YF_-0A98yvs!*BV%A13`f9he{1dLRN7IC zjnsv-)@H3-jsP2t_EGR8i;x*j5Z_fTMW06_&xWqTMtSs}ZjeXlw zr_&3*Zi|D%Qk-<>TJ8msib#+Y=XI~Pp?_|Qe)7VVUYrQYe5hY_ChO?yNFFNe$H8S8 zbUwH2{!IhjZzA8-+r;~QGTaE|hPx;QoPN2NG#*PR%`emaHU81A&Q{_l*K3{Hvw2U> z6Za6oC{Syd<&t!o2x|JlNeT5HDM|VegL3ECF65LkTJqhC3H6`6Z)!V@ar)13?R|?l zry&zQ{X5B}xI$%T6A1}Yl}VHaHKvPLr>y`HQ!>Tpy3q^NTqw>qK*>)h)j7SBtPt1yL z56znU9szrn$pUM3E(n>DS-F|TZ+tnvwqzzRPSOzS+mezqSUsZ7jqT6MM~yg$>F4ET z-#a{ow!BjsLoEYSs~Gzs(UUGk17WyDWzRdE`yUnnDm2oYmZkrSI;B3>4Xzusccq$2 z=x+2m;5exGMq7r+*Z$lQ?}SMo;%o)P(Iq8)dFq3Te1k0*J`Gc2!>{WoUe$p9Te3oZ z5#T0yi;^5h9`ybE<3`U+TC-b;iu*H}JSFv2>Yv>mEBwT$fOp?_wDc{iwL4wWgWkkW zic*HKL-&J(sxEYDr})+9zcCvJ({tvmu&3jZK_Of8puaN3!bh4-~Op zMLJ0+Wr4?K7AkG6$$Z8FDyxR?5YJat4yA1!Y7sHTQHuU0+AVEspf`il~s7E zTQmm6!&~vD3Hfa!XU0yO+rHeq2KmJ)AKj>W{nBFp%%*iA+F1K-`O;O_iWanMenLrl zm~uPI1(6#Dn52NjcXriDUMYw^Rg~S}OZ#>%Y^G9fSL;R8IR7b&wM|3B7EgVS6D&`~c(o#0{ofRTvr8N8M@d8~pR0y5_g(Wn~P)o#Sd}Mm|vNAnP7NCSQR&tSW^n_n+G$LlY9J z0n8;_C4c~TkpC%P{>v1@$I!$9ITRnZH{H9;#uJ0JLu7<)l`@(K( zwzfy=y^HsoHW$!c9DOi9TsMIK>geRNy61XypD*o~h;XJJ@qBVOsDZ9V@bMqisY9wL zhfuT(9~0bN$e22T|2MaXZce=B0yI(Q9#VZ9KE3(-W3}&1^9YxvmotA7_fcP6i`cdW z(YsJGOZm!y5oaj|_r$^l<(8w+u4<9BV~7OYUOZ`84{2u>JLy7&?zYzWEIx%|3%foS z4@45w4UJPY}Ad?Z$K4B@-~vxMDu z{|9~bvvI%ZK756UF*I{J3_$uUEeX1Jx>bk6s>` zYdT&NO3WZXy-QB2t@{M~gBpF*(JG%0-rAdqc{rli+ z4(BYu=IT(?T$p>g!&F#5s|t&ayzN4@ABSq{-SdfsBSLIiN9)sgJIe)s{PgDTv-yOm zY)dIP@3bstW+fP}wq42hI@u z)U5yQ@12i9dme4lVY6$0%dQ7gEVXv1dJdW#vQnb4?D&csqdw1GFJhbb=?Cwx&J4#w zzo}Hy*W8oZT$pM^av8T?K$@^DJiuAk@cAc63>hYE1hodE@;KoX$e4@qWb6$h{321{ z2%q&3ux>Ms_ObNvF5hzPrQKk^I)8{O!XB*|dzWEwrHkk@W$b6Xu5Q|ujcv*=W9bKK zwop^Jl#hdBaktjs;%_9}GF89tu>{}Fv$Vx1{I$*UEXsS8&|2eKfVd>or=xG-mELfv zAnBl2PUhRkiy>sQATu|>>0m_|iLUY8?Q&`^5^@h9)RrA}cH@UiHU~~^{a$3`E^m2Z z=_6cmVCCB65z1(3--m_=h=m&HNB{BAwdd_PE6!WEmB*-_;yzM_UhrAW=r7qv^KC;p z?9GVh1afN9?J6vv&+;DTsPYF33;X*yB57v?u*72pc_rP$A(gXxHe4|r%WHJaw$b|A>iTdA~Z$S5u@WB-O!^wKf6e$ z*AN*>HpC@6U{Y4cM0i|MpXP?J0=by1zum*o9kI^JhhZ%wh$=%&`&inCbEk=$@L zXsN-X%)bleNi0|Ly@|T*v3jw*uUC22?m?hWhZxvkFhd&4GP}u}_QMK)+07ANd6~!{=)bag{2p&f_Y>lN! zSIdpepW6}&P){k@RI}IffLA!`i*3LPy3lWp23z?zbtQ5hgG@i~TD`b+uy z?}JA5T**5ZHVSrp&g_wMUe~@4*}y#mJKvdr!#@8(RDe?q6_t5it$JlUvOYM;0_4Pp z>N7KuZ){$cy|B!z4ddU2ySVK)ZkAz7Y}I_0K2}BvxU9Ndpj|AV~>)XpIIHU zz48A|eSGs--4YWmP*&@Ld7!-eyTYxq{t2m}8smQ()P<@~s4vc(m#TmYP4_1kDXUdL z2Tf8VjZBIhW#|WUxTEIfC+zdVFR(#b<||8mpn#Z$7yEBi*^0jemrD zpuP&VxWhEo_jk}2gIHO}fU;d18Z5%uj;PW6=3CaY`C?(|%=KY^PrgCk;V}*yEY}k_V}2a6hcod4-+b=XGbPVs#25049oL-^`=0!!o&&(v@q|(*StZ>C zC)2)y<`(~6E4S6BMwmO9=VD(JC006%KOx;tngQ7GaMk1V!s_1?2Nr&%Irsxp#Qr&$ zBn9+NxMN370)pV_w`LsPCZOdez~qFoC@JnG#HSc7JLu)S+zIEQ!soZbCAbDP{0!A* zOyF~#Ojj)cX5$8sEqamsTCdG}G}qp#%+twI#=j_%FAGW0yax~n^$<|QAVp|7yS;YR z@KAKiA8>Wszd^;fsgwC5Zoj3*ymd)B9ao%lr;I%bMksVL-s8Juw*U`iZgn(3&s%5G z%N8!bcOC1Aeosz3Y+XbEdci|(Yo~7etb6P)sQD9w>FURhuKr*V#cwTNVc%1&L+q#) z3z$0Ejfbw7v{obIUsyt)Fpkp8Qd*c4d5xAiyaXZJK>g||wR$8`xRL<2_;Xs4hg=VZ zb*ZgquzBi?t(=J_ds}cXWvOxD_PMcZ!aNAY1L zk_TR7MrQpONEZ1F!`3?u7DXA(U9b$nf6e8y@DYa)uSr&-6y*zg0EifWWyjtWlge3} z`&kF2@$tj+P-uaPFq9_CuJN#|Y;p^(Opy1=htDi{tYjhaR`y02p4{a#TTauNQHJGy zBk>2e1&njQrVkm*PlWXbL^EbJA#uh^} zKQfG`9*4-~Ahfje!rAR`{l@nOIeE=`u> z3=Y3Kl}HoLt$m9; z;Ta1h`ziWduN%XL2F_kG0s1;f3d2fSjIG_3d7YnCg)^5ej9W#mXpF);MJC)VrF^7U zwz_YX;Rkbw@fQdX9Fp~D+t_}#)P$-@KCY${@AT{ctoY34J94qb-MmsQaZwo&f;ZJ~?I zwcBv%qkcDffVNHEN}ah%G!(-vMgX$5y!_iSi>8}#>>!x@))fnhk0HbvHp-U92{yi- z&ZBslZB{p*RHB#k{Y+}oNa@gXg9?Kitt})mRw9Hodb4fzSS4*kswVrvs%lG{aatc^J9T)~l-pBMvNJ#0U^#3h%1;AZ} zL5BI2rYFY;tv5hum6Q5sHRm6^EPq}vn7_|{_aiJVAaj5B7oOEZrPfu{Z#P12OOT|6u{djf05Sa~_iYoo;Sj5Z_>yIVZrDAVWEJGZT#LDu4N8hE z#1}0JV7}=gyQSlXfEbu$J69n>qwdH^KI-Uf|X{!T92uOkerRL*ol&37cnto8^Ld>B|2WHBk#D%UhPIY5iSq zrvDo{u{7de;WGBVs0$ZfbBdLCnkgXS3*xLMv+%%A!~f7Y+m6;aj|^VB7x1sC1R~&~ z08vII(0@@5lwi%)d&ZFBE}i%XuY`)+zi)O{GlCJ^lF30xothhUb)}HFwEcqy?_Ajp zM8QZ!JR=@)&H!khUM*rWTv0w)@A+agM(b6$I3?^9@E2&ip{9xxJiAgD%`TOl9}_M~ zAxw2s<}XHja@Y~eZ@Dlzh40h*OQ|A3O1?kiR4WWz*3?=!Bb2?^$MYa*3WLC83ZP{f zl1OYb=Y^}#wd ziZB$*Co(MG1>nSQ^WO~YSXf%8t^9A4o5-a_us~u#@192^aS^JP?!PqewEg`Q$m6<1 znhSVW>hf2*3h%>I01j;3L0272Dmd#M=JP%lDDD^I&Z`FePp$)vM9wGX1~&EC35xMh zv=Hv+NdO`+X^@I)H#!(czcfqT{I{=&D5@#5Pv5zZ~7DSMYF^OucQ+ z*rxn&#nwcM62kBsBq8qnlN;w=nEQ+^V8?Qd_J-4>*Kl%o*94C2=f7LN7~L@c=)9;; zf5u(p+P8!+CO?|$*xBOwn~2S`yP!dGKTYL^iOFEqQ-Vi;#`jI}qn!pHf3JD;U$aSk zt>9!S%I`~v6^nZ2kKpN)z7Z#LpMb+KXe?LPpM0a(hSriB+UEh{&cKAd_iAOqd_|XE zc8^}ucLSQXGjmh`sC`?jq`!kd>=-~!^;v;Jlu8h-(ZlMkL2Yv~jopg|xp~#fD9kxZ zf6eh$gV-+x{w$jjogWwo@-bN1G5FOpuJvgLSzEF>HwGQuy%veVp)+mW^50dBb~&NB z#~f#vCD8%RHA!#uO`1zZYv_?6oYb~-mAr0fKLVM4xu~ad&jX3}+g@-SbDPOvmp(jO z>oT!?1e=dZa~NH7ij*E3tehdt#A{S-sup}m%!!E6FBDC*VTQAbqT^GaP4KO>)Y}hU zFsR9o0CAu{w|&>0* zTO#C@{!byzAznpZYLI+BXVZ$^PM-8&?#8?5<{Bj0-)=D%V-}lqS0GV= zz^_-vP+WC2IH%Yu#q3J3lS8)%?jqo(*Iih&oA7n9wPPsRjlW2yd}OWq-dDXRjZJkB zekvpvu{cF25#ft`k6ompv#;-TV;Q1m-^apxioM2l$4+Z(W4u2l&8&L5c>wN}*mu$W zyx(mYvwk(UHtCn>j_r*Bfka;8myaczuL$5}v+wk(#hSu*&dnKIj`zYChxb@2mU;ZK zxMoy&YxWtjK)B1jaK8xAAo z-Co7kR%T@!o>2etdfZZDV|v&xPyH%x5jdt0D$`orTr(>q-CA=^cY^P%kGpCmtvS#t znGqMp4Z7yng)av^FYe8KW#D#{pMQW3<%B~7_If5*EEh`7Ea>~CUcs>y2XOKyau`B| zuUXwFrPzQ?WEvJGq^O3Qj@5{wIKl?l_i{ffj`WmzjBqo*y2^Q)xH-|De?0R#Z<0M( zS`_2(Z%xu^-7oKR4`5y4L5~%vtAAQ^Yxy!k+ZOAi2cNPmebQ;|n6Wf*z+C`$mZecq z_#2PJj$5X2E;J?)SNm+6 zXOd7R3b>2GX+v^#e5ZUgd<1UR3_Y~Wm$K^~id%1KSV#RR-uVp2{v~n6XP^667TM_;FRN>YNYz}9_HwbUuR`|8N^^n@_p*}Xt+?tH>50*tobTvbTMWVyFdqp

B0i$HaRJi#}fwGlz#osT9i+a`DFKvZ>0*1t-{$ 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 literal 0 HcmV?d00001 diff --git a/src/render/conformance/scenes.js b/src/render/conformance/scenes.js index c11353d27..b64877d4d 100644 --- a/src/render/conformance/scenes.js +++ b/src/render/conformance/scenes.js @@ -325,6 +325,53 @@ export const REFERENCE_SCENES = Object.freeze([ { name: 'tilted', view: over(2500, -0.5, 0.3, offset(0, -3600)) }, ], }, + { + // `ShapeItem.lit`: a lit box's faces shade apart, an unlit one's match; + // a flat square lit, beside one drawn flat. Lit, the default renderer + // shades a flat square's two triangles apart (a seam on the diagonal): + // that is its lighting, recorded as it is. + id: 'shapes-lit', + family: 'shapes', + capability: null, + async build(r) { + await bare(r); + const set = r.draw.shapes({ id: 'ref:shapes-lit' }); + const square = (east, north, half) => [ + offset(east - half, north - half, 5), + offset(east + half, north - half, 5), + offset(east + half, north + half, 5), + offset(east - half, north + half, 5), + ]; + const box = (id, east, lit) => ({ + id, + geometry: { + kind: 'box', + center: offset(east, 300, 150), + dimensions: { x: 300, y: 300, z: 300 }, + }, + fill: '#ff9f0a', + lit, + }); + set.set([ + box('lit-box', -400, true), + box('flat-box', 400, false), + { + id: 'lit-square', + geometry: { kind: 'polygon', rings: [square(-400, -500, 200)] }, + fill: '#0a84ff', + lit: true, + }, + { + id: 'flat-square', + geometry: { kind: 'polygon', rings: [square(400, -500, 200)] }, + fill: '#0a84ff', + lit: false, + }, + ]); + return disposeAll(set); + }, + views: [{ name: 'tilted', view: over(2500, -0.5, 0.3, offset(0, -3600)) }], + }, { id: 'models', family: 'models', diff --git a/src/render/contract/draw.d.ts b/src/render/contract/draw.d.ts index 8b715834d..cc96a7ceb 100644 --- a/src/render/contract/draw.d.ts +++ b/src/render/contract/draw.d.ts @@ -228,7 +228,11 @@ export interface LineItem { /** ECEF positions, or packed `x, y, z` triples. */ positions: Ecef[] | Float64Array; widthPx: number; - /** `3d`: straight in space; `geodesic`: along the ellipsoid; `draped`: on the surface. */ + /** + * `3d`: straight in space; `geodesic`: along the ellipsoid; `draped`: on + * the surface. Where the renderer cannot drape at all, it draws `draped` lines + * and clamped shapes as in `overlay`, and `clampState()` says `overlay`. + */ mode: '3d' | 'geodesic' | 'draped'; clampTo?: ClampTarget; style: LineStyle; @@ -322,6 +326,13 @@ export interface ShapeItem { classifyVolume?: boolean; /** Pull toward the eye, metres, to win depth against coplanar surfaces. */ depthBias?: number; + /** + * Shaded by the renderer's fixed light (true) or flat colour (false). + * Omitted: lit for extruded shapes and boxes, flat otherwise. A renderer + * may draw clamped shapes, which drape on the surface, flat whatever it + * says. + */ + lit?: boolean; animate?: Pulse; meta?: Meta; show?: boolean; @@ -560,7 +571,8 @@ export interface DrawPort { * shapes) are draped onto the 3D tiles now (`draped`), or drawn over them * and hidden past the ellipsoid's horizon (`overlay`), the fallback a * renderer uses where it cannot drape. Without tiles in the base it is - * `draped`: clamping to terrain or the ellipsoid always drapes. + * `draped`: clamping to terrain or the ellipsoid always drapes, on a + * renderer that can drape at all (one that cannot is always `overlay`). */ clampState(): 'draped' | 'overlay'; /** Fires when `clampState()` changes (not on subscribing). */