--- ray/src/hd/rhcopy.c 1998/01/06 22:02:22 3.4 +++ ray/src/hd/rhcopy.c 1999/02/01 10:22:46 3.13 @@ -1,4 +1,4 @@ -/* Copyright (c) 1997 Silicon Graphics, Inc. */ +/* Copyright (c) 1999 Silicon Graphics, Inc. */ #ifndef lint static char SCCSid[] = "$SunId$ SGI"; @@ -12,6 +12,12 @@ static char SCCSid[] = "$SunId$ SGI"; #include "view.h" #include "resolu.h" +#ifndef BKBSIZE +#define BKBSIZE 256 /* beam clump size (kilobytes) */ +#endif + +int checkdepth = 1; /* check depth (!-f option)? */ +int checkrepeats = 0; /* check for repeats (-c option)? */ int frompicz; /* input from pictures & depth-buffers? */ int noutsects; /* number of output sections */ char obstr, unobstr; /* flag pointer values */ @@ -26,28 +32,44 @@ char *argv[]; int i; progname = argv[0]; - if (argc < 4) + frompicz = -1; + for (i = 2; i < argc && argv[i][0] == '-'; i++) + switch (argv[i][1]) { + case 'u': + checkrepeats = 1; + break; + case 'd': + checkdepth = 0; + break; + case 'h': + frompicz = 0; + break; + case 'p': + frompicz = 1; + break; + default: + goto userr; + } + if (i >= argc || frompicz < 0) goto userr; - if (!strcmp(argv[2], "-h")) - frompicz = 0; - else if (!strcmp(argv[2], "-pz")) - frompicz = 1; - else + if (frompicz && (argc-i)%2) goto userr; - if (frompicz && (argc-3)%2) - goto userr; noutsects = openholo(argv[1], 1); - if (frompicz) - for (i = 3; i < argc; i += 2) + if (frompicz) { + for ( ; i < argc; i += 2) addpicz(argv[i], argv[i+1]); - else - for (i = 3; i < argc; i++) + } else { + if (BKBSIZE*1024*1.5 > hdcachesize) + hdcachesize = BKBSIZE*1024*1.5; + for ( ; i < argc; i++) addholo(argv[i]); + } quit(0); userr: - fprintf(stderr, "Usage: %s output.hdk -h inp1.hdk ..\n", progname); - fprintf(stderr, " Or: %s output.hdk -pz inp1.pic inp1.zbf ..\n", + fprintf(stderr, "Usage: %s output.hdk [-u][-d] -h inp1.hdk ..\n", progname); + fprintf(stderr, " Or: %s output.hdk [-u][-d] -p inp1.pic inp1.zbf ..\n", + progname); exit(1); } @@ -56,6 +78,7 @@ userr: #define H_OBST 02 #define H_OBSF 04 +int holheadline(s, hf) /* check holodeck header line */ register char *s; int *hf; @@ -67,7 +90,7 @@ int *hf; *hf |= H_BADF; else *hf &= ~H_BADF; - return; + return(0); } if (!strncmp(s, "OBSTRUCTIONS=", 13)) { s += 13; @@ -78,8 +101,9 @@ int *hf; *hf |= H_OBSF; else error(WARNING, "bad OBSTRUCTIONS value in holodeck"); - return; + return(0); } + return(0); } int @@ -127,11 +151,13 @@ FVECT ro, rd; double d; COLR cv; { - int sn; + int sn, bi, n; register HOLO *hp; GCOORD gc[2]; BYTE rr[2][2]; + BEAM *bp; double d0, d1; + unsigned dc; register RAYVAL *rv; /* check each output section */ for (sn = noutsects; sn--; ) { @@ -139,63 +165,95 @@ COLR cv; d0 = hdinter(gc, rr, &d1, hp, ro, rd); if (d <= d0 || d1 < -0.001) continue; /* missed section */ - if (hp->priv == &obstr && d0 < -0.001) - continue; /* ray starts too late */ - if (hp->priv == &unobstr && d < 0.999*d1) - continue; /* ray ends too soon */ - /* should we check for duplicates? */ - rv = hdnewrays(hp, hdbindex(hp, gc), 1); + if (checkdepth) { /* check depth */ + if (hp->priv == &obstr && d0 < -0.001) + continue; /* ray starts too late */ + if (hp->priv == &unobstr && d < 0.999*d1) + continue; /* ray ends too soon */ + } + dc = hdcode(hp, d-d0); + bi = hdbindex(hp, gc); /* check for duplicates */ + if (checkrepeats && (bp = hdgetbeam(hp, bi)) != NULL) { + for (n = bp->nrm, rv = hdbray(bp); n--; rv++) + if ((hp->priv != NULL || rv->d == dc) && + rv->r[0][0] == rr[0][0] && + rv->r[0][1] == rr[0][1] && + rv->r[1][0] == rr[1][0] && + rv->r[1][1] == rr[1][1]) + break; + if (n >= 0) + continue; /* found a matching ray */ + } + rv = hdnewrays(hp, bi, 1); + rv->d = dc; rv->r[0][0] = rr[0][0]; rv->r[0][1] = rr[0][1]; rv->r[1][0] = rr[1][0]; rv->r[1][1] = rr[1][1]; copycolr(rv->v, cv); - rv->d = hdcode(hp, d-d0); } } -addholo(hdf) /* add a holodeck file */ -char *hdf; +static BEAMI *beamdir; + +static int +bpcmp(b1p, b2p) /* compare beam positions on disk */ +int *b1p, *b2p; { - int fd; - register HOLO *hp; - register BEAM *bp; - register HDBEAMI *hbl; + register long pdif = beamdir[*b1p].fo - beamdir[*b2p].fo; + + if (pdif > 0L) return(1); + if (pdif < 0L) return(-1); + return(0); +} + +static int +addclump(hp, bq, nb) /* transfer the given clump and free */ +HOLO *hp; +int *bq, nb; +{ GCOORD gc[2]; FVECT ro, rd; double d; - int i, j; + int i; register int k; + register BEAM *bp; + /* sort based on file position */ + beamdir = hp->bi; + qsort((char *)bq, nb, sizeof(*bq), bpcmp); + /* transfer each beam */ + for (i = 0; i < nb; i++) { + bp = hdgetbeam(hp, bq[i]); + hdbcoord(gc, hp, bq[i]); + /* add each ray to output */ + for (k = bp->nrm; k--; ) { + d = hdray(ro, rd, hp, gc, hdbray(bp)[k].r); + if (hp->priv == &unobstr) + VSUM(ro, ro, rd, d); + else + d = 0.; + d = hddepth(hp, hdbray(bp)[k].d) - d; + addray(ro, rd, d, hdbray(bp)[k].v); + } + hdfreebeam(hp, bq[i]); /* free the beam */ + } + hdfreebeam(NULL, 0); /* write & free clump */ + return(0); +} + +addholo(hdf) /* add a holodeck file */ +char *hdf; +{ + int fd; /* open the holodeck for reading */ openholo(hdf, 0); fd = hdlist[noutsects]->fd; /* remember the file handle */ - while ((hp = hdlist[noutsects]) != NULL) { /* load each section */ - hbl = (HDBEAMI *)malloc(nbeams(hp)*sizeof(HDBEAMI)); - if (hbl == NULL) - error(SYSTEM, "out of memory in addholo"); - for (j = nbeams(hp); j > 0; j--) { /* sort the beams */ - hbl[j].h = hp; - hbl[j].b = j; - } - qsort((char *)hbl, nbeams(hp), sizeof(HDBEAMI), hdfilord); - for (j = 0; j < nbeams(hp); j++) /* load each beam */ - if ((bp = hdgetbeam(hp, hbl[j].b)) != NULL) { - hdbcoord(gc, hp, hbl[j].b); - for (k = bp->nrm; k--; ) { - d = hdray(ro, rd, - hp, gc, hdbray(bp)[k].r); - if (hp->priv == &unobstr) - VSUM(ro, ro, rd, d); - else - d = 0.; - d = hddepth(hp, hdbray(bp)[k].d) - d; - addray(ro, rd, d, hdbray(bp)[k].v); - } - hdfreebeam(hp, hbl[j].b); /* free beam */ - } - free((char *)hbl); /* free beam list */ - hddone(hp); /* free the section */ + while (hdlist[noutsects] != NULL) { /* load each section */ + /* clump the beams */ + clumpbeams(hdlist[noutsects], 0, BKBSIZE*1024, addclump); + hddone(hdlist[noutsects]); /* free the section */ } - close(fd); /* close the file */ + close(fd); /* close input file */ + hdflush(NULL); /* flush output */ } @@ -208,6 +266,7 @@ struct phead { }; +int picheadline(s, ph) /* process picture header line */ char *s; struct phead *ph; @@ -216,20 +275,21 @@ struct phead *ph; if (formatval(fmt, s)) { ph->badfmt = strcmp(fmt, COLRFMT); - return; + return(0); } if (isprims(s)) { ph->altprims++; /* don't want to deal with this */ - return; + return(0); } if (isexpos(s)) { ph->expos *= exposval(s); - return; + return(0); } if (isview(s)) { ph->gotview += sscanview(&ph->vw, s); - return; + return(0); } + return(0); } @@ -328,6 +388,8 @@ char *pcf, *zbf; addray(ro, rd, (double)zscn[i], cscn[i]); } } + /* write output and free beams */ + hdflush(NULL); /* clean up */ free((char *)cscn); free((char *)zscn);