| 59 |
|
|
| 60 |
|
for (i = 1; i < argc && argv[i][0] == '-'; i++) |
| 61 |
|
switch (argv[i][1]) { |
| 62 |
+ |
case '\0': /* scene from stdin */ |
| 63 |
+ |
goto breakopt; |
| 64 |
|
case 'i': /* input octree */ |
| 65 |
|
infile = argv[++i]; |
| 66 |
|
break; |
| 87 |
|
error(USER, errmsg); |
| 88 |
|
break; |
| 89 |
|
} |
| 90 |
< |
|
| 90 |
> |
breakopt: |
| 91 |
|
if (infile != NULL) { /* get old octree & objects */ |
| 92 |
|
if (thescene.cusize > FTINY) |
| 93 |
|
error(USER, "only one of '-b' or '-i'"); |
| 103 |
|
|
| 104 |
|
startobj = nobjects; /* previous objects already converted */ |
| 105 |
|
|
| 106 |
< |
for ( ; i < argc; i++) { /* read new files */ |
| 107 |
< |
if (nfiles >= MAXOBJFIL) |
| 108 |
< |
error(INTERNAL, "too many scene files"); |
| 109 |
< |
readobj(ofname[nfiles++] = argv[i]); |
| 110 |
< |
} |
| 106 |
> |
for ( ; i < argc; i++) /* read new scene descriptions */ |
| 107 |
> |
if (!strcmp(argv[i], "-")) { /* from stdin */ |
| 108 |
> |
readobj(NULL); |
| 109 |
> |
outflags &= ~IO_FILES; |
| 110 |
> |
} else { /* from file */ |
| 111 |
> |
if (nfiles >= MAXOBJFIL) |
| 112 |
> |
error(INTERNAL, "too many scene files"); |
| 113 |
> |
readobj(ofname[nfiles++] = argv[i]); |
| 114 |
> |
} |
| 115 |
> |
|
| 116 |
|
ofname[nfiles] = NULL; |
| 117 |
|
/* find bounding box */ |
| 118 |
|
bbmin[0] = bbmin[1] = bbmin[2] = FHUGE; |
| 126 |
|
bbmin[i] -= OMARGIN; |
| 127 |
|
bbmax[i] += OMARGIN; |
| 128 |
|
} |
| 122 |
– |
VCOPY(thescene.cuorg, bbmin); |
| 129 |
|
for (i = 0; i < 3; i++) |
| 130 |
|
if (bbmax[i] - bbmin[i] > thescene.cusize) |
| 131 |
|
thescene.cusize = bbmax[i] - bbmin[i]; |
| 132 |
+ |
for (i = 0; i < 3; i++) |
| 133 |
+ |
thescene.cuorg[i] = |
| 134 |
+ |
(bbmax[i]+bbmin[i]-thescene.cusize)*.5; |
| 135 |
|
} |
| 136 |
|
} else { |
| 137 |
|
for (i = 0; i < 3; i++) |
| 201 |
|
|
| 202 |
|
in = (*ofun[objptr(obj)->otype].funp)(objptr(obj), cu); |
| 203 |
|
|
| 204 |
< |
if (!in) |
| 204 |
> |
if (in == O_MISS) |
| 205 |
|
return; /* no intersection */ |
| 206 |
|
|
| 207 |
|
if (istree(cu->cutree)) { |
| 228 |
|
objset(oset, cu->cutree); |
| 229 |
|
cukid.cusize = cu->cusize * 0.5; |
| 230 |
|
|
| 231 |
< |
if (in == 2 || oset[0] < objlim || cukid.cusize < mincusize) { |
| 231 |
> |
if (in==O_IN || oset[0] < objlim || cukid.cusize < mincusize) { |
| 232 |
|
/* add to set */ |
| 233 |
|
if (oset[0] >= MAXSET) { |
| 234 |
|
sprintf(errmsg, |
| 250 |
|
if ((1<<j) & i) |
| 251 |
|
cukid.cuorg[j] += cukid.cusize; |
| 252 |
|
} |
| 253 |
+ |
addobject(&cukid, obj); |
| 254 |
|
for (j = 1; j <= oset[0]; j++) |
| 255 |
|
addobject(&cukid, oset[j]); |
| 246 |
– |
addobject(&cukid, obj); |
| 256 |
|
octkid(ot, i) = cukid.cutree; |
| 257 |
|
} |
| 258 |
|
cu->cutree = ot; |
