144 |
|
if (source[sn].sflags & SSPOT) { |
145 |
|
multp3(theirspot.aim, source[sn].sl.s->aim, pm); |
146 |
|
d = sqrt(dist2(ourspot.aim, theirspot.aim)); |
147 |
< |
d = sqrt(source[sn].sl.s->siz/PI) + d*source[sn].ss; |
147 |
> |
d = sqrt(source[sn].sl.s->siz/PI) + d*source[sn].srad; |
148 |
|
theirspot.siz = PI*d*d; |
149 |
|
ourspot.flen = theirspot.flen = source[sn].sl.s->flen; |
150 |
|
d = ourspot.siz; |
169 |
|
if (source[sn].sflags & SPROX && d > source[sn].sl.prox) |
170 |
|
return(-1); /* too far away */ |
171 |
|
ourspot.flen = 0.; |
172 |
< |
d = (sqrt(maxrad2) + source[sn].ss) / d; |
172 |
> |
d = (sqrt(maxrad2) + source[sn].srad) / d; |
173 |
|
if (d < 1.-FTINY) |
174 |
|
ourspot.siz = 2.*PI*(1. - sqrt(1.-d*d)); |
175 |
|
else |
214 |
|
goto memerr; |
215 |
|
source[i].sflags = nsflags; |
216 |
|
VCOPY(source[i].sloc, nsloc); |
217 |
+ |
multv3(source[i].ss[SU], source[sn].ss[SU], pm); |
218 |
+ |
multv3(source[i].ss[SV], source[sn].ss[SV], pm); |
219 |
|
if (nsflags & SFLAT) |
220 |
|
VCOPY(source[i].snorm, nsnorm); |
221 |
< |
source[i].ss = source[sn].ss; source[i].ss2 = source[sn].ss2; |
221 |
> |
else |
222 |
> |
multv3(source[i].ss[SW], source[sn].ss[SW], pm); |
223 |
> |
source[i].ss2 = source[sn].ss2; |
224 |
|
if (nsflags & SSPOT) { |
225 |
|
if ((source[i].sl.s = (SPOT *)malloc(sizeof(SPOT))) == NULL) |
226 |
|
goto memerr; |
279 |
|
RAY sr; |
280 |
|
FVECT onorm; |
281 |
|
FVECT offsdir; |
282 |
+ |
SRCINDEX si; |
283 |
|
double or, d; |
284 |
|
int infront; |
285 |
|
int stestlim, ssn; |
344 |
|
rayorigin(&sr, NULL, PRIMARY, 1.0); |
345 |
|
} while (!(*ofun[o->otype].funp)(o, &sr)); |
346 |
|
/* check against source */ |
347 |
+ |
initsrcindex(&si); |
348 |
+ |
si.sn = sn; |
349 |
+ |
nopart(&si, sr.rorg); |
350 |
|
samplendx++; |
351 |
< |
if (srcray(&sr, NULL, sn) == 0.) |
351 |
> |
if (!srcray(&sr, NULL, &si) || sr.rsrc != sn) |
352 |
|
continue; |
353 |
|
sr.revf = srcvalue; |
354 |
|
rayvalue(&sr); |