216 |
|
trace_contrib(RAY *r) |
217 |
|
{ |
218 |
|
MODCONT *mp; |
219 |
+ |
double bval; |
220 |
|
int bn; |
221 |
|
RREAL contr[3]; |
222 |
|
|
232 |
|
return; |
233 |
|
|
234 |
|
worldfunc(RCCONTEXT, r); /* else get bin number */ |
235 |
< |
bn = (int)(evalue(mp->binv) + .5); |
236 |
< |
if ((bn < 0) | (bn >= mp->nbins)) { |
235 |
> |
if ((bval = evalue(mp->binv)) <= -.5) |
236 |
> |
return; /* silently ignore */ |
237 |
> |
if ((bn = (int)(bval + .5)) >= mp->nbins) { |
238 |
|
error(WARNING, "bad bin number (ignored)"); |
239 |
|
return; |
240 |
|
} |
318 |
|
#endif |
319 |
|
while (getvec(orig) == 0 && getvec(direc) == 0) { |
320 |
|
d = normalize(direc); |
321 |
< |
if (nchild != -1 && (d == 0.0) & (accumulate != 1)) { |
321 |
> |
if (nchild != -1 && (d == 0.0) & (accumulate == 0)) { |
322 |
|
if (!ignore_warning_given++) |
323 |
|
error(WARNING, |
324 |
|
"dummy ray(s) ignored during accumulation\n"); |
328 |
|
lastray = lastdone = 0; |
329 |
|
++lastray; |
330 |
|
if (d == 0.0) { /* zero ==> flush */ |
331 |
< |
if ((yres <= 0) | (xres <= 0)) |
332 |
< |
waitflush = 1; /* flush right after */ |
333 |
< |
account = 1; |
331 |
> |
if ((yres <= 0) | (xres <= 1)) |
332 |
> |
waitflush = 1; /* flush after */ |
333 |
> |
if (nchild == -1) |
334 |
> |
account = 1; |
335 |
|
} else if (imm_irrad) { /* else compute */ |
336 |
|
eval_irrad(orig, direc); |
337 |
|
} else { |