--- ray/src/common/readoct.c	1991/10/23 11:53:38	1.14
+++ ray/src/common/readoct.c	2003/08/29 16:46:51	2.22
@@ -1,79 +1,86 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: readoct.c,v 2.22 2003/08/29 16:46:51 greg Exp $";
 #endif
-
 /*
  *  readoct.c - routines to read octree information.
- *
- *     7/30/85
  */
 
-#include  "standard.h"
+#include "copyright.h"
 
-#include  "octree.h"
+#include  <stdio.h>
+#include  <time.h>
 
+#include  "standard.h"
+#include  "platform.h"
+#include  "octree.h"
 #include  "object.h"
-
 #include  "otypes.h"
+#include  "resolu.h"
 
-extern double  atof();
-static double  getflt();
-static long  getint();
-static char  *getstr();
-static OCTREE  getfullnode(), gettree();
+static double  ogetflt(void);
+static long  ogetint(int);
+static char  *ogetstr(char *);
+static int  nonsurfinset(OBJECT *);
+static void  octerror(int  etyp, char  *msg);
+static void  skiptree(void);
+static OCTREE  getfullnode(void), gettree(void);
 
-static char  *infn;			/* input file name */
+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 short  otypmap[NUMOTYPE+8];	/* object type map */
+static OBJECT  fnobjects;		/* number of objects in this file */
 
 
 int
-readoct(fname, load, scene, ofn)	/* read in octree from file */
-char  *fname;
+readoct(inpspec, load, scene, ofn)	/* read in octree file or stream */
+char  *inpspec;
 int  load;
 CUBE  *scene;
 char  *ofn[];
 {
-	extern int  fputs();
 	char  sbuf[512];
 	int  nf;
-	OBJECT  fnobjects;
-	register int  i;
+	int  i;
+	long  m;
 	
-	if (fname == NULL) {
+	if (inpspec == NULL) {
 		infn = "standard input";
 		infp = stdin;
+	} else if (inpspec[0] == '!') {
+		infn = inpspec;
+		if ((infp = popen(inpspec+1, "r")) == NULL) {
+			sprintf(errmsg, "cannot execute \"%s\"", inpspec);
+			error(SYSTEM, errmsg);
+		}
 	} else {
-		infn = fname;
-		if ((infp = fopen(fname, "r")) == NULL) {
+		infn = inpspec;
+		if ((infp = fopen(inpspec, "r")) == NULL) {
 			sprintf(errmsg, "cannot open octree file \"%s\"",
-					fname);
+					inpspec);
 			error(SYSTEM, errmsg);
 		}
 	}
+	SET_FILE_BINARY(infp);
 					/* get header */
-	if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : NULL) < 0)
+	if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0)
 		octerror(USER, "not an octree");
 					/* check format */
-	if ((objsize = getint(2)-OCTMAGIC) <= 0 ||
+	if ((objsize = ogetint(2)-OCTMAGIC) <= 0 ||
 			objsize > MAXOBJSIZ || objsize > sizeof(long))
 		octerror(USER, "incompatible octree format");
 					/* get boundaries */
 	if (load & IO_BOUNDS) {
 		for (i = 0; i < 3; i++)
-			scene->cuorg[i] = atof(getstr(sbuf));
-		scene->cusize = atof(getstr(sbuf));
+			scene->cuorg[i] = atof(ogetstr(sbuf));
+		scene->cusize = atof(ogetstr(sbuf));
 	} else {
 		for (i = 0; i < 4; i++)
-			getstr(sbuf);
+			ogetstr(sbuf);
 	}
 	objorig = nobjects;		/* set object offset */
 	nf = 0;				/* get object files */
-	while (*getstr(sbuf)) {
+	while (*ogetstr(sbuf)) {
 		if (load & IO_SCENE)
 			readobj(sbuf);
 		if (load & IO_FILES)
@@ -83,109 +90,99 @@ char  *ofn[];
 	if (load & IO_FILES)
 		ofn[nf] = NULL;
 					/* get number of objects */
-	fnobjects = getint(objsize);
+	fnobjects = m = ogetint(objsize);
+	if (fnobjects != m)
+		octerror(USER, "too many objects");
 
-	if (load & IO_TREE) {
-						/* get the octree */
+	if (load & IO_TREE)		/* get the octree */
 		scene->cutree = gettree();
-						/* get the scene */
-		if (nf == 0 && load & IO_SCENE) {
-			for (i = 0; *getstr(sbuf); i++)
-				if ((otypmap[i] = otype(sbuf)) < 0) {
-					sprintf(errmsg, "unknown type \"%s\"",
-							sbuf);
-					octerror(WARNING, errmsg);
-				}
-			while (getobj() != OVOID)
-				;
-		} else if (load & IO_SCENE) {		/* consistency checks */
-						/* check object count */
-			if (nobjects != objorig+fnobjects)
-				octerror(USER, "bad object count; octree stale?");
-						/* check for non-surfaces */
-			if (nonsurfinset(objorig, fnobjects))
-				octerror(USER, "non-surface in set; octree stale?");
-		}
+	else if (load & IO_SCENE && nf == 0)
+		skiptree();
+		
+	if (load & IO_SCENE) {		/* get the scene */
+	    if (nf == 0) {
+					/* 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))
+			octerror(USER, "modifier in tree; octree stale?");
+	    }
 	}
-	fclose(infp);
+				/* close the input */
+	if (infn[0] == '!')
+		pclose(infp);
+	else
+		fclose(infp);
 	return(nf);
 }
 
 
 static char *
-getstr(s)			/* get null-terminated string */
+ogetstr(s)			/* get null-terminated string */
 char  *s;
 {
-	register char  *cp;
-	register int  c;
+	extern char  *getstr();
 
-	cp = s;
-	while ((c = getc(infp)) != EOF)
-		if ((*cp++ = c) == '\0')
-			return(s);
-		
-	octerror(USER, "truncated octree");
+	if (getstr(s, infp) == NULL)
+		octerror(USER, "truncated octree");
+	return(s);
 }
 
 
 static OCTREE
 getfullnode()			/* get a set, return fullnode */
 {
-	OBJECT  set[MAXSET+1];
+	OBJECT	set[MAXSET+1];
 	register int  i;
 	register long  m;
 
-	m = getint(objsize);
-	if (m > MAXSET)
+	if ((set[0] = ogetint(objsize)) > MAXSET)
 		octerror(USER, "bad set in getfullnode");
-	set[0] = m;
 	for (i = 1; i <= set[0]; i++) {
-		m = getint(objsize) + objorig;
-		if ((OBJECT)m != m)
+		m = ogetint(objsize) + objorig;
+		if ((set[i] = m) != m)
 			octerror(USER, "too many objects");
-		set[i] = m;
 	}
 	return(fullnode(set));
 }	
 
 
 static long
-getint(siz)			/* get a siz-byte integer */
-register int  siz;
+ogetint(siz)			/* get a siz-byte integer */
+int  siz;
 {
-	register int  c;
+	extern long  getint();
 	register long  r;
 
-	if ((c = getc(infp)) == EOF)
-		goto end_file;
-	r = 0x80&c ? -1<<8|c : c;		/* sign extend */
-	while (--siz > 0) {
-		if ((c = getc(infp)) == EOF)
-			goto end_file;
-		r <<= 8;
-		r |= c;
-	}
+	r = getint(siz, infp);
+	if (feof(infp))
+		octerror(USER, "truncated octree");
 	return(r);
-end_file:
-	octerror(USER, "truncated octree");
 }
 
 
 static double
-getflt()			/* get a floating point number */
+ogetflt()			/* get a floating point number */
 {
-	extern double  ldexp();
-	double  d;
+	extern double  getflt();
+	double	r;
 
-	d = (double)getint(4)/0x7fffffff;
-	return(ldexp(d, (int)getint(1)));
+	r = getflt(infp);
+	if (feof(infp))
+		octerror(USER, "truncated octree");
+	return(r);
 }
 	
 
 static OCTREE
 gettree()			/* get a pre-ordered octree */
 {
-	register OCTREE  ot;
+	register OCTREE	 ot;
 	register int  i;
 	
 	switch (getc(infp)) {
@@ -204,74 +201,51 @@ gettree()			/* get a pre-ordered octree */
 	default:
 		octerror(USER, "damaged octree");
 	}
+	return EMPTY; /* pro forma return */
 }
 
 
-static
-getobj()				/* get next object */
+static int
+nonsurfinset(os)			/* check set for modifier */
+register OBJECT  *os;
 {
-	char  sbuf[MAXSTR];
-	int  obj;
+	register OBJECT  s;
 	register int  i;
-	register long  m;
-	register OBJREC  *objp;
 
-	i = getint(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 = getint(objsize)) != OVOID) {
-		m += objorig;
-		if ((OBJECT)m != m)
-			octerror(USER, "too many objects");
+	for (i = *os; i-- > 0; )
+		if ((s = *++os) >= objorig && s < objorig+fnobjects &&
+				ismodifier(objptr(s)->otype))
+			return(1);
+	return(0);
+}
+
+
+static void
+skiptree(void)				/* skip octree on input */
+{
+	register int  i;
+	
+	switch (getc(infp)) {
+	case OT_EMPTY:
+		return;
+	case OT_FULL:
+		for (i = ogetint(objsize)*objsize; i-- > 0; )
+			if (getc(infp) == EOF)
+				octerror(USER, "truncated octree");
+		return;
+	case OT_TREE:
+		for (i = 0; i < 8; i++)
+			skiptree();
+		return;
+	case EOF:
+		octerror(USER, "truncated octree");
+	default:
+		octerror(USER, "damaged octree");
 	}
-	objp->omod = m;
-	objp->oname = savqstr(getstr(sbuf));
-	if (objp->oargs.nsargs = getint(2)) {
-		objp->oargs.sarg = (char **)bmalloc
-				(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(getstr(sbuf));
-	} else
-		objp->oargs.sarg = NULL;
-#ifdef  IARGS
-	if (objp->oargs.niargs = getint(2)) {
-		objp->oargs.iarg = (long *)bmalloc
-				(objp->oargs.niargs*sizeof(long));
-		if (objp->oargs.iarg == NULL)
-			goto memerr;
-		for (i = 0; i < objp->oargs.niargs; i++)
-			objp->oargs.iarg[i] = getint(4);
-	} else
-		objp->oargs.iarg = NULL;
-#endif
-	if (objp->oargs.nfargs = getint(2)) {
-		objp->oargs.farg = (double *)bmalloc
-				(objp->oargs.nfargs*sizeof(double));
-		if (objp->oargs.farg == NULL)
-			goto memerr;
-		for (i = 0; i < objp->oargs.nfargs; i++)
-			objp->oargs.farg[i] = getflt();
-	} else
-		objp->oargs.farg = NULL;
-						/* initialize */
-	objp->os = NULL;
-	objp->lastrno = -1;
-						/* insert */
-	insertobject(obj);
-	return(obj);
-memerr:
-	error(SYSTEM, "out of memory in getobj");
 }
 
 
-static
+static void
 octerror(etyp, msg)			/* octree error */
 int  etyp;
 char  *msg;