--- ray/src/hd/rhdisp.c 1998/11/05 14:27:02 3.34 +++ ray/src/hd/rhdisp.c 1999/07/29 15:38:40 3.42 @@ -1,4 +1,4 @@ -/* Copyright (c) 1998 Silicon Graphics, Inc. */ +/* Copyright (c) 1999 Silicon Graphics, Inc. */ #ifndef lint static char SCCSid[] = "$SunId$ SGI"; @@ -18,8 +18,21 @@ static char SCCSid[] = "$SunId$ SGI"; #define VIEWHISTLEN 4 /* number of remembered views */ #endif +#ifndef FSIZDEF +#define FSIZDEF 0.125 /* default focus frame size */ +#endif + +#ifdef linux +#define fbufcnt(f) ((f)->_IO_read_end - (f)->_IO_read_ptr) +#else +#define fbufcnt(f) ((f)->_cnt) +#endif + HOLO *hdlist[HDMAX+1]; /* global holodeck list */ +char *hdgfn[HDMAX]; /* holodeck section geometry list */ +char *hdpfn[HDMAX]; /* section portal list */ + char cmdlist[DC_NCMDS][8] = DC_INIT; int imm_mode = 0; /* bundles are being delivered immediately */ @@ -33,7 +46,6 @@ char *progname; /* global argv[0] */ FILE *sstdin, *sstdout; /* server's standard input and output */ #ifdef DEBUG -#include extern time_t time(); static time_t tmodesw; static time_t timm, tadd; @@ -84,10 +96,14 @@ char *argv[]; inp = dev_input(); if (inp & DFL(DC_SETVIEW)) new_view(&odev.v); + else if (inp & DFL(DC_LASTVIEW)) + new_view(NULL); + if (inp & DFL(DC_REDRAW)) + imm_mode = beam_sync(1) > 0; if (inp & DFL(DC_GETVIEW)) printview(); - if (inp & DFL(DC_LASTVIEW)) - new_view(NULL); + if (inp & DFL(DC_FOCUS)) + set_focus(odev_args); if (inp & DFL(DC_KILL)) { serv_request(DR_KILL, 0, NULL); pause = 0; @@ -104,8 +120,6 @@ char *argv[]; } if (inp & DFL(DC_PAUSE)) pause = 1; - if (inp & DFL(DC_REDRAW)) - imm_mode = beam_sync(1) > 0; if (inp & DFL(DC_QUIT)) serv_request(DR_SHUTDOWN, 0, NULL); } @@ -146,10 +160,12 @@ disp_wait() /* wait for more input */ int n; register int i; /* see if we can avoid select call */ + if (hdlist[0] == NULL) + return(RDY_SRV); /* initialize first */ flgs = 0; /* flag what's ready already */ - if (imm_mode || stdin->_cnt > 0) + if (imm_mode || fbufcnt(stdin) > 0) flgs |= RDY_SRV; - if (sstdin != NULL && sstdin->_cnt > 0) + if (sstdin != NULL && fbufcnt(sstdin) > 0) flgs |= RDY_SIN; if (odev.inpready) flgs |= RDY_DEV; @@ -187,8 +203,9 @@ disp_wait() /* wait for more input */ } -add_holo(hdg) /* register a new holodeck section */ +add_holo(hdg, gfn, pfn) /* register a new holodeck section */ HDGRID *hdg; +char *gfn, *pfn; { VIEW nv; double d; @@ -203,6 +220,8 @@ HDGRID *hdg; error(SYSTEM, "out of memory in add_holo"); bcopy((char *)hdg, (char *)hdlist[hd], sizeof(HDGRID)); hdcompgrid(hdlist[hd]); + hdgfn[hd] = savestr(gfn); + hdpfn[hd] = pfn && *pfn ? savestr(pfn) : (char *)NULL; if (hd) return; /* set initial viewpoint */ @@ -258,6 +277,7 @@ register VIEW *v; static unsigned nhist; VIEW *dv; int i, res[2]; + int2 *slist; char *err; /* restore previous view? */ if (v == NULL) { @@ -273,25 +293,30 @@ again: error(COMMAND, err); return; } + if (!dev_view(v)) /* notify display driver */ + goto again; if (v->type == VT_PAR) { error(COMMAND, "cannot handle parallel views"); return; } - if (!dev_view(v)) /* notify display driver */ - goto again; - dev_flush(); /* update screen */ - beam_init(0); /* compute new beam set */ - for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++) - if (!beam_view(dv, res[0], res[1])) { + beam_init(odev.firstuse); /* compute new beam set */ + for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++) { + if ((slist = beam_view(dv, res[0], res[1])) == NULL) { if (!nhist) { error(COMMAND, "invalid starting view"); return; } copystruct(v, viewhist + ((nhist-1)%VIEWHISTLEN)); - goto again; - } + goto again; /* poss. overloading dev_section()? */ + } + DCHECK(*slist < 0, WARNING, "no visible sections in new_view"); + for ( ; *slist >= 0; slist++) + dev_section(hdgfn[*slist], hdpfn[*slist]); + } + dev_section(NULL,NULL); /* end section list */ + dev_flush(); /* update display */ /* update server */ - imm_mode = beam_sync(0) > 0; + imm_mode = beam_sync(odev.firstuse) > 0; /* record new view */ if (v < viewhist || v >= viewhist+VIEWHISTLEN) { copystruct(viewhist + (nhist%VIEWHISTLEN), v); @@ -300,6 +325,66 @@ again: } +set_focus(args) /* set focus frame */ +char *args; +{ + double hcent, vcent, hsiz, vsiz; + VIEW *dv, vwfocus; + int i, res[2]; + + i = sscanf(args, "%lf %lf %lf %lf", &hcent, &vcent, &hsiz, &vsiz); + if (i < 2 || hcent < 0 || hcent > 1 || vcent < 0 || vcent > 1) { + beam_init(0); /* restore view */ + for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++) + beam_view(dv, res[0], res[1]); + beam_sync(0); /* update server */ + return; + } + if (i < 4 || hsiz <= hcent || hsiz > 1 || vsiz <= vcent || vsiz > 1) + hsiz = vsiz = FSIZDEF; /* gave center only */ + else { + hsiz -= hcent; hcent += 0.5*hsiz; /* gave min and max */ + vsiz -= vcent; vcent += 0.5*vsiz; + } + beam_init(0); /* add basic views */ + for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++) + beam_view(dv, res[0]>>4, res[1]>>4); + copystruct(&vwfocus, &odev.v); /* add focus view */ + switch (odev.v.type) { + case VT_PER: + vwfocus.horiz = 2.*180./PI*atan( + hsiz * tan(PI/180./2.*odev.v.horiz) ); + vwfocus.vert = 2.*180./PI*atan( + vsiz * tan(PI/180./2.*odev.v.vert) ); + break; + case VT_PAR: + case VT_ANG: + vwfocus.horiz = hsiz * odev.v.horiz; + vwfocus.vert = vsiz * odev.v.vert; + break; + case VT_HEM: + vwfocus.horiz = 2.*180./PI*asin( + hsiz * sin(PI/180./2.*odev.v.horiz) ); + vwfocus.vert = 2.*180./PI*asin( + vsiz * sin(PI/180./2.*odev.v.vert) ); + break; + case VT_CYL: + vwfocus.horiz = hsiz * odev.v.horiz; + vwfocus.vert = 2.*180./PI*atan( + vsiz * tan(PI/180./2.*odev.v.vert) ); + break; + default: + error(INTERNAL, "bad view type in set_focus"); + } + vwfocus.hoff = (odev.v.hoff + hcent - 0.5)/hsiz; + vwfocus.voff = (odev.v.voff + vcent - 0.5)/vsiz; + setview(&vwfocus); + beam_view(&vwfocus, (int)(3*odev.hres*hsiz)+100, + (int)(3*odev.vres*vsiz)+100); + beam_sync(0); /* update server */ +} + + int usr_input() /* get user input and process it */ { @@ -342,6 +427,9 @@ usr_input() /* get user input and process it */ case DC_LASTVIEW: /* restore previous view */ new_view(NULL); break; + case DC_FOCUS: /* set focus frame */ + set_focus(args); + break; case DC_PAUSE: /* pause the current calculation */ case DC_RESUME: /* resume the calculation */ /* handled in main() */ @@ -408,9 +496,10 @@ serv_result() /* get next server result and process disp_bundle((PACKHEAD *)buf); break; case DS_ADDHOLO: - if (msg.nbytes != sizeof(HDGRID)) + if (msg.nbytes < sizeof(HDGRID)+2) error(INTERNAL, "bad holodeck record from server"); - add_holo((HDGRID *)buf); + add_holo((HDGRID *)buf, buf+sizeof(HDGRID), + buf+sizeof(HDGRID)+strlen(buf+sizeof(HDGRID))+1); break; case DS_OUTSECT: do_outside = 1; @@ -421,16 +510,16 @@ serv_result() /* get next server result and process break; case DS_STARTIMM: case DS_ENDIMM: + if (!(imm_mode = msg.type==DS_STARTIMM)) + dev_flush(); #ifdef DEBUG - if (imm_mode != (msg.type==DS_STARTIMM)) { + { time_t tnow = time(NULL); - if (imm_mode) timm += tnow - tmodesw; - else tadd += tnow - tmodesw; + if (msg.type==DS_STARTIMM) tadd += tnow - tmodesw; + else timm += tnow - tmodesw; tmodesw = tnow; } #endif - if (!(imm_mode = msg.type==DS_STARTIMM)) - dev_flush(); goto noargs; case DS_ACKNOW: case DS_SHUTDOWN: @@ -460,10 +549,8 @@ char *p; MSGHEAD msg; int m; /* consistency checks */ -#ifdef DEBUG - if (nbytes < 0 || nbytes > 0 & p == NULL) - error(CONSISTENCY, "bad buffer handed to serv_request"); -#endif + DCHECK(nbytes < 0 || nbytes > 0 & p == NULL, + CONSISTENCY, "bad buffer handed to serv_request"); /* get server's attention for big request */ if (nbytes >= BIGREQSIZ-sizeof(MSGHEAD)) { serv_request(DR_ATTEN, 0, NULL); @@ -503,7 +590,9 @@ register char *s; quit(code) /* clean up and exit */ int code; { + if (code) + exit(code); if (odev.v.type) dev_close(); - exit(code); + exit(0); }