51 |
|
setcolor(r->rcoef, 1., 1., 1.); |
52 |
|
} else { |
53 |
|
rw = intens(rc); |
54 |
+ |
if (rw > 1.0) |
55 |
+ |
rw = 1.0; /* avoid calculation growth */ |
56 |
|
if (rc != r->rcoef) |
57 |
|
copycolor(r->rcoef, rc); |
58 |
|
} |
109 |
|
return(-1); |
110 |
|
if (r->crtype & SHADOW) /* shadow commitment */ |
111 |
|
return(0); |
112 |
+ |
/* ambient in photon map? */ |
113 |
+ |
if (ro != NULL && ro->crtype & AMBIENT) { |
114 |
+ |
if (causticPhotonMapping) |
115 |
+ |
return(-1); |
116 |
+ |
if (photonMapping && rt != TRANS) |
117 |
+ |
return(-1); |
118 |
+ |
} |
119 |
|
if (maxdepth <= 0 && rc != NULL) { /* Russian roulette */ |
120 |
|
if (minweight <= 0.0) |
121 |
|
error(USER, "zero ray weight in Russian roulette"); |
191 |
|
{ |
192 |
|
RAY tr; |
193 |
|
|
194 |
< |
if (rayorigin(&tr, TRANS, r, NULL) == 0) { |
195 |
< |
VCOPY(tr.rdir, r->rdir); |
196 |
< |
rayvalue(&tr); |
197 |
< |
copycolor(r->rcol, tr.rcol); |
198 |
< |
r->rt = r->rot + tr.rt; |
190 |
< |
} |
194 |
> |
rayorigin(&tr, TRANS, r, NULL); /* always continue */ |
195 |
> |
VCOPY(tr.rdir, r->rdir); |
196 |
> |
rayvalue(&tr); |
197 |
> |
copycolor(r->rcol, tr.rcol); |
198 |
> |
r->rt = r->rot + tr.rt; |
199 |
|
} |
200 |
|
|
201 |
|
|
202 |
+ |
/* Macro for test to see if BSDF material uses proxy */ |
203 |
+ |
#define isBSDFproxy(m) ((m)->otype == MAT_BSDF && (m)->oargs.nsargs && \ |
204 |
+ |
strcmp((m)->oargs.sarg[0], "0")) |
205 |
+ |
|
206 |
+ |
|
207 |
|
int |
208 |
|
rayshade( /* shade ray r with material mod */ |
209 |
|
RAY *r, |
212 |
|
{ |
213 |
|
OBJREC *m; |
214 |
|
|
215 |
< |
r->rt = r->rot; /* set effective ray length */ |
215 |
> |
r->rt = r->rot; /* preset effective ray length */ |
216 |
|
for ( ; mod != OVOID; mod = m->omod) { |
217 |
|
m = objptr(mod); |
218 |
|
/****** unnecessary test since modifier() is always called |
223 |
|
******/ |
224 |
|
/* hack for irradiance calculation */ |
225 |
|
if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS)) && |
226 |
+ |
(ofun[m->otype].flags & (T_M|T_X)) && |
227 |
|
m->otype != MAT_CLIP && |
228 |
< |
(ofun[m->otype].flags & (T_M|T_X))) { |
228 |
> |
!isBSDFproxy(m)) { |
229 |
|
if (irr_ignore(m->otype)) { |
230 |
|
raytrans(r); |
231 |
|
return(1); |