| 176 |
|
for (i = xcbeams; i--; ) { |
| 177 |
|
pa[i].hd = cbeam[ncbeams+i].hd; |
| 178 |
|
pa[i].bi = cbeam[ncbeams+i].bi; |
| 179 |
< |
pa[i].nr = npixels(v, hr, vr, hdlist[pa[i].hd], pa[i].bi); |
| 179 |
> |
pa[i].nr = npixels(v, hr, vr, hdlist[pa[i].hd], pa[i].bi) + 1; |
| 180 |
|
} |
| 181 |
|
n = xcbeams; /* now sort list for deletions */ |
| 182 |
|
cbeamsort(0); |
| 301 |
|
} |
| 302 |
|
/* check for really stupid move */ |
| 303 |
|
if (bestd > MAXDIST) { |
| 304 |
< |
error(WARNING, "move to outer solar system"); |
| 304 |
> |
error(COMMAND, "move past outer limits"); |
| 305 |
|
return(0); |
| 306 |
|
} |
| 307 |
|
/* warn of dangerous moves */ |
| 352 |
|
GCOORD *gcp; |
| 353 |
|
register struct cellact *cap; |
| 354 |
|
{ |
| 355 |
+ |
register HOLO *hp = hdlist[voxel[cap->vi].hd]; |
| 356 |
|
FVECT org, dir[4]; |
| 357 |
< |
FVECT gp, cv[4], vc; |
| 357 |
> |
FVECT vgp, cgp, vc; |
| 358 |
> |
FVECT v1, v2; |
| 359 |
|
struct beamact bo; |
| 360 |
+ |
int axmax, j; |
| 361 |
+ |
double d, avmax; |
| 362 |
|
register int i; |
| 363 |
< |
/* compute cell vertices */ |
| 364 |
< |
hdcell(cv, hdlist[voxel[cap->vi].hd], gcp); |
| 365 |
< |
/* compute cell and voxel centers */ |
| 366 |
< |
for (i = 0; i < 3; i++) { |
| 367 |
< |
org[i] = 0.5*(cv[0][i] + cv[2][i]); |
| 368 |
< |
gp[i] = voxel[cap->vi].i[i] + 0.5; |
| 369 |
< |
} |
| 370 |
< |
hdworld(vc, hdlist[voxel[cap->vi].hd], gp); |
| 371 |
< |
/* compute voxel pyramid using vector trick */ |
| 372 |
< |
for (i = 0; i < 3; i++) { |
| 373 |
< |
dir[0][i] = vc[i] - cv[0][i]; /* to 3 */ |
| 374 |
< |
dir[2][i] = vc[i] - cv[3][i]; /* to 0 */ |
| 375 |
< |
if (gcp->w & 1) { /* watch vertex order! */ |
| 376 |
< |
dir[1][i] = vc[i] - cv[2][i]; /* to 1 */ |
| 377 |
< |
dir[3][i] = vc[i] - cv[1][i]; /* to 2 */ |
| 378 |
< |
} else { |
| 379 |
< |
dir[1][i] = vc[i] - cv[1][i]; /* to 2 */ |
| 380 |
< |
dir[3][i] = vc[i] - cv[2][i]; /* to 1 */ |
| 363 |
> |
/* compute cell center */ |
| 364 |
> |
cgp[gcp->w>>1] = gcp->w&1 ? hp->grid[gcp->w>>1] : 0 ; |
| 365 |
> |
cgp[((gcp->w>>1)+1)%3] = gcp->i[0] + .5; |
| 366 |
> |
cgp[((gcp->w>>1)+2)%3] = gcp->i[1] + .5; |
| 367 |
> |
hdworld(org, hp, cgp); |
| 368 |
> |
/* compute direction to voxel center */ |
| 369 |
> |
for (i = 3; i--; ) |
| 370 |
> |
vgp[i] = voxel[cap->vi].i[i] + 0.5; |
| 371 |
> |
hdworld(vc, hp, vgp); |
| 372 |
> |
for (i = 3; i--; ) |
| 373 |
> |
vc[i] -= org[i]; |
| 374 |
> |
/* compute maximum area axis */ |
| 375 |
> |
axmax = -1; avmax = 0; |
| 376 |
> |
for (i = 3; i--; ) { |
| 377 |
> |
d = vgp[i] - cgp[i]; |
| 378 |
> |
if (d < 0) d = -d; |
| 379 |
> |
if (d > avmax) { |
| 380 |
> |
avmax = d; |
| 381 |
> |
axmax = i; |
| 382 |
|
} |
| 383 |
|
} |
| 384 |
+ |
#ifdef DEBUG |
| 385 |
+ |
if (axmax < 0) |
| 386 |
+ |
error(CONSISTENCY, "botched axis computation in docell"); |
| 387 |
+ |
#endif |
| 388 |
+ |
/* compute offset vectors */ |
| 389 |
+ |
d = 0.5/hp->grid[j=(axmax+1)%3]; |
| 390 |
+ |
for (i = 3; i--; ) |
| 391 |
+ |
v1[i] = hp->xv[j][i] * d; |
| 392 |
+ |
d = 0.5/hp->grid[j=(axmax+2)%3]; |
| 393 |
+ |
if (DOT(hp->wn[axmax], vc) < 0) |
| 394 |
+ |
d = -d; /* reverse vertex ordering */ |
| 395 |
+ |
for (i = 3; i--; ) |
| 396 |
+ |
v2[i] = hp->xv[j][i] * d; |
| 397 |
+ |
/* compute voxel pyramid */ |
| 398 |
+ |
for (i = 3; i--; ) { |
| 399 |
+ |
dir[0][i] = vc[i] - v1[i] - v2[i]; |
| 400 |
+ |
dir[1][i] = vc[i] + v1[i] - v2[i]; |
| 401 |
+ |
dir[2][i] = vc[i] + v1[i] + v2[i]; |
| 402 |
+ |
dir[3][i] = vc[i] - v1[i] + v2[i]; |
| 403 |
+ |
} |
| 404 |
|
/* visit beams for opposite cells */ |
| 405 |
|
copystruct(&bo.ca, cap); |
| 406 |
|
copystruct(&bo.gc, gcp); |
| 407 |
< |
return(visit_cells(org, dir, hdlist[voxel[cap->vi].hd], dobeam, &bo)); |
| 407 |
> |
return(visit_cells(org, dir, hp, dobeam, &bo)); |
| 408 |
|
} |
| 409 |
|
|
| 410 |
|
|
