| 57 |
|
if ((libpath = getenv("RAYPATH")) == NULL) |
| 58 |
|
libpath = ":/usr/local/lib/ray"; |
| 59 |
|
|
| 60 |
< |
for (i = 1; i < argc && argv[i][0] == '-' && argv[i][1]; i++) |
| 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'"); |
| 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]); |
| 253 |
– |
addobject(&cukid, obj); |
| 256 |
|
octkid(ot, i) = cukid.cutree; |
| 257 |
|
} |
| 258 |
|
cu->cutree = ot; |
