From a3dd1dd8103b945f84bb03dc3440681893366ac5 Mon Sep 17 00:00:00 2001 From: Hugues <16280457+huguesdelamure@users.noreply.github.com> Date: Tue, 27 Oct 2026 14:03:04 +0100 Subject: [PATCH] Busy maps: no link labels or fiber dots above 1,000 lines on screen On a save with 2,700 lines on screen, Firefox spent about 95% of each frame painting, and the dotted line on lit fiber (~160 ms) and the link labels (~55 ms) were half of it, in a tangle where neither can be read. draw() now counts the lines it would paint (linesOnScreen(), same box and margin as its own culling, boxes cached on the geometry) and above MAP_BUSY = 1000 leaves out both. They come back as soon as fewer lines show, zooming in for instance. The selected link keeps its label. Firefox Developer Edition headless, 1600x900 at DPR 2, player save, median of 3x9 frames: save view 414 -> 214 ms, pan 472 -> 238, zoom 0.6 269 -> 181, New York zoom 2 213 -> 107, selected link 412 -> 201. Under the threshold pixels are identical (canvas SHA-1): zoom 3.2 and 6 on the player save, six views of the big-network fixture. --- CHANGELOG.md | 1 + src/game/96-map/60-draw.js | 19 ++++++++++++++----- tests/speed.test.js | 25 +++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e891308..ca7ac0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ All notable changes to this project are documented here. The project follows - Huge networks stop stuttering every few seconds when their save is too big for the browser to keep: after a failed save the game waits a minute before trying again, then longer, instead of retrying every 5 seconds and after every click. Leaving the page, exporting and new games still save at once. - Saves of long games are much smaller: the list of customer names already used kept growing by the same names every day (half of a late-game save). Older saves shrink when loaded. +- Maps with more than a thousand lines on screen draw about twice as fast: they leave out the link labels and the dots on lit fiber, which nobody could read in such a tangle. Zoom in and they come back; the selected link keeps its label. - The map of a huge network spends less time working out fiber capacities on every frame, and skips links above or below the screen. ## [1.34.1] — 2026-10-27 diff --git a/src/game/96-map/60-draw.js b/src/game/96-map/60-draw.js index 75801b7..8b2a2a3 100644 --- a/src/game/96-map/60-draw.js +++ b/src/game/96-map/60-draw.js @@ -25,9 +25,9 @@ function drawFrame(now){ // cable systems drawCables(ks); // links - const far=lodFar(),PI=pairIdx(); - for(const grp of linkGroups()){const l=grp[0],many=grp.length>1,up=many?grp.filter(x=>!linkDown(x)):null; - const gm=linkGeom(l,PI.get(edgeKey(l))),cap=many?up.reduce((a,x)=>a+capOf(x),0):capOf(l),load=many?grp.reduce((a,x)=>a+(R.load[x.id]||0),0):(R.load[l.id]||0),u=cap?load/cap:0,df=l.kind==='df',bld=df&&l.ready>day,cut=!bld&&(many?!up.length:linkDown(l))&&!(df&&!(l.ch||[]).length),dark=df&&!bld&&!(l.ch||[]).length,vx=l.kind==='vxc'; + const far=lodFar(),PI=pairIdx(),LG=linkGroups(),GM=LG.map(g=>linkGeom(g[0],PI.get(edgeKey(g[0])))),busy=linesOnScreen(GM,ks)>MAP_BUSY; + for(let gi=0;gi1,up=many?grp.filter(x=>!linkDown(x)):null; + const gm=GM[gi],cap=many?up.reduce((a,x)=>a+capOf(x),0):capOf(l),load=many?grp.reduce((a,x)=>a+(R.load[x.id]||0),0):(R.load[l.id]||0),u=cap?load/cap:0,df=l.kind==='df',bld=df&&l.ready>day,cut=!bld&&(many?!up.length:linkDown(l))&&!(df&&!(l.ch||[]).length),dark=df&&!bld&&!(l.ch||[]).length,vx=l.kind==='vxc'; const sel=UI.sel&&UI.sel.type==='link'&&grp.some(x=>x.id===UI.sel.id);let lab=null; const w=(vx?2.2:(2.5+Math.max(...grp.map(tierW))*1.8+(many?Math.min(1.5,(grp.length-1)*0.5):0)))*sc*(far?0.5:1),np=gm.pts.length; if(SX.length0.001?utilCol(u):'#7FD8EE'):utilCol(u);ctx.lineWidth=w;ctx.stroke();ctx.setLineDash([]); // Still the same path: strokes keep it, so the dotted fiber line goes on top without building it again. - if(df&&!bld&&!dark){ctx.strokeStyle='rgba(255,255,255,.75)';ctx.lineWidth=Math.max(1,w*0.25);ctx.setLineDash([1,6]);ctx.stroke();ctx.setLineDash([]);} + if(df&&!bld&&!dark&&!busy){ctx.strokeStyle='rgba(255,255,255,.75)';ctx.lineWidth=Math.max(1,w*0.25);ctx.setLineDash([1,6]);ctx.stroke();ctx.setLineDash([]);} const at=t=>polyAtXY(SX,SY,gm.cum,t); if(!cut&&load>0.01){const n=clamp(Math.round(2+u*10),2,12)>>(far?1:0)||1,len=gm.len*z,spd=90; ctx.fillStyle='#fff';ctx.strokeStyle='#1E2640';ctx.lineWidth=far?1:1.5; @@ -50,7 +50,7 @@ function drawFrame(now){ const [mx2,my]=at(.5);const mxx=mx2; if(bld){if(far){ctx.fillStyle='#FF8A3D';ctx.strokeStyle='#1E2640';ctx.lineWidth=1.5;ctx.beginPath();ctx.arc(mxx,my,4,0,7);ctx.fill();ctx.stroke();}else drawCone(mxx,my,now);} else if(cut&&!vx){if(far){ctx.fillStyle='#FF4D5E';ctx.strokeStyle='#1E2640';ctx.lineWidth=1.5;ctx.beginPath();ctx.arc(mxx,my,5,0,7);ctx.fill();ctx.stroke();ctx.fillStyle='#fff';ctx.font='900 8px Nunito, sans-serif';ctx.textAlign='center';ctx.textBaseline='middle';ctx.fillText('!',mxx,my+0.5);}else drawBackhoe(mxx,my,now,l.sub);} - else if(z>0.9||sel){const t=lab||(lab=many?groupLabel(grp,up):capName(l));ctx.font='800 11px "Baloo 2", sans-serif';let tw=LINKW.get(t);if(tw===undefined)LINKW.set(t,tw=ctx.measureText(t).width+10);ctx.fillStyle='#fff';ctx.strokeStyle='#1E2640';ctx.lineWidth=2;rr(mxx-tw/2,my-9,tw,17,8);ctx.fill();ctx.stroke();ctx.fillStyle='#1E2640';ctx.textAlign='center';ctx.textBaseline='middle';ctx.fillText(t,mxx,my+1);} + else if(sel||(z>0.9&&!busy)){const t=lab||(lab=many?groupLabel(grp,up):capName(l));ctx.font='800 11px "Baloo 2", sans-serif';let tw=LINKW.get(t);if(tw===undefined)LINKW.set(t,tw=ctx.measureText(t).width+10);ctx.fillStyle='#fff';ctx.strokeStyle='#1E2640';ctx.lineWidth=2;rr(mxx-tw/2,my-9,tw,17,8);ctx.fill();ctx.stroke();ctx.fillStyle='#1E2640';ctx.textAlign='center';ctx.textBaseline='middle';ctx.fillText(t,mxx,my+1);} } } // drag preview @@ -90,6 +90,15 @@ function drawFrame(now){ for(let i=FLOATS.length-1;i>=0;i--){const f=FLOATS[i],a=(now-f.t)/1600;if(a>1){FLOATS.splice(i,1);continue;} for(const k of ks){const [sx,sy]=toS(f.x,f.y,k);ctx.globalAlpha=1-a*a;ctx.font='800 17px "Baloo 2", sans-serif';ctx.textAlign='center';ctx.textBaseline='middle';ctx.lineWidth=4;ctx.strokeStyle='#fff';ctx.strokeText(f.text,sx,sy-a*40);ctx.fillStyle=f.col;ctx.fillText(f.text,sx,sy-a*40);ctx.globalAlpha=1;}} } +/* A map with more than MAP_BUSY lines on screen (huge late-game networks) is a tangle where nobody reads thousands of + overlapping labels or fiber dots, and painting them took about half of every frame. They come back once fewer lines + show, zooming in for instance; the selected link keeps its label. */ +const MAP_BUSY=1000; +// How many lines draw() would paint: one per group and world copy whose box is on screen (the same margin as draw()). +function linesOnScreen(GM,ks){let n=0;for(const gm of GM){const b=gm.box||(gm.box=ptsBox(gm.pts)); + for(const k of ks){const x0=(b[0]+k*W-cam.x)*cam.z+CW/2,x1=(b[2]+k*W-cam.x)*cam.z+CW/2,y0=(b[1]-cam.y)*cam.z+CH/2,y1=(b[3]-cam.y)*cam.z+CH/2; + if(!(x1<-40||x0>CW+40||y1<-40||y0>CH+40))n++;}}return n;} +function ptsBox(pts){let a=Infinity,b=Infinity,c=-Infinity,d=-Infinity;for(const p of pts){if(p[0]c)c=p[0];if(p[1]>d)d=p[1];}return [a,b,c,d];} function drawCone(x,y,now){const b=Math.sin(now/300)*1.5;ctx.save();ctx.translate(x,y-12+b);ctx.strokeStyle='#1E2640';ctx.lineWidth=2;ctx.fillStyle='#FF8A3D';ctx.beginPath();ctx.moveTo(-7,9);ctx.lineTo(0,-10);ctx.lineTo(7,9);ctx.closePath();ctx.fill();ctx.stroke();ctx.fillStyle='#fff';ctx.fillRect(-4,-1,8,3);ctx.fillStyle='#1E2640';rr(-10,8,20,4,2);ctx.fill();ctx.restore();} // Static land + cable map, rendered once per zoom bucket into an offscreen canvas. function paintWorld(c,z,withCables){const LANDP=lodFar()?LANDP_FAR:LANDP_ALL; diff --git a/tests/speed.test.js b/tests/speed.test.js index 0ea9f41..069449b 100644 --- a/tests/speed.test.js +++ b/tests/speed.test.js @@ -121,6 +121,31 @@ test('the map keeps fiber capacities for one frame only, and skips links above o assert.deepEqual(errors, []); }); +test('a map with more than MAP_BUSY lines on screen leaves out link labels and fiber dots, and they come back', () => { + const { ev, errors } = load(); + bigNet(ev); + // Spy on the two things that go: the dotted line on lit fiber and the link labels. + ev("window.__dots=0;window.__labels=[];ctx.setLineDash=d=>{if(d.length===2&&d[0]===1&&d[1]===6)__dots++;};ctx.fillText=t=>{if(/ DF$/.test(t))__labels.push(t);}"); + const frame = () => ev("__dots=0;__labels=[];draw(0);JSON.stringify([__dots,__labels.length])"); + const view = "cam.x=(CITY.fra.x+CITY.lon.x)/2;cam.y=(CITY.fra.y+CITY.lon.y)/2;cam.z=1.6;"; + const lines = () => ev("(()=>{const PI=pairIdx();return linesOnScreen(linkGroups().map(g=>linkGeom(g[0],PI.get(edgeKey(g[0])))),visibleKs());})()"); + ev("const ps=[['fra','ams'],['ams','lon'],['lon','par'],['par','fra'],['fra','lon'],['ams','par']];for(let i=0;i<20;i++){const [a,b]=ps[i%6];S.links.push({id:'dfB'+i,a,b,kind:'df',own:true,km:kmBetween(a,b),ready:0,ch:['zr4']});}compute()"); + ev(view); + assert.ok(lines() < ev('MAP_BUSY')); + const [dots, labels] = JSON.parse(frame()); + assert.ok(dots >= 20 && labels >= 20, 'a normal map shows them'); + ev("const ps2=[['fra','ams'],['ams','lon'],['lon','par'],['par','fra'],['fra','lon'],['ams','par']];for(let i=20;i ev('MAP_BUSY')); + assert.equal(frame(), '[0,0]', 'a tangle of lines does not'); + ev("UI.sel={type:'link',id:'dfB3'}"); + assert.equal(frame(), '[0,1]', 'except the label of the selected link'); + ev("UI.sel=null;S.links=S.links.filter(l=>!/^dfB/.test(l.id)||+l.id.slice(3)<20);compute()"); + ev(view); + assert.deepEqual(JSON.parse(frame()), [dots, labels], 'back as soon as fewer lines show'); + assert.deepEqual(errors, []); +}); + test('long lists in the NOC dashboard show 100 rows at a time and grow on request', () => { const { ev, errors } = load(); bigNet(ev);