diff options
author | rodri <rgl@antares-labs.eu> | 2024-05-23 21:26:19 +0000 |
---|---|---|
committer | rodri <rgl@antares-labs.eu> | 2024-05-23 21:26:19 +0000 |
commit | cbfa17d446effcfc1e7d17aed624af8f098370f1 (patch) | |
tree | 526394c2dc24503b18a676a742187a648365b269 /solar.c | |
parent | 22edbd9f543509ab129ba03af92baed79139e07f (diff) | |
download | 3dee-cbfa17d446effcfc1e7d17aed624af8f098370f1.tar.gz 3dee-cbfa17d446effcfc1e7d17aed624af8f098370f1.tar.bz2 3dee-cbfa17d446effcfc1e7d17aed624af8f098370f1.zip |
get rid of rendering latency by decoupling it from i/o.
i was using a single alternator to mux both i/o and drawing
in a single proc, and avoid locking. the problem is that it
causes a fight to break up every time there's any input
(steady 100Hz) or a lot of drawing requests from the
renderer (up to 60Hz.)
i added a drawproc to handle exclusively drawing requests,
and a drawing lock for UI widgets that kidnap the display.
Diffstat (limited to 'solar.c')
-rw-r--r-- | solar.c | 54 |
1 files changed, 37 insertions, 17 deletions
@@ -136,6 +136,7 @@ int kdown; Tm date; char datestr[16]; Scene *scene; +QLock drawlk; Camera camera; Camcfg cameracfg = { @@ -408,11 +409,11 @@ redraw(void) } void -drawproc(void *) +renderproc(void *) { uvlong t0, Δt; - threadsetname("drawproc"); + threadsetname("renderproc"); t0 = nsec(); for(;;){ @@ -431,6 +432,18 @@ drawproc(void *) } } +void +drawproc(void *) +{ + threadsetname("drawproc"); + + for(;;) + if(recv(drawc, nil) && canqlock(&drawlk)){ + redraw(); + qunlock(&drawlk); + } +} + static char * genplanetmenu(int idx) { @@ -446,11 +459,13 @@ lookat_cmd(Cmdbut *) Planet *p; int idx; + qlock(&drawlk); idx = menuhit(1, mctl, &menu, _screen); - if(idx < 0) - return; - p = &planets[idx]; - placecamera(&camera, camera.p, p->body->p, cameracfg.up); + if(idx >= 0){ + p = &planets[idx]; + placecamera(&camera, camera.p, p->body->p, cameracfg.up); + } + qunlock(&drawlk); nbsend(drawc, nil); } @@ -460,10 +475,11 @@ goto_cmd(Cmdbut *) static Menu menu = { .gen = genplanetmenu }; int idx; + qlock(&drawlk); idx = menuhit(1, mctl, &menu, _screen); - if(idx < 0) - return; - gotoplanet(&planets[idx]); + if(idx >= 0) + gotoplanet(&planets[idx]); + qunlock(&drawlk); nbsend(drawc, nil); } @@ -477,13 +493,17 @@ date_cmd(Cmdbut *) return; memmove(buf, datestr, sizeof buf); + qlock(&drawlk); if(enter("new date", buf, sizeof buf, mctl, kctl, nil) <= 0) - return; + goto nodate; if(tmparse(&t, datefmt, buf, nil, nil) == nil) - return; + goto nodate; date = t; snprint(datestr, sizeof datestr, "%τ", tmfmt(&date, datefmt)); updateplanets(); +nodate: + qunlock(&drawlk); + nbsend(drawc, nil); } Cmdbut cmds[] = { @@ -554,16 +574,17 @@ mmb(void) if((om.buttons ^ mctl->buttons) == 0) return; + qlock(&drawlk); switch(menuhit(2, mctl, &menu, _screen)){ case CHGSPEED: snprint(buf, sizeof buf, "%g", speed); - if(enter("speed (km)", buf, sizeof buf, mctl, kctl, nil) <= 0) - return; - speed = fabs(strtod(buf, nil)); + if(enter("speed (km)", buf, sizeof buf, mctl, kctl, nil) > 0) + speed = fabs(strtod(buf, nil)); break; case QUIT: threadexitsall(nil); } + qunlock(&drawlk); nbsend(drawc, nil); } @@ -808,22 +829,21 @@ threadmain(int argc, char *argv[]) proccreate(kbdproc, nil, mainstacksize); proccreate(keyproc, keyc, mainstacksize); + proccreate(renderproc, nil, mainstacksize); proccreate(drawproc, nil, mainstacksize); for(;;){ - enum {MOUSE, RESIZE, KEY, DRAW}; + enum {MOUSE, RESIZE, KEY}; Alt a[] = { {mctl->c, &mctl->Mouse, CHANRCV}, {mctl->resizec, nil, CHANRCV}, {keyc, nil, CHANRCV}, - {drawc, nil, CHANRCV}, {nil, nil, CHANEND} }; switch(alt(a)){ case MOUSE: mouse(); break; case RESIZE: resize(); break; case KEY: handlekeys(); break; - case DRAW: redraw(); break; } } } |