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.4 by greg, Mon Jul 13 15:36:29 1992 UTC vs.
Revision 2.25 by greg, Thu Apr 29 14:36:49 2004 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1991 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	>	#include  <time.h>
12
13	+	#include  "platform.h"
14	+	#include  "rtprocess.h"
15	+	#include  "standard.h"
16	+	#include  "octree.h"
17		#include  "object.h"
18	–
18		#include  "otypes.h"
19	+	#include  "resolu.h"
20
21	<	static double  ogetflt();
22	<	static long  ogetint();
23	<	static char  *ogetstr();
24	<	static int  getobj(), octerror();
25	<	static OCTREE  getfullnode(), gettree();
21	>	#ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
22	>	#define getc    getc_unlocked
23	>	#endif
24
25	<	static char  *infn;                     /* input file name */
25	>	static double  ogetflt(void);
26	>	static long  ogetint(int);
27	>	static char  *ogetstr(char *);
28	>	static int  nonsurfinset(OBJECT *);
29	>	static void  octerror(int  etyp, char  *msg);
30	>	static void  skiptree(void);
31	>	static OCTREE  getfullnode(void), gettree(void);
32	>
33	>	static char  *infn;                     /* input file specification */
34		static FILE  *infp;                     /* input file stream */
35		static int  objsize;                    /* size of stored OBJECT's */
36		static OBJECT  objorig;                 /* zeroeth object */
37	<	static short  otypmap[NUMOTYPE+8];      /* object type map */
37	>	static OBJECT  fnobjects;               /* number of objects in this file */
38
39
40		int
41	<	readoct(fname, load, scene, ofn)        /* read in octree from file */
42	<	char  *fname;
41	>	readoct(inpspec, load, scene, ofn)      /* read in octree file or stream */
42	>	char  *inpspec;
43		int  load;
44		CUBE  *scene;
45		char  *ofn[];
46		{
41	–	extern int  fputs();
47		char  sbuf[512];
48		int  nf;
49	<	OBJECT  fnobjects;
45	<	register int  i;
49	>	int  i;
50		long  m;
51
52	<	if (fname == NULL) {
52	>	if (inpspec == NULL) {
53		infn = "standard input";
54		infp = stdin;
55	+	} else if (inpspec[0] == '!') {
56	+	infn = inpspec;
57	+	if ((infp = popen(inpspec+1, "r")) == NULL) {
58	+	sprintf(errmsg, "cannot execute \"%s\"", inpspec);
59	+	error(SYSTEM, errmsg);
60	+	}
61		} else {
62	<	infn = fname;
63	<	if ((infp = fopen(fname, "r")) == NULL) {
62	>	infn = inpspec;
63	>	if ((infp = fopen(inpspec, "r")) == NULL) {
64		sprintf(errmsg, "cannot open octree file \"%s\"",
65	<	fname);
65	>	inpspec);
66		error(SYSTEM, errmsg);
67		}
68		}
69	+	SET_FILE_BINARY(infp);
70		/* get header */
71	<	if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : NULL) < 0)
71	>	if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0)
72		octerror(USER, "not an octree");
73		/* check format */
74		if ((objsize = ogetint(2)-OCTMAGIC) <= 0 ||
#	Line 88 | Line 99 | char  *ofn[];
99		if (fnobjects != m)
100		octerror(USER, "too many objects");
101
102	<	if (load & IO_TREE) {
92	<	/* get the octree */
102	>	if (load & IO_TREE)             /* get the octree */
103		scene->cutree = gettree();
104	<	if (load & IO_SCENE)            /* get the scene */
105	<	if (nf == 0) {
106	<	for (i = 0; *ogetstr(sbuf); i++)
107	<	if ((otypmap[i] = otype(sbuf)) < 0) {
108	<	sprintf(errmsg, "unknown type \"%s\"",
109	<	sbuf);
110	<	octerror(WARNING, errmsg);
111	<	}
112	<	while (getobj() != OVOID)
113	<	;
114	<	} else {                    /* consistency checks */
115	<	/* check object count */
116	<	if (nobjects != objorig+fnobjects)
117	<	octerror(USER, "bad object count; octree stale?");
118	<	/* check for non-surfaces */
119	<	if (nonsurfinset(objorig, fnobjects))
110	<	octerror(USER, "modifier in tree; octree stale?");
111	<	}
104	>	else if (load & IO_SCENE && nf == 0)
105	>	skiptree();
106	>
107	>	if (load & IO_SCENE) {          /* get the scene */
108	>	if (nf == 0) {
109	>	/* load binary scene data */
110	>	readscene(infp, objsize);
111	>
112	>	} else {                    /* consistency checks */
113	>	/* check object count */
114	>	if (nobjects != objorig+fnobjects)
115	>	octerror(USER, "bad object count; octree stale?");
116	>	/* check for non-surfaces */
117	>	if (dosets(nonsurfinset))
118	>	octerror(USER, "modifier in tree; octree stale?");
119	>	}
120		}
121	<	fclose(infp);
121	>	/* close the input */
122	>	if (infn[0] == '!')
123	>	pclose(infp);
124	>	else
125	>	fclose(infp);
126		return(nf);
127		}
128
#	Line 130 | Line 142 | char  *s;
142		static OCTREE
143		getfullnode()                   /* get a set, return fullnode */
144		{
145	<	OBJECT  set[MAXSET+1];
145	>	OBJECT  set[MAXSET+1];
146		register int  i;
147		register long  m;
148
#	Line 163 | Line 175 | static double
175		ogetflt()                       /* get a floating point number */
176		{
177		extern double  getflt();
178	<	double  r;
178	>	double  r;
179
180		r = getflt(infp);
181		if (feof(infp))
#	Line 175 | Line 187 | ogetflt()                      /* get a floating point number */
187		static OCTREE
188		gettree()                       /* get a pre-ordered octree */
189		{
190	<	register OCTREE  ot;
190	>	register OCTREE  ot;
191		register int  i;
192
193		switch (getc(infp)) {
#	Line 194 | Line 206 | gettree()                      /* get a pre-ordered octree */
206		default:
207		octerror(USER, "damaged octree");
208		}
209	+	return EMPTY; /* pro forma return */
210		}
211
212
213	<	static
214	<	getobj()                                /* get next object */
213	>	static int
214	>	nonsurfinset(os)                        /* check set for modifier */
215	>	register OBJECT  *os;
216		{
217	<	char  sbuf[MAXSTR];
204	<	int  obj;
217	>	register OBJECT  s;
218		register int  i;
206	–	register long  m;
207	–	register OBJREC  *objp;
219
220	<	i = ogetint(1);
221	<	if (i == -1)
222	<	return(OVOID);          /* terminator */
223	<	if ((obj = newobject()) == OVOID)
224	<	error(SYSTEM, "out of object space");
225	<	objp = objptr(obj);
226	<	if ((objp->otype = otypmap[i]) < 0)
227	<	octerror(USER, "reference to unknown type");
228	<	if ((m = ogetint(objsize)) != OVOID) {
229	<	m += objorig;
230	<	if ((OBJECT)m != m)
231	<	octerror(USER, "too many objects");
220	>	for (i = *os; i-- > 0; )
221	>	if ((s = *++os) >= objorig && s < objorig+fnobjects &&
222	>	ismodifier(objptr(s)->otype))
223	>	return(1);
224	>	return(0);
225	>	}
226	>
227	>
228	>	static void
229	>	skiptree(void)                          /* skip octree on input */
230	>	{
231	>	register int  i;
232	>
233	>	switch (getc(infp)) {
234	>	case OT_EMPTY:
235	>	return;
236	>	case OT_FULL:
237	>	for (i = ogetint(objsize)*objsize; i-- > 0; )
238	>	if (getc(infp) == EOF)
239	>	octerror(USER, "truncated octree");
240	>	return;
241	>	case OT_TREE:
242	>	for (i = 0; i < 8; i++)
243	>	skiptree();
244	>	return;
245	>	case EOF:
246	>	octerror(USER, "truncated octree");
247	>	default:
248	>	octerror(USER, "damaged octree");
249		}
222	–	objp->omod = m;
223	–	objp->oname = savqstr(ogetstr(sbuf));
224	–	if (objp->oargs.nsargs = ogetint(2)) {
225	–	objp->oargs.sarg = (char **)bmalloc
226	–	(objp->oargs.nsargs*sizeof(char *));
227	–	if (objp->oargs.sarg == NULL)
228	–	goto memerr;
229	–	for (i = 0; i < objp->oargs.nsargs; i++)
230	–	objp->oargs.sarg[i] = savestr(ogetstr(sbuf));
231	–	} else
232	–	objp->oargs.sarg = NULL;
233	–	#ifdef  IARGS
234	–	if (objp->oargs.niargs = ogetint(2)) {
235	–	objp->oargs.iarg = (long *)bmalloc
236	–	(objp->oargs.niargs*sizeof(long));
237	–	if (objp->oargs.iarg == NULL)
238	–	goto memerr;
239	–	for (i = 0; i < objp->oargs.niargs; i++)
240	–	objp->oargs.iarg[i] = ogetint(4);
241	–	} else
242	–	objp->oargs.iarg = NULL;
243	–	#endif
244	–	if (objp->oargs.nfargs = ogetint(2)) {
245	–	objp->oargs.farg = (FLOAT *)bmalloc
246	–	(objp->oargs.nfargs*sizeof(FLOAT));
247	–	if (objp->oargs.farg == NULL)
248	–	goto memerr;
249	–	for (i = 0; i < objp->oargs.nfargs; i++)
250	–	objp->oargs.farg[i] = ogetflt();
251	–	} else
252	–	objp->oargs.farg = NULL;
253	–	/* initialize */
254	–	objp->os = NULL;
255	–	objp->lastrno = -1;
256	–	/* insert */
257	–	insertobject(obj);
258	–	return(obj);
259	–	memerr:
260	–	error(SYSTEM, "out of memory in getobj");
250		}
251
252
253	<	static
253	>	static void
254		octerror(etyp, msg)                     /* octree error */
255		int  etyp;
256		char  *msg;

Diff Legend

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