10 |
|
#include <stdio.h> |
11 |
|
#include <time.h> |
12 |
|
|
13 |
– |
#include "standard.h" |
13 |
|
#include "platform.h" |
14 |
+ |
#include "paths.h" |
15 |
+ |
#include "standard.h" |
16 |
|
#include "octree.h" |
17 |
|
#include "object.h" |
18 |
|
#include "otypes.h" |
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); |
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; |
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) |
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) |
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 |
|
/* load binary scene data */ |
118 |
|
readscene(infp, objsize); |
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 |
132 |
> |
else if (infp != stdin) |
133 |
|
fclose(infp); |
134 |
+ |
#ifdef getc_unlocked |
135 |
+ |
else |
136 |
+ |
funlockfile(infp); |
137 |
+ |
#endif |
138 |
|
return(nf); |
139 |
|
} |
140 |
|
|
141 |
|
|
142 |
|
static char * |
143 |
< |
ogetstr(s) /* get null-terminated string */ |
126 |
< |
char *s; |
143 |
> |
ogetstr(char *s) /* get null-terminated string */ |
144 |
|
{ |
145 |
|
extern char *getstr(); |
146 |
|
|
169 |
|
|
170 |
|
|
171 |
|
static long |
172 |
< |
ogetint(siz) /* get a siz-byte integer */ |
156 |
< |
int siz; |
172 |
> |
ogetint(int siz) /* get a siz-byte integer */ |
173 |
|
{ |
174 |
|
extern long getint(); |
175 |
|
register long r; |
216 |
|
default: |
217 |
|
octerror(USER, "damaged octree"); |
218 |
|
} |
219 |
< |
return NULL; /* pro forma return */ |
219 |
> |
return EMPTY; /* pro forma return */ |
220 |
|
} |
221 |
|
|
222 |
|
|
223 |
|
static int |
224 |
< |
nonsurfinset(os) /* check set for modifier */ |
209 |
< |
register OBJECT *os; |
224 |
> |
nonsurfintree(OCTREE ot) /* check tree for modifiers */ |
225 |
|
{ |
226 |
< |
register OBJECT s; |
226 |
> |
OBJECT set[MAXSET+1]; |
227 |
|
register int i; |
228 |
|
|
229 |
< |
for (i = *os; i-- > 0; ) |
230 |
< |
if ((s = *++os) >= objorig && s < objorig+fnobjects && |
231 |
< |
ismodifier(objptr(s)->otype)) |
229 |
> |
if (isempty(ot)) |
230 |
> |
return(0); |
231 |
> |
if (istree(ot)) { |
232 |
> |
for (i = 0; i < 8; i++) |
233 |
> |
if (nonsurfintree(octkid(ot, i))) |
234 |
> |
return(1); |
235 |
> |
return(0); |
236 |
> |
} |
237 |
> |
objset(set, ot); |
238 |
> |
for (i = set[0]; i > 0; i-- ) |
239 |
> |
if (ismodifier(objptr(set[i])->otype)) |
240 |
|
return(1); |
241 |
|
return(0); |
242 |
|
} |
268 |
|
|
269 |
|
|
270 |
|
static void |
271 |
< |
octerror(etyp, msg) /* octree error */ |
249 |
< |
int etyp; |
250 |
< |
char *msg; |
271 |
> |
octerror(int etyp, char *msg) /* octree error */ |
272 |
|
{ |
273 |
|
char msgbuf[128]; |
274 |
|
|