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.23 by greg, Wed Oct 22 02:06:34 2003 UTC vs.
Revision 2.36 by greg, Wed Apr 23 01:57:04 2025 UTC

#	Line 11 | Line 11 | static const char      RCSid[] = "$Id$";
11		#include  <time.h>
12
13		#include  "platform.h"
14	+	#include  "paths.h"
15		#include  "standard.h"
16		#include  "octree.h"
17		#include  "object.h"
#	Line 20 | Line 21 | static const char      RCSid[] = "$Id$";
21		static double  ogetflt(void);
22		static long  ogetint(int);
23		static char  *ogetstr(char *);
24	<	static int  nonsurfinset(OBJECT *);
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);
#	Line 33 | Line 34 | static OBJECT  fnobjects;              /* number of objects in thi
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		int  i;
#	Line 60 | Line 64 | char  *ofn[];
64		inpspec);
65		error(SYSTEM, errmsg);
66		}
67	+	oct_t = fddate(fileno(infp));
68		}
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)
#	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 109 | Line 122 | char  *ofn[];
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(WARNING, 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 */
127	<	char  *s;
146	>	ogetstr(char *s)                /* get null-terminated string */
147		{
129	–	extern char  *getstr();
130	–
148		if (getstr(s, infp) == NULL)
149		octerror(USER, "truncated octree");
150		return(s);
#	Line 138 | Line 155 | static OCTREE
155		getfullnode()                   /* get a set, return fullnode */
156		{
157		OBJECT  set[MAXSET+1];
158	<	register int  i;
159	<	register long  m;
158	>	int  i;
159	>	long  m;
160
161		if ((set[0] = ogetint(objsize)) > MAXSET)
162		octerror(USER, "bad set in getfullnode");
#	Line 153 | Line 170 | getfullnode()                  /* get a set, return fullnode */
170
171
172		static long
173	<	ogetint(siz)                    /* get a siz-byte integer */
157	<	int  siz;
173	>	ogetint(int siz)                /* get a siz-byte integer */
174		{
175	<	extern long  getint();
160	<	register long  r;
175	>	long  r;
176
177		r = getint(siz, infp);
178		if (feof(infp))
#	Line 169 | Line 184 | int  siz;
184		static double
185		ogetflt()                       /* get a floating point number */
186		{
172	–	extern double  getflt();
187		double  r;
188
189		r = getflt(infp);
#	Line 182 | Line 196 | ogetflt()                      /* get a floating point number */
196		static OCTREE
197		gettree()                       /* get a pre-ordered octree */
198		{
199	<	register OCTREE  ot;
200	<	register int  i;
199	>	OCTREE   ot;
200	>	int  i;
201
202		switch (getc(infp)) {
203		case OT_EMPTY:
#	Line 206 | Line 220 | gettree()                      /* get a pre-ordered octree */
220
221
222		static int
223	<	nonsurfinset(os)                        /* check set for modifier */
210	<	register OBJECT  *os;
223	>	nonsurfintree(OCTREE ot)                /* check tree for modifiers */
224		{
225	<	register OBJECT  s;
226	<	register int  i;
225	>	OBJECT  set[MAXSET+1];
226	>	int  i;
227
228	<	for (i = *os; i-- > 0; )
229	<	if ((s = *++os) >= objorig && s < objorig+fnobjects &&
230	<	ismodifier(objptr(s)->otype))
228	>	if (isempty(ot))
229	>	return(0);
230	>	if (istree(ot)) {
231	>	for (i = 0; i < 8; i++)
232	>	if (nonsurfintree(octkid(ot, i)))
233	>	return(1);
234	>	return(0);
235	>	}
236	>	objset(set, ot);
237	>	for (i = set[0]; i > 0; i-- )
238	>	if (ismodifier(objptr(set[i])->otype))
239		return(1);
240		return(0);
241		}
#	Line 223 | Line 244 | register OBJECT  *os;
244		static void
245		skiptree(void)                          /* skip octree on input */
246		{
247	<	register int  i;
247	>	int  i;
248
249		switch (getc(infp)) {
250		case OT_EMPTY:
#	Line 246 | Line 267 | skiptree(void)                         /* skip octree on input */
267
268
269		static void
270	<	octerror(etyp, msg)                     /* octree error */
250	<	int  etyp;
251	<	char  *msg;
270	>	octerror(int etyp, char *msg)           /* octree error */
271		{
272		char  msgbuf[128];
273

Diff Legend

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