--- ray/src/common/readoct.c 2003/02/25 02:47:21 2.14 +++ ray/src/common/readoct.c 2004/12/15 22:02:04 2.27 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: readoct.c,v 2.14 2003/02/25 02:47:21 greg Exp $"; +static const char RCSid[] = "$Id: readoct.c,v 2.27 2004/12/15 22:02:04 greg Exp $"; #endif /* * readoct.c - routines to read octree information. @@ -7,39 +7,48 @@ static const char RCSid[] = "$Id: readoct.c,v 2.14 200 #include "copyright.h" -#include "standard.h" +#include +#include +#include "platform.h" +#include "rtprocess.h" +#include "standard.h" #include "octree.h" - #include "object.h" - #include "otypes.h" +#include "resolu.h" -static double ogetflt(); -static long ogetint(); -static char *ogetstr(); -static int nonsurfinset(); -static int getobj(), octerror(), skiptree(); -static OCTREE getfullnode(), gettree(); +#ifdef getc_unlocked /* avoid horrendous overhead of flockfile */ +#undef getc +#define getc getc_unlocked +#endif +static double ogetflt(void); +static long ogetint(int); +static char *ogetstr(char *); +static int nonsurfintree(OCTREE ot); +static void octerror(int etyp, char *msg); +static void skiptree(void); +static OCTREE getfullnode(void), gettree(void); + static char *infn; /* input file specification */ static FILE *infp; /* input file stream */ static int objsize; /* size of stored OBJECT's */ static OBJECT objorig; /* zeroeth object */ static OBJECT fnobjects; /* number of objects in this file */ -static short otypmap[NUMOTYPE+8]; /* object type map */ int -readoct(inpspec, load, scene, ofn) /* read in octree file or stream */ -char *inpspec; -int load; -CUBE *scene; -char *ofn[]; +readoct( /* read in octree file or stream */ + char *inpspec, + int load, + CUBE *scene, + char *ofn[] +) { char sbuf[512]; int nf; - register int i; + int i; long m; if (inpspec == NULL) { @@ -59,9 +68,7 @@ char *ofn[]; error(SYSTEM, errmsg); } } -#ifdef MSDOS - setmode(fileno(infp), O_BINARY); -#endif + SET_FILE_BINARY(infp); /* get header */ if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0) octerror(USER, "not an octree"); @@ -99,23 +106,20 @@ char *ofn[]; else if (load & IO_SCENE && nf == 0) skiptree(); - if (load & IO_SCENE) /* get the scene */ + if (load & IO_SCENE) { /* get the scene */ if (nf == 0) { - for (i = 0; *ogetstr(sbuf); i++) - if ((otypmap[i] = otype(sbuf)) < 0) { - sprintf(errmsg, "unknown type \"%s\"", sbuf); - octerror(WARNING, errmsg); - } - while (getobj() != OVOID) - ; + /* load binary scene data */ + readscene(infp, objsize); + } else { /* consistency checks */ /* check object count */ if (nobjects != objorig+fnobjects) octerror(USER, "bad object count; octree stale?"); /* check for non-surfaces */ - if (dosets(nonsurfinset)) + if (nonsurfintree(scene->cutree)) octerror(USER, "modifier in tree; octree stale?"); } + } /* close the input */ if (infn[0] == '!') pclose(infp); @@ -126,8 +130,7 @@ char *ofn[]; static char * -ogetstr(s) /* get null-terminated string */ -char *s; +ogetstr(char *s) /* get null-terminated string */ { extern char *getstr(); @@ -156,8 +159,7 @@ getfullnode() /* get a set, return fullnode */ static long -ogetint(siz) /* get a siz-byte integer */ -int siz; +ogetint(int siz) /* get a siz-byte integer */ { extern long getint(); register long r; @@ -204,26 +206,34 @@ gettree() /* get a pre-ordered octree */ default: octerror(USER, "damaged octree"); } + return EMPTY; /* pro forma return */ } static int -nonsurfinset(os) /* check set for modifier */ -register OBJECT *os; +nonsurfintree(OCTREE ot) /* check tree for modifiers */ { - register OBJECT s; + OBJECT set[MAXSET+1]; register int i; - for (i = *os; i-- > 0; ) - if ((s = *++os) >= objorig && s < objorig+fnobjects && - ismodifier(objptr(s)->otype)) + if (isempty(ot)) + return(0); + if (istree(ot)) { + for (i = 0; i < 8; i++) + if (nonsurfintree(octkid(ot, i))) + return(1); + return(0); + } + objset(set, ot); + for (i = set[0]; i-- > 0; ) + if (ismodifier(objptr(set[i])->otype)) return(1); return(0); } -static -skiptree() /* skip octree on input */ +static void +skiptree(void) /* skip octree on input */ { register int i; @@ -247,73 +257,8 @@ skiptree() /* skip octree on input */ } -static -getobj() /* get next object */ -{ - char sbuf[MAXSTR]; - int obj; - register int i; - register long m; - register OBJREC *objp; - - i = ogetint(1); - if (i == -1) - return(OVOID); /* terminator */ - if ((obj = newobject()) == OVOID) - error(SYSTEM, "out of object space"); - objp = objptr(obj); - if ((objp->otype = otypmap[i]) < 0) - octerror(USER, "reference to unknown type"); - if ((m = ogetint(objsize)) != OVOID) { - m += objorig; - if ((OBJECT)m != m) - octerror(USER, "too many objects"); - } - objp->omod = m; - objp->oname = savqstr(ogetstr(sbuf)); - if (objp->oargs.nsargs = ogetint(2)) { - objp->oargs.sarg = (char **)malloc - (objp->oargs.nsargs*sizeof(char *)); - if (objp->oargs.sarg == NULL) - goto memerr; - for (i = 0; i < objp->oargs.nsargs; i++) - objp->oargs.sarg[i] = savestr(ogetstr(sbuf)); - } else - objp->oargs.sarg = NULL; -#ifdef IARGS - if (objp->oargs.niargs = ogetint(2)) { - objp->oargs.iarg = (long *)malloc - (objp->oargs.niargs*sizeof(long)); - if (objp->oargs.iarg == NULL) - goto memerr; - for (i = 0; i < objp->oargs.niargs; i++) - objp->oargs.iarg[i] = ogetint(4); - } else - objp->oargs.iarg = NULL; -#endif - if (objp->oargs.nfargs = ogetint(2)) { - objp->oargs.farg = (FLOAT *)malloc - (objp->oargs.nfargs*sizeof(FLOAT)); - if (objp->oargs.farg == NULL) - goto memerr; - for (i = 0; i < objp->oargs.nfargs; i++) - objp->oargs.farg[i] = ogetflt(); - } else - objp->oargs.farg = NULL; - /* initialize */ - objp->os = NULL; - /* insert */ - insertobject(obj); - return(obj); -memerr: - error(SYSTEM, "out of memory in getobj"); -} - - -static -octerror(etyp, msg) /* octree error */ -int etyp; -char *msg; +static void +octerror(int etyp, char *msg) /* octree error */ { char msgbuf[128];