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.14 by greg, Tue Feb 25 02:47:21 2003 UTC vs.
Revision 2.34 by greg, Tue Apr 22 04:45:25 2025 UTC

#	Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7
8		#include "copyright.h"
9
10	<	#include  "standard.h"
10	>	#include  <stdio.h>
11	>	#include  <time.h>
12
13	+	#include  "platform.h"
14	+	#include  "paths.h"
15	+	#include  "standard.h"
16		#include  "octree.h"
13	–
17		#include  "object.h"
15	–
18		#include  "otypes.h"
19	+	#include  "resolu.h"
20
21	<	static double  ogetflt();
22	<	static long  ogetint();
23	<	static char  *ogetstr();
24	<	static int  nonsurfinset();
25	<	static int  getobj(), octerror(), skiptree();
26	<	static OCTREE  getfullnode(), gettree();
21	>	static double  ogetflt(void);
22	>	static long  ogetint(int);
23	>	static char  *ogetstr(char *);
24	>	static int  nonsurfintree(OCTREE ot);
25	>	static void  octerror(int  etyp, char  *msg);
26	>	static void  skiptree(void);
27	>	static OCTREE  getfullnode(void), gettree(void);
28
29		static char  *infn;                     /* input file specification */
30		static FILE  *infp;                     /* input file stream */
31		static int  objsize;                    /* size of stored OBJECT's */
32		static OBJECT  objorig;                 /* zeroeth object */
33		static OBJECT  fnobjects;               /* number of objects in this file */
30	–	static short  otypmap[NUMOTYPE+8];      /* object type map */
34
35
36		int
37	<	readoct(inpspec, load, scene, ofn)      /* read in octree file or stream */
38	<	char  *inpspec;
39	<	int  load;
40	<	CUBE  *scene;
41	<	char  *ofn[];
37	>	readoct(                                /* read in octree file or stream */
38	>	char  *inpspec,
39	>	int  load,
40	>	CUBE  *scene,
41	>	char  *ofn[]
42	>	)
43		{
44	+	time_t  oct_t = 0;
45	+	time_t  last_it = 0;
46		char  sbuf[512];
47		int  nf;
48	<	register int  i;
48	>	int  i;
49		long  m;
50
51		if (inpspec == NULL) {
#	Line 58 | Line 64 | char  *ofn[];
64		inpspec);
65		error(SYSTEM, errmsg);
66		}
67	+	oct_t = fddate(fileno(infp));
68		}
69	<	#ifdef MSDOS
70	<	setmode(fileno(infp), O_BINARY);
69	>	#ifdef getc_unlocked                    /* avoid stupid semaphores */
70	>	flockfile(infp);
71		#endif
72	+	SET_FILE_BINARY(infp);
73		/* get header */
74		if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0)
75		octerror(USER, "not an octree");
#	Line 85 | Line 93 | char  *ofn[];
93		readobj(sbuf);
94		if (load & IO_FILES)
95		ofn[nf] = savqstr(sbuf);
96	+	if (oct_t > last_it) {
97	+	time_t  t = fdate(sbuf);
98	+	if (t > last_it)
99	+	last_it = t;
100	+	}
101		nf++;
102		}
103		if (load & IO_FILES)
#	Line 99 | Line 112 | char  *ofn[];
112		else if (load & IO_SCENE && nf == 0)
113		skiptree();
114
115	<	if (load & IO_SCENE)            /* get the scene */
115	>	if (load & IO_SCENE) {          /* get the scene */
116		if (nf == 0) {
117	<	for (i = 0; *ogetstr(sbuf); i++)
118	<	if ((otypmap[i] = otype(sbuf)) < 0) {
119	<	sprintf(errmsg, "unknown type \"%s\"", sbuf);
107	<	octerror(WARNING, errmsg);
108	<	}
109	<	while (getobj() != OVOID)
110	<	;
117	>	/* load binary scene data */
118	>	readscene(infp, objsize);
119	>
120		} else {                    /* consistency checks */
121		/* check object count */
122		if (nobjects != objorig+fnobjects)
123		octerror(USER, "bad object count; octree stale?");
124		/* check for non-surfaces */
125	<	if (dosets(nonsurfinset))
125	>	if (oct_t <= last_it && nonsurfintree(scene->cutree))
126		octerror(USER, "modifier in tree; octree stale?");
127		}
128	+	}
129		/* close the input */
130	<	if (infn[0] == '!')
131	<	pclose(infp);
132	<	else
130	>	if (inpspec[0] == '!') {
131	>	if (pclose(infp) != 0) {
132	>	sprintf(errmsg, "bad status from \"%s\"", inpspec);
133	>	error(USER, errmsg);
134	>	}
135	>	} else if (infp != stdin)
136		fclose(infp);
137	+	#ifdef getc_unlocked
138	+	else
139	+	funlockfile(infp);
140	+	#endif
141		return(nf);
142		}
143
144
145		static char *
146	<	ogetstr(s)                      /* get null-terminated string */
130	<	char  *s;
146	>	ogetstr(char *s)                /* get null-terminated string */
147		{
148		extern char  *getstr();
149
#	Line 156 | Line 172 | getfullnode()                  /* get a set, return fullnode */
172
173
174		static long
175	<	ogetint(siz)                    /* get a siz-byte integer */
160	<	int  siz;
175	>	ogetint(int siz)                /* get a siz-byte integer */
176		{
177		extern long  getint();
178		register long  r;
#	Line 204 | Line 219 | gettree()                      /* get a pre-ordered octree */
219		default:
220		octerror(USER, "damaged octree");
221		}
222	+	return EMPTY; /* pro forma return */
223		}
224
225
226		static int
227	<	nonsurfinset(os)                        /* check set for modifier */
212	<	register OBJECT  *os;
227	>	nonsurfintree(OCTREE ot)                /* check tree for modifiers */
228		{
229	<	register OBJECT  s;
229	>	OBJECT  set[MAXSET+1];
230		register int  i;
231
232	<	for (i = *os; i-- > 0; )
233	<	if ((s = *++os) >= objorig && s < objorig+fnobjects &&
234	<	ismodifier(objptr(s)->otype))
232	>	if (isempty(ot))
233	>	return(0);
234	>	if (istree(ot)) {
235	>	for (i = 0; i < 8; i++)
236	>	if (nonsurfintree(octkid(ot, i)))
237	>	return(1);
238	>	return(0);
239	>	}
240	>	objset(set, ot);
241	>	for (i = set[0]; i > 0; i-- )
242	>	if (ismodifier(objptr(set[i])->otype))
243		return(1);
244		return(0);
245		}
246
247
248	<	static
249	<	skiptree()                              /* skip octree on input */
248	>	static void
249	>	skiptree(void)                          /* skip octree on input */
250		{
251		register int  i;
252
#	Line 247 | Line 270 | skiptree()                             /* skip octree on input */
270		}
271
272
273	<	static
274	<	getobj()                                /* get next object */
252	<	{
253	<	char  sbuf[MAXSTR];
254	<	int  obj;
255	<	register int  i;
256	<	register long  m;
257	<	register OBJREC  *objp;
258	<
259	<	i = ogetint(1);
260	<	if (i == -1)
261	<	return(OVOID);          /* terminator */
262	<	if ((obj = newobject()) == OVOID)
263	<	error(SYSTEM, "out of object space");
264	<	objp = objptr(obj);
265	<	if ((objp->otype = otypmap[i]) < 0)
266	<	octerror(USER, "reference to unknown type");
267	<	if ((m = ogetint(objsize)) != OVOID) {
268	<	m += objorig;
269	<	if ((OBJECT)m != m)
270	<	octerror(USER, "too many objects");
271	<	}
272	<	objp->omod = m;
273	<	objp->oname = savqstr(ogetstr(sbuf));
274	<	if (objp->oargs.nsargs = ogetint(2)) {
275	<	objp->oargs.sarg = (char **)malloc
276	<	(objp->oargs.nsargs*sizeof(char *));
277	<	if (objp->oargs.sarg == NULL)
278	<	goto memerr;
279	<	for (i = 0; i < objp->oargs.nsargs; i++)
280	<	objp->oargs.sarg[i] = savestr(ogetstr(sbuf));
281	<	} else
282	<	objp->oargs.sarg = NULL;
283	<	#ifdef  IARGS
284	<	if (objp->oargs.niargs = ogetint(2)) {
285	<	objp->oargs.iarg = (long *)malloc
286	<	(objp->oargs.niargs*sizeof(long));
287	<	if (objp->oargs.iarg == NULL)
288	<	goto memerr;
289	<	for (i = 0; i < objp->oargs.niargs; i++)
290	<	objp->oargs.iarg[i] = ogetint(4);
291	<	} else
292	<	objp->oargs.iarg = NULL;
293	<	#endif
294	<	if (objp->oargs.nfargs = ogetint(2)) {
295	<	objp->oargs.farg = (FLOAT *)malloc
296	<	(objp->oargs.nfargs*sizeof(FLOAT));
297	<	if (objp->oargs.farg == NULL)
298	<	goto memerr;
299	<	for (i = 0; i < objp->oargs.nfargs; i++)
300	<	objp->oargs.farg[i] = ogetflt();
301	<	} else
302	<	objp->oargs.farg = NULL;
303	<	/* initialize */
304	<	objp->os = NULL;
305	<	/* insert */
306	<	insertobject(obj);
307	<	return(obj);
308	<	memerr:
309	<	error(SYSTEM, "out of memory in getobj");
310	<	}
311	<
312	<
313	<	static
314	<	octerror(etyp, msg)                     /* octree error */
315	<	int  etyp;
316	<	char  *msg;
273	>	static void
274	>	octerror(int etyp, char *msg)           /* octree error */
275		{
276		char  msgbuf[128];
277

Diff Legend

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