99 |
|
colval(trans,i) = .5*(1.0-r1e)*(1.0-r1e)*d/(1.0-r1e*r1e*d*d); |
100 |
|
colval(trans,i) += .5*(1.0-r1m)*(1.0-r1m)*d/(1.0-r1m*r1m*d*d); |
101 |
|
} |
102 |
+ |
multcolor(trans, r->pcol); /* modify by pattern */ |
103 |
|
/* transmitted ray */ |
104 |
< |
if (rayorigin(&p, r, TRANS, bright(trans)) == 0) { |
104 |
> |
if (rayorigin(&p, TRANS, r, trans) == 0) { |
105 |
|
if (!(r->crtype & SHADOW) && hastexture) { |
106 |
|
for (i = 0; i < 3; i++) /* perturb direction */ |
107 |
|
p.rdir[i] = r->rdir[i] + |
115 |
|
transtest = 2; |
116 |
|
} |
117 |
|
rayvalue(&p); |
118 |
< |
multcolor(p.rcol, r->pcol); /* modify */ |
118 |
< |
multcolor(p.rcol, trans); |
118 |
> |
multcolor(p.rcol, p.rcoef); |
119 |
|
addcolor(r->rcol, p.rcol); |
120 |
|
transtest *= bright(p.rcol); |
121 |
|
transdist = r->rot + p.rt; |
133 |
|
colval(refl,i) += .5*r1m*(1.0+(1.0-2.0*r1m)*d)/(1.0-r1m*r1m*d); |
134 |
|
} |
135 |
|
/* reflected ray */ |
136 |
< |
if (rayorigin(&p, r, REFLECTED, bright(refl)) == 0) { |
136 |
> |
if (rayorigin(&p, REFLECTED, r, refl) == 0) { |
137 |
|
for (i = 0; i < 3; i++) |
138 |
|
p.rdir[i] = r->rdir[i] + 2.0*pdot*pnorm[i]; |
139 |
|
rayvalue(&p); |
140 |
< |
multcolor(p.rcol, refl); |
140 |
> |
multcolor(p.rcol, p.rcoef); |
141 |
|
addcolor(r->rcol, p.rcol); |
142 |
|
if (!hastexture && r->ro != NULL && isflat(r->ro->otype)) { |
143 |
|
mirtest = 2.0*bright(p.rcol); |