| 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 |
|
char sbuf[512]; |
| 45 |
|
int nf; |
| 63 |
|
error(SYSTEM, errmsg); |
| 64 |
|
} |
| 65 |
|
} |
| 66 |
+ |
#ifdef getc_unlocked /* avoid stupid semaphores */ |
| 67 |
+ |
flockfile(infp); |
| 68 |
+ |
#endif |
| 69 |
|
SET_FILE_BINARY(infp); |
| 70 |
|
/* get header */ |
| 71 |
|
if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0) |
| 114 |
|
if (nobjects != objorig+fnobjects) |
| 115 |
|
octerror(USER, "bad object count; octree stale?"); |
| 116 |
|
/* check for non-surfaces */ |
| 117 |
< |
if (dosets(nonsurfinset)) |
| 117 |
> |
if (nonsurfintree(scene->cutree)) |
| 118 |
|
octerror(USER, "modifier in tree; octree stale?"); |
| 119 |
|
} |
| 120 |
|
} |
| 121 |
|
/* close the input */ |
| 122 |
|
if (infn[0] == '!') |
| 123 |
|
pclose(infp); |
| 124 |
< |
else |
| 124 |
> |
else if (infp != stdin) |
| 125 |
|
fclose(infp); |
| 126 |
+ |
#ifdef getc_unlocked |
| 127 |
+ |
else |
| 128 |
+ |
funlockfile(infp); |
| 129 |
+ |
#endif |
| 130 |
|
return(nf); |
| 131 |
|
} |
| 132 |
|
|
| 133 |
|
|
| 134 |
|
static char * |
| 135 |
< |
ogetstr(s) /* get null-terminated string */ |
| 127 |
< |
char *s; |
| 135 |
> |
ogetstr(char *s) /* get null-terminated string */ |
| 136 |
|
{ |
| 137 |
|
extern char *getstr(); |
| 138 |
|
|
| 161 |
|
|
| 162 |
|
|
| 163 |
|
static long |
| 164 |
< |
ogetint(siz) /* get a siz-byte integer */ |
| 157 |
< |
int siz; |
| 164 |
> |
ogetint(int siz) /* get a siz-byte integer */ |
| 165 |
|
{ |
| 166 |
|
extern long getint(); |
| 167 |
|
register long r; |
| 213 |
|
|
| 214 |
|
|
| 215 |
|
static int |
| 216 |
< |
nonsurfinset(os) /* check set for modifier */ |
| 210 |
< |
register OBJECT *os; |
| 216 |
> |
nonsurfintree(OCTREE ot) /* check tree for modifiers */ |
| 217 |
|
{ |
| 218 |
< |
register OBJECT s; |
| 218 |
> |
OBJECT set[MAXSET+1]; |
| 219 |
|
register int i; |
| 220 |
|
|
| 221 |
< |
for (i = *os; i-- > 0; ) |
| 222 |
< |
if ((s = *++os) >= objorig && s < objorig+fnobjects && |
| 223 |
< |
ismodifier(objptr(s)->otype)) |
| 221 |
> |
if (isempty(ot)) |
| 222 |
> |
return(0); |
| 223 |
> |
if (istree(ot)) { |
| 224 |
> |
for (i = 0; i < 8; i++) |
| 225 |
> |
if (nonsurfintree(octkid(ot, i))) |
| 226 |
> |
return(1); |
| 227 |
> |
return(0); |
| 228 |
> |
} |
| 229 |
> |
objset(set, ot); |
| 230 |
> |
for (i = set[0]; i > 0; i-- ) |
| 231 |
> |
if (ismodifier(objptr(set[i])->otype)) |
| 232 |
|
return(1); |
| 233 |
|
return(0); |
| 234 |
|
} |
| 260 |
|
|
| 261 |
|
|
| 262 |
|
static void |
| 263 |
< |
octerror(etyp, msg) /* octree error */ |
| 250 |
< |
int etyp; |
| 251 |
< |
char *msg; |
| 263 |
> |
octerror(int etyp, char *msg) /* octree error */ |
| 264 |
|
{ |
| 265 |
|
char msgbuf[128]; |
| 266 |
|
|
