20 |
|
register float *rod; |
21 |
|
register PACKET *p; |
22 |
|
{ |
23 |
– |
short packord[RPACKSIZ]; |
23 |
|
float packdc2[RPACKSIZ]; |
24 |
< |
int iterleft = 3*p->nr; |
24 |
> |
int iterleft = 3*p->nr + 9; |
25 |
|
BYTE rpos[2][2]; |
26 |
|
FVECT ro, rd, rp1; |
27 |
|
GCOORD gc[2]; |
28 |
< |
double d, dc2, md2, td2; |
28 |
> |
double d, dc2, md2, td2, dc2worst = FHUGE; |
29 |
|
int i; |
30 |
|
register int ii; |
31 |
|
|
32 |
|
if (!hdbcoord(gc, hdlist[p->hd], p->bi)) |
33 |
|
error(CONSISTENCY, "bad beam index in packrays"); |
34 |
< |
td2 = (myeye.rng+FTINY)*(myeye.rng+FTINY); |
35 |
< |
for (i = 0, md2 = 0.; i < p->nr || md2 > td2; ) { |
34 |
> |
td2 = myeye.rng + FTINY; td2 *= td2; |
35 |
> |
for (i = 0, md2 = 0.; i < p->nr || (md2 > td2 && iterleft--); ) { |
36 |
|
rpos[0][0] = frandom() * 256.; |
37 |
|
rpos[0][1] = frandom() * 256.; |
38 |
|
rpos[1][0] = frandom() * 256.; |
42 |
|
register int nexti; |
43 |
|
|
44 |
|
VSUM(rp1, ro, rd, d); |
45 |
< |
dc2 = dist2line(myeye.vpt, ro, rp1); |
47 |
< |
dc2 /= (double)(p->nr*p->nr); |
45 |
> |
dc2 = dist2line(myeye.vpt, ro, rp1) / p->nr; |
46 |
|
if (i == p->nr) { /* packet full */ |
47 |
< |
nexti = packord[i-1]; |
48 |
< |
if (!iterleft--) |
49 |
< |
break; /* tried enough! */ |
50 |
< |
if (dc2 >= packdc2[nexti]) |
47 |
> |
if (dc2 >= dc2worst) /* quick check */ |
48 |
> |
continue; |
49 |
> |
nexti = 0; /* find worst */ |
50 |
> |
for (ii = i; --ii; ) |
51 |
> |
if (packdc2[ii] > packdc2[nexti]) |
52 |
> |
nexti = ii; |
53 |
> |
if (dc2 >= (dc2worst = packdc2[nexti])) |
54 |
|
continue; /* worse than worst */ |
55 |
< |
md2 -= packdc2[nexti]; |
55 |
> |
md2 -= dc2worst; |
56 |
|
} else |
57 |
|
nexti = i++; |
58 |
|
md2 += packdc2[nexti] = dc2; /* new distance */ |
58 |
– |
for (ii = i; --ii; ) { /* insertion sort */ |
59 |
– |
if (dc2 > packdc2[packord[ii-1]]) |
60 |
– |
break; |
61 |
– |
packord[ii] = packord[ii-1]; |
62 |
– |
} |
63 |
– |
packord[ii] = nexti; |
59 |
|
ii = nexti; /* put it here */ |
60 |
|
} else |
61 |
|
ii = i++; |