--- ray/src/ot/oconv.c 1989/03/29 11:25:02 1.2 +++ ray/src/ot/oconv.c 1991/12/19 15:06:31 2.2 @@ -18,6 +18,10 @@ static char SCCSid[] = "$SunId$ LBL"; #include "otypes.h" +#ifndef DEFPATH +#define DEFPATH ":/usr/local/lib/ray" +#endif + #define OMARGIN (10*FTINY) /* margin around global cube */ #define MAXOBJFIL 63 /* maximum number of scene files */ @@ -39,13 +43,14 @@ int nfiles = 0; /* number of object files */ double mincusize; /* minimum cube size from resolu */ +int (*addobjnotify[])() = {NULL}; /* new object notifier functions */ + main(argc, argv) /* convert object files to an octree */ int argc; char **argv; { - char *getenv(); - double atof(); + extern char *getenv(); FVECT bbmin, bbmax; char *infile = NULL; int outflags = IO_ALL; @@ -55,10 +60,14 @@ char **argv; progname = argv[0]; if ((libpath = getenv("RAYPATH")) == NULL) - libpath = ":/usr/local/lib/ray"; + libpath = DEFPATH; + initotypes(); + for (i = 1; i < argc && argv[i][0] == '-'; i++) switch (argv[i][1]) { + case '\0': /* scene from stdin */ + goto breakopt; case 'i': /* input octree */ infile = argv[++i]; break; @@ -85,7 +94,7 @@ char **argv; error(USER, errmsg); break; } - +breakopt: if (infile != NULL) { /* get old octree & objects */ if (thescene.cusize > FTINY) error(USER, "only one of '-b' or '-i'"); @@ -97,15 +106,21 @@ char **argv; } printargs(argc, argv, stdout); /* info. header */ + fputformat(OCTFMT, stdout); printf("\n"); startobj = nobjects; /* previous objects already converted */ - for ( ; i < argc; i++) { /* read new files */ - if (nfiles >= MAXOBJFIL) - error(INTERNAL, "too many scene files"); - readobj(ofname[nfiles++] = argv[i]); - } + for ( ; i < argc; i++) /* read new scene descriptions */ + if (!strcmp(argv[i], "-")) { /* from stdin */ + readobj(NULL); + outflags &= ~IO_FILES; + } else { /* from file */ + if (nfiles >= MAXOBJFIL) + error(INTERNAL, "too many scene files"); + readobj(ofname[nfiles++] = argv[i]); + } + ofname[nfiles] = NULL; /* find bounding box */ bbmin[0] = bbmin[1] = bbmin[2] = FHUGE; @@ -119,10 +134,12 @@ char **argv; bbmin[i] -= OMARGIN; bbmax[i] += OMARGIN; } - VCOPY(thescene.cuorg, bbmin); for (i = 0; i < 3; i++) if (bbmax[i] - bbmin[i] > thescene.cusize) thescene.cusize = bbmax[i] - bbmin[i]; + for (i = 0; i < 3; i++) + thescene.cuorg[i] = + (bbmax[i]+bbmin[i]-thescene.cusize)*.5; } } else { for (i = 0; i < 3; i++) @@ -168,18 +185,25 @@ char *s; eputs(s) /* put string to stderr */ register char *s; { - static int inline = 0; + static int inln = 0; - if (!inline++) { + if (!inln++) { fputs(progname, stderr); fputs(": ", stderr); } fputs(s, stderr); if (*s && s[strlen(s)-1] == '\n') - inline = 0; + inln = 0; } +#define bitop(f,i,op) (f[((i)>>3)] op (1<<((i)&7))) +#define tstbit(f,i) bitop(f,i,&) +#define setbit(f,i) bitop(f,i,|=) +#define clrbit(f,i) bitop(f,i,&=~) +#define tglbit(f,i) bitop(f,i,^=) + + addobject(cu, obj) /* add an object to a cube */ register CUBE *cu; OBJECT obj; @@ -187,12 +211,13 @@ OBJECT obj; CUBE cukid; OCTREE ot; OBJECT oset[MAXSET+1]; + unsigned char inflg[MAXSET/8], volflg[MAXSET/8]; int in; register int i, j; in = (*ofun[objptr(obj)->otype].funp)(objptr(obj), cu); - if (!in) + if (in == O_MISS) return; /* no intersection */ if (istree(cu->cutree)) { @@ -208,45 +233,69 @@ OBJECT obj; addobject(&cukid, obj); octkid(cu->cutree, i) = cukid.cutree; } - - } else if (isempty(cu->cutree)) { + return; + } + if (isempty(cu->cutree)) { /* singular set */ oset[0] = 1; oset[1] = obj; cu->cutree = fullnode(oset); - - } else { - /* add to full node */ - objset(oset, cu->cutree); - cukid.cusize = cu->cusize * 0.5; - - if (in == 2 || oset[0] < objlim || cukid.cusize < mincusize) { - /* add to set */ - if (oset[0] >= MAXSET) { - sprintf(errmsg, - "set overflow in addobject (%s)", - objptr(obj)->oname); - error(INTERNAL, errmsg); - } - insertelem(oset, obj); - cu->cutree = fullnode(oset); - - } else { - /* subdivide cube */ - if ((ot = octalloc()) == EMPTY) - error(SYSTEM, "out of octree space"); - for (i = 0; i < 8; i++) { - cukid.cutree = EMPTY; - for (j = 0; j < 3; j++) { - cukid.cuorg[j] = cu->cuorg[j]; - if ((1<cutree = ot; + return; + } + /* add to full node */ + objset(oset, cu->cutree); + cukid.cusize = cu->cusize * 0.5; + + if (in==O_IN || oset[0] < objlim || cukid.cusize < mincusize) { + /* add to set */ + if (oset[0] >= MAXSET) { + sprintf(errmsg, + "set overflow in addobject (%s)", + objptr(obj)->oname); + error(INTERNAL, errmsg); } + insertelem(oset, obj); + cu->cutree = fullnode(oset); + return; } + /* subdivide cube */ + if ((ot = octalloc()) == EMPTY) + error(SYSTEM, "out of octree space"); + /* mark volumes */ + j = (oset[0]+7)>>3; + while (j--) + volflg[j] = inflg[j] = 0; + for (j = 1; j <= oset[0]; j++) + if (isvolume(objptr(oset[j])->otype)) { + setbit(volflg,j-1); + if ((*ofun[objptr(oset[j])->otype].funp) + (objptr(oset[j]),cu) == O_IN) + setbit(inflg,j-1); + } + /* assign subcubes */ + for (i = 0; i < 8; i++) { + cukid.cutree = EMPTY; + for (j = 0; j < 3; j++) { + cukid.cuorg[j] = cu->cuorg[j]; + if ((1<cutree = ot; }