ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/readoct.c

Comparing ray/src/common/readoct.c (file contents):
Revision 2.8 by greg, Mon Jan 25 12:42:39 1993 UTC vs.
Revision 2.18 by schorsch, Sun Jun 8 12:03:09 2003 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1992 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		*  readoct.c - routines to read octree information.
9	–	*
10	–	*     7/30/85
6		*/
7
8	<	#include  "standard.h"
8	>	#include "copyright.h"
9
10	<	#include  "octree.h"
10	>	#include  <stdio.h>
11
12	+	#include  "standard.h"
13	+	#include  "platform.h"
14	+	#include  "octree.h"
15		#include  "object.h"
18	–
16		#include  "otypes.h"
17	+	#include  "resolu.h"
18
19		static double  ogetflt();
20		static long  ogetint();
21		static char  *ogetstr();
22	<	static int  getobj(), octerror();
22	>	static int  nonsurfinset();
23	>	static void  octerror(int  etyp, char  *msg);
24	>	static void  skiptree(void);
25		static OCTREE  getfullnode(), gettree();
26
27	<	static char  *infn;                     /* input file name */
27	>	static char  *infn;                     /* input file specification */
28		static FILE  *infp;                     /* input file stream */
29		static int  objsize;                    /* size of stored OBJECT's */
30		static OBJECT  objorig;                 /* zeroeth object */
31	<	static short  otypmap[NUMOTYPE+8];      /* object type map */
31	>	static OBJECT  fnobjects;               /* number of objects in this file */
32
33
34		int
35	<	readoct(fname, load, scene, ofn)        /* read in octree from file */
36	<	char  *fname;
35	>	readoct(inpspec, load, scene, ofn)      /* read in octree file or stream */
36	>	char  *inpspec;
37		int  load;
38		CUBE  *scene;
39		char  *ofn[];
40		{
41	–	extern int  fputs();
41		char  sbuf[512];
42		int  nf;
43	<	OBJECT  fnobjects;
45	<	register int  i;
43	>	int  i;
44		long  m;
45
46	<	if (fname == NULL) {
46	>	if (inpspec == NULL) {
47		infn = "standard input";
48		infp = stdin;
49	+	} else if (inpspec[0] == '!') {
50	+	infn = inpspec;
51	+	if ((infp = popen(inpspec+1, "r")) == NULL) {
52	+	sprintf(errmsg, "cannot execute \"%s\"", inpspec);
53	+	error(SYSTEM, errmsg);
54	+	}
55		} else {
56	<	infn = fname;
57	<	if ((infp = fopen(fname, "r")) == NULL) {
56	>	infn = inpspec;
57	>	if ((infp = fopen(inpspec, "r")) == NULL) {
58		sprintf(errmsg, "cannot open octree file \"%s\"",
59	<	fname);
59	>	inpspec);
60		error(SYSTEM, errmsg);
61		}
62		}
63	<	#ifdef MSDOS
60	<	setmode(fileno(infp), O_BINARY);
61	<	#endif
63	>	SET_FILE_BINARY(infp);
64		/* get header */
65	<	if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : NULL) < 0)
65	>	if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0)
66		octerror(USER, "not an octree");
67		/* check format */
68		if ((objsize = ogetint(2)-OCTMAGIC) <= 0 ||
#	Line 91 | Line 93 | char  *ofn[];
93		if (fnobjects != m)
94		octerror(USER, "too many objects");
95
96	<	if (load & IO_TREE)                     /* get the octree */
96	>	if (load & IO_TREE)             /* get the octree */
97		scene->cutree = gettree();
98		else if (load & IO_SCENE && nf == 0)
99		skiptree();
100
101		if (load & IO_SCENE)            /* get the scene */
102		if (nf == 0) {
103	<	for (i = 0; *ogetstr(sbuf); i++)
104	<	if ((otypmap[i] = otype(sbuf)) < 0) {
105	<	sprintf(errmsg, "unknown type \"%s\"", sbuf);
104	<	octerror(WARNING, errmsg);
105	<	}
106	<	while (getobj() != OVOID)
107	<	;
103	>	/* load binary scene data */
104	>	readscene(infp, objsize);
105	>
106		} else {                    /* consistency checks */
107		/* check object count */
108		if (nobjects != objorig+fnobjects)
109		octerror(USER, "bad object count; octree stale?");
110		/* check for non-surfaces */
111	<	if (nonsurfinset(objorig, fnobjects))
111	>	if (dosets(nonsurfinset))
112		octerror(USER, "modifier in tree; octree stale?");
113		}
114	<	fclose(infp);
114	>	/* close the input */
115	>	if (infn[0] == '!')
116	>	pclose(infp);
117	>	else
118	>	fclose(infp);
119		return(nf);
120		}
121
#	Line 197 | Line 199 | gettree()                      /* get a pre-ordered octree */
199		default:
200		octerror(USER, "damaged octree");
201		}
202	+	return NULL; /* pro forma return */
203		}
204
205
206	<	static
207	<	skiptree()                              /* skip octree on input */
206	>	static int
207	>	nonsurfinset(os)                        /* check set for modifier */
208	>	register OBJECT  *os;
209		{
210	+	register OBJECT  s;
211		register int  i;
212	+
213	+	for (i = *os; i-- > 0; )
214	+	if ((s = *++os) >= objorig && s < objorig+fnobjects &&
215	+	ismodifier(objptr(s)->otype))
216	+	return(1);
217	+	return(0);
218	+	}
219	+
220	+
221	+	static void
222	+	skiptree(void)                          /* skip octree on input */
223	+	{
224	+	register int  i;
225
226		switch (getc(infp)) {
227		case OT_EMPTY:
#	Line 225 | Line 243 | skiptree()                             /* skip octree on input */
243		}
244
245
246	<	static
229	<	getobj()                                /* get next object */
230	<	{
231	<	char  sbuf[MAXSTR];
232	<	int  obj;
233	<	register int  i;
234	<	register long  m;
235	<	register OBJREC  *objp;
236	<
237	<	i = ogetint(1);
238	<	if (i == -1)
239	<	return(OVOID);          /* terminator */
240	<	if ((obj = newobject()) == OVOID)
241	<	error(SYSTEM, "out of object space");
242	<	objp = objptr(obj);
243	<	if ((objp->otype = otypmap[i]) < 0)
244	<	octerror(USER, "reference to unknown type");
245	<	if ((m = ogetint(objsize)) != OVOID) {
246	<	m += objorig;
247	<	if ((OBJECT)m != m)
248	<	octerror(USER, "too many objects");
249	<	}
250	<	objp->omod = m;
251	<	objp->oname = savqstr(ogetstr(sbuf));
252	<	if (objp->oargs.nsargs = ogetint(2)) {
253	<	objp->oargs.sarg = (char **)bmalloc
254	<	(objp->oargs.nsargs*sizeof(char *));
255	<	if (objp->oargs.sarg == NULL)
256	<	goto memerr;
257	<	for (i = 0; i < objp->oargs.nsargs; i++)
258	<	objp->oargs.sarg[i] = savestr(ogetstr(sbuf));
259	<	} else
260	<	objp->oargs.sarg = NULL;
261	<	#ifdef  IARGS
262	<	if (objp->oargs.niargs = ogetint(2)) {
263	<	objp->oargs.iarg = (long *)bmalloc
264	<	(objp->oargs.niargs*sizeof(long));
265	<	if (objp->oargs.iarg == NULL)
266	<	goto memerr;
267	<	for (i = 0; i < objp->oargs.niargs; i++)
268	<	objp->oargs.iarg[i] = ogetint(4);
269	<	} else
270	<	objp->oargs.iarg = NULL;
271	<	#endif
272	<	if (objp->oargs.nfargs = ogetint(2)) {
273	<	objp->oargs.farg = (FLOAT *)bmalloc
274	<	(objp->oargs.nfargs*sizeof(FLOAT));
275	<	if (objp->oargs.farg == NULL)
276	<	goto memerr;
277	<	for (i = 0; i < objp->oargs.nfargs; i++)
278	<	objp->oargs.farg[i] = ogetflt();
279	<	} else
280	<	objp->oargs.farg = NULL;
281	<	/* initialize */
282	<	objp->os = NULL;
283	<	/* insert */
284	<	insertobject(obj);
285	<	return(obj);
286	<	memerr:
287	<	error(SYSTEM, "out of memory in getobj");
288	<	}
289	<
290	<
291	<	static
246	>	static void
247		octerror(etyp, msg)                     /* octree error */
248		int  etyp;
249		char  *msg;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)