25 |
|
register SRCINDEX *si; /* source index (modified to current) */ |
26 |
|
{ |
27 |
|
int cent[3], size[3], parr[2]; |
28 |
+ |
SRCREC *srcp; |
29 |
|
FVECT vpos; |
30 |
|
double d; |
31 |
|
register int i; |
52 |
|
if (!skipparts(cent, size, parr, si->spt)) |
53 |
|
error(CONSISTENCY, "bad source partition in nextssamp"); |
54 |
|
/* compute sample */ |
55 |
+ |
srcp = source + si->sn; |
56 |
|
if (dstrsrc > FTINY) { /* jitter sample */ |
57 |
|
dimlist[ndims] = si->sn + 8831; |
58 |
|
dimlist[ndims+1] = si->sp + 3109; |
59 |
|
d = urand(ilhash(dimlist,ndims+2)+samplendx); |
60 |
< |
if (source[si->sn].sflags & SFLAT) { |
60 |
> |
if (srcp->sflags & SFLAT) { |
61 |
|
multisamp(vpos, 2, d); |
62 |
< |
vpos[2] = 0.5; |
62 |
> |
vpos[SW] = 0.5; |
63 |
|
} else |
64 |
|
multisamp(vpos, 3, d); |
65 |
|
for (i = 0; i < 3; i++) |
66 |
|
vpos[i] = dstrsrc * (1. - 2.*vpos[i]) * |
67 |
< |
(double)size[i]/MAXSPART; |
67 |
> |
(double)size[i]*(1.0/MAXSPART); |
68 |
|
} else |
69 |
|
vpos[0] = vpos[1] = vpos[2] = 0.0; |
70 |
|
|
71 |
< |
for (i = 0; i < 3; i++) |
72 |
< |
vpos[i] += (double)cent[i]/MAXSPART; |
71 |
> |
VSUM(vpos, vpos, cent, 1.0/MAXSPART); |
72 |
> |
/* avoid circular aiming failures */ |
73 |
> |
if ((srcp->sflags & SCIR) && (si->np > 1 || dstrsrc > 0.7)) { |
74 |
> |
FVECT trim; |
75 |
> |
if (srcp->sflags & (SFLAT|SDISTANT)) { |
76 |
> |
d = 1.12837917; /* correct setflatss() */ |
77 |
> |
trim[SU] = d*sqrt(1.0 - 0.5*vpos[SV]*vpos[SV]); |
78 |
> |
trim[SV] = d*sqrt(1.0 - 0.5*vpos[SU]*vpos[SU]); |
79 |
> |
trim[SW] = 0.0; |
80 |
> |
} else { |
81 |
> |
trim[SW] = trim[SU] = vpos[SU]*vpos[SU]; |
82 |
> |
d = vpos[SV]*vpos[SV]; |
83 |
> |
if (d > trim[SW]) trim[SW] = d; |
84 |
> |
trim[SU] += d; |
85 |
> |
d = vpos[SW]*vpos[SW]; |
86 |
> |
if (d > trim[SW]) trim[SW] = d; |
87 |
> |
trim[SU] += d; |
88 |
> |
if (trim[SU] > FTINY*FTINY) { |
89 |
> |
d = 1.0/0.7236; /* correct sphsetsrc() */ |
90 |
> |
trim[SW] = trim[SV] = trim[SU] = |
91 |
> |
d*sqrt(trim[SW]/trim[SU]); |
92 |
> |
} else |
93 |
> |
trim[SW] = trim[SV] = trim[SU] = 0.0; |
94 |
> |
} |
95 |
> |
for (i = 0; i < 3; i++) |
96 |
> |
vpos[i] *= trim[i]; |
97 |
> |
} |
98 |
|
/* compute direction */ |
99 |
|
for (i = 0; i < 3; i++) |
100 |
< |
r->rdir[i] = source[si->sn].sloc[i] + |
101 |
< |
vpos[SU]*source[si->sn].ss[SU][i] + |
102 |
< |
vpos[SV]*source[si->sn].ss[SV][i] + |
103 |
< |
vpos[SW]*source[si->sn].ss[SW][i]; |
100 |
> |
r->rdir[i] = srcp->sloc[i] + |
101 |
> |
vpos[SU]*srcp->ss[SU][i] + |
102 |
> |
vpos[SV]*srcp->ss[SV][i] + |
103 |
> |
vpos[SW]*srcp->ss[SW][i]; |
104 |
|
|
105 |
< |
if (!(source[si->sn].sflags & SDISTANT)) |
106 |
< |
for (i = 0; i < 3; i++) |
80 |
< |
r->rdir[i] -= r->rorg[i]; |
105 |
> |
if (!(srcp->sflags & SDISTANT)) |
106 |
> |
VSUB(r->rdir, r->rdir, r->rorg); |
107 |
|
/* compute distance */ |
108 |
|
if ((d = normalize(r->rdir)) == 0.0) |
109 |
|
goto nextsample; /* at source! */ |
110 |
|
|
111 |
|
/* compute sample size */ |
112 |
< |
if (source[si->sn].sflags & SFLAT) { |
112 |
> |
if (srcp->sflags & SFLAT) { |
113 |
|
si->dom = sflatform(si->sn, r->rdir); |
114 |
< |
si->dom *= size[SU]*size[SV]/(MAXSPART*(double)MAXSPART); |
115 |
< |
} else if (source[si->sn].sflags & SCYL) { |
114 |
> |
si->dom *= size[SU]*size[SV]*(1.0/MAXSPART/MAXSPART); |
115 |
> |
} else if (srcp->sflags & SCYL) { |
116 |
|
si->dom = scylform(si->sn, r->rdir); |
117 |
< |
si->dom *= size[SU]/(double)MAXSPART; |
117 |
> |
si->dom *= size[SU]*(1.0/MAXSPART); |
118 |
|
} else { |
119 |
< |
si->dom = size[SU]*size[SV]*(double)size[SW] / |
120 |
< |
(MAXSPART*MAXSPART*(double)MAXSPART) ; |
119 |
> |
si->dom = size[SU]*size[SV]*(double)size[SW] * |
120 |
> |
(1.0/MAXSPART/MAXSPART/MAXSPART) ; |
121 |
|
} |
122 |
< |
if (source[si->sn].sflags & SDISTANT) { |
123 |
< |
si->dom *= source[si->sn].ss2; |
122 |
> |
if (srcp->sflags & SDISTANT) { |
123 |
> |
si->dom *= srcp->ss2; |
124 |
|
return(FHUGE); |
125 |
|
} |
126 |
|
if (si->dom <= 1e-4) |
127 |
|
goto nextsample; /* behind source? */ |
128 |
< |
si->dom *= source[si->sn].ss2/(d*d); |
128 |
> |
si->dom *= srcp->ss2/(d*d); |
129 |
|
return(d); /* sample OK, return distance */ |
130 |
|
} |
131 |
|
|
140 |
|
/* check this partition */ |
141 |
|
p = spart(pt, pp[0]); |
142 |
|
pp[0]++; |
143 |
< |
if (p == S0) /* leaf partition */ |
143 |
> |
if (p == S0) { /* leaf partition */ |
144 |
|
if (pp[1]) { |
145 |
|
pp[1]--; |
146 |
|
return(0); /* not there yet */ |
147 |
|
} else |
148 |
|
return(1); /* we've arrived */ |
149 |
+ |
} |
150 |
|
/* else check lower */ |
151 |
|
sz[p] >>= 1; |
152 |
|
ct[p] -= sz[p]; |
267 |
|
v[1] = r->rorg[1] - vp[1]; |
268 |
|
v[2] = r->rorg[2] - vp[2]; |
269 |
|
vp = source[si->sn].snorm; |
270 |
< |
if (DOT(v,vp) <= FTINY) { /* behind source */ |
270 |
> |
if (DOT(v,vp) <= 0.) { /* behind source */ |
271 |
|
si->np = 0; |
272 |
|
return; |
273 |
|
} |