68 |
|
r->gecc = seccg; |
69 |
|
r->slights = NULL; |
70 |
|
} else { /* spawned ray */ |
71 |
< |
if (ro->rot >= FHUGE) { |
71 |
> |
if (ro->rot >= FHUGE*.99) { |
72 |
|
memset(r, 0, sizeof(RAY)); |
73 |
|
return(-1); /* illegal continuation */ |
74 |
|
} |
116 |
|
if (photonMapping && rt != TRANS) |
117 |
|
return(-1); |
118 |
|
} |
119 |
< |
if (maxdepth <= 0 && rc != NULL) { /* Russian roulette */ |
119 |
> |
if ((maxdepth <= 0) & (rc != NULL)) { /* Russian roulette */ |
120 |
|
if (minweight <= 0.0) |
121 |
|
error(USER, "zero ray weight in Russian roulette"); |
122 |
< |
if (maxdepth < 0 && r->rlvl > -maxdepth) |
122 |
> |
if ((maxdepth < 0) & (r->rlvl > -maxdepth)) |
123 |
|
return(-1); /* upper reflection limit */ |
124 |
|
if (r->rweight >= minweight) |
125 |
|
return(0); |
130 |
|
r->rweight = minweight; |
131 |
|
return(0); |
132 |
|
} |
133 |
< |
return(r->rweight >= minweight && r->rlvl <= abs(maxdepth) ? 0 : -1); |
133 |
> |
return((r->rweight >= minweight) & (r->rlvl <= abs(maxdepth)) ? 0 : -1); |
134 |
|
} |
135 |
|
|
136 |
|
|
146 |
|
r->ro = NULL; |
147 |
|
r->rox = NULL; |
148 |
|
r->rxt = r->rmt = r->rot = FHUGE; |
149 |
+ |
VCOPY(r->rop, r->rorg); |
150 |
+ |
r->ron[0] = -r->rdir[0]; r->ron[1] = -r->rdir[1]; r->ron[2] = -r->rdir[2]; |
151 |
+ |
r->rod = 1.0; |
152 |
|
r->pert[0] = r->pert[1] = r->pert[2] = 0.0; |
153 |
+ |
r->rflips = 0; |
154 |
|
r->uv[0] = r->uv[1] = 0.0; |
155 |
|
setcolor(r->pcol, 1.0, 1.0, 1.0); |
156 |
|
setcolor(r->mcol, 0.0, 0.0, 0.0); |
233 |
|
int tst_irrad = do_irrad && !(r->crtype & ~(PRIMARY|TRANS)); |
234 |
|
OBJREC *m; |
235 |
|
|
236 |
< |
r->rxt = r->rmt = r->rot; /* preset effective ray length */ |
236 |
> |
r->rxt = r->rot; /* preset effective ray length */ |
237 |
|
for ( ; mod != OVOID; mod = m->omod) { |
238 |
|
m = objptr(mod); |
239 |
|
/****** unnecessary test since modifier() is always called |
407 |
|
int flags |
408 |
|
) |
409 |
|
{ |
410 |
< |
double eext[3]; |
407 |
< |
int i; |
410 |
> |
static int warnedPM = 0; |
411 |
|
|
409 |
– |
eext[0] = eext[1] = eext[2] = 0.; |
412 |
|
rc[0] = rc[1] = rc[2] = 1.; |
413 |
|
|
414 |
|
while (r != NULL && r->crtype&flags) { |
415 |
< |
for (i = 3; i--; ) { |
415 |
> |
int i = 3; |
416 |
> |
while (i--) |
417 |
|
rc[i] *= colval(r->rcoef,i); |
418 |
< |
eext[i] += r->rot * colval(r->cext,i); |
418 |
> |
/* check for participating medium */ |
419 |
> |
if (!warnedPM && (bright(r->cext) > FTINY) | |
420 |
> |
(bright(r->albedo) > FTINY)) { |
421 |
> |
error(WARNING, |
422 |
> |
"ray contribution calculation does not support participating media"); |
423 |
> |
warnedPM++; |
424 |
|
} |
425 |
|
r = r->parent; |
426 |
|
} |
419 |
– |
for (i = 3; i--; ) |
420 |
– |
rc[i] *= (eext[i] <= FTINY) ? 1. : |
421 |
– |
(eext[i] > 92.) ? 0. : exp(-eext[i]); |
427 |
|
} |
428 |
|
|
429 |
|
|
513 |
|
r->pert[0] = -r->pert[0]; |
514 |
|
r->pert[1] = -r->pert[1]; |
515 |
|
r->pert[2] = -r->pert[2]; |
516 |
+ |
r->rflips++; |
517 |
|
} |
518 |
|
|
519 |
+ |
|
520 |
+ |
int |
521 |
+ |
rayreject( /* check if candidate hit is worse than current */ |
522 |
+ |
OBJREC *o, |
523 |
+ |
RAY *r, |
524 |
+ |
double t |
525 |
+ |
) |
526 |
+ |
{ |
527 |
+ |
OBJREC *mnew, *mray; |
528 |
+ |
|
529 |
+ |
if ((t <= FTINY) | (t > r->rot + FTINY)) |
530 |
+ |
return(1); |
531 |
+ |
if (t < r->rot - FTINY) /* is new hit significantly closer? */ |
532 |
+ |
return(0); |
533 |
+ |
/* coincident point, so decide... */ |
534 |
+ |
if (o == r->ro) |
535 |
+ |
return(1); /* shouldn't happen */ |
536 |
+ |
if (r->ro == NULL) |
537 |
+ |
return(0); /* ditto */ |
538 |
+ |
if ((mnew = findmaterial(o)) == NULL) |
539 |
+ |
return(1); /* new has no material */ |
540 |
+ |
if ((mray = findmaterial(r->ro)) == NULL) |
541 |
+ |
return(0); /* old has no material(!) */ |
542 |
+ |
if (istransp(mnew->otype)) |
543 |
+ |
return(1); /* new is transparent */ |
544 |
+ |
if (istransp(mray->otype)) |
545 |
+ |
return(0); /* old is transparent */ |
546 |
+ |
/* weakest priority to later modifier definition */ |
547 |
+ |
return (r->ro->omod >= o->omod); |
548 |
+ |
} |
549 |
|
|
550 |
|
void |
551 |
|
rayhit( /* standard ray hit test */ |