66 |
|
multcolor(mcolor, r->pcol); |
67 |
|
/* compute reflected ray */ |
68 |
|
if (r->rsrc >= 0) { /* relayed light source */ |
69 |
< |
rayorigin(&nr, r, REFLECTED, 1.); |
69 |
> |
rayorigin(&nr, REFLECTED, r, mcolor); |
70 |
|
/* ignore textures */ |
71 |
|
for (i = 0; i < 3; i++) |
72 |
|
nr.rdir[i] = r->rdir[i] + 2.*r->rod*r->ron[i]; |
76 |
|
FVECT pnorm; |
77 |
|
double pdot; |
78 |
|
|
79 |
< |
if (rayorigin(&nr, r, REFLECTED, bright(mcolor)) < 0) |
79 |
> |
if (rayorigin(&nr, REFLECTED, r, mcolor) < 0) |
80 |
|
return(1); |
81 |
|
if (DOT(r->pert,r->pert) > FTINY*FTINY) { |
82 |
|
pdot = raynormal(pnorm, r); /* use textures */ |
89 |
|
for (i = 0; i < 3; i++) |
90 |
|
nr.rdir[i] = r->rdir[i] + 2.*r->rod*r->ron[i]; |
91 |
|
} |
92 |
+ |
checknorm(nr.rdir); |
93 |
|
rayvalue(&nr); |
94 |
< |
multcolor(nr.rcol, mcolor); |
94 |
> |
multcolor(nr.rcol, nr.rcoef); |
95 |
|
addcolor(r->rcol, nr.rcol); |
96 |
|
if (rpure && r->ro != NULL && isflat(r->ro->otype)) |
97 |
|
r->rt = r->rot + nr.rt; |
107 |
|
int n |
108 |
|
) |
109 |
|
{ |
110 |
+ |
double corr = 1.; |
111 |
|
FVECT nv, sc; |
112 |
< |
double od; |
113 |
< |
register int i, j; |
112 |
> |
double od, offs; |
113 |
> |
int i; |
114 |
|
/* get surface normal and offset */ |
115 |
< |
od = getplaneq(nv, o); |
116 |
< |
/* check for extreme point for behind */ |
115 |
> |
offs = od = getplaneq(nv, o); |
116 |
> |
if (s->sflags & SDISTANT) |
117 |
> |
offs = 0.; |
118 |
> |
/* check for extreme point behind */ |
119 |
> |
if (s->sflags & SCIR) { |
120 |
> |
if (s->sflags & (SFLAT|SDISTANT)) |
121 |
> |
corr = 1.12837917; /* correct setflatss() */ |
122 |
> |
else |
123 |
> |
corr = 1.0/0.7236; /* correct sphsetsrc() */ |
124 |
> |
} |
125 |
|
VCOPY(sc, s->sloc); |
126 |
|
for (i = s->sflags & SFLAT ? SV : SW; i >= 0; i--) |
127 |
< |
if (DOT(nv, s->ss[i]) > 0.) |
128 |
< |
for (j = 0; j < 3; j++) |
119 |
< |
sc[j] += s->ss[i][j]; |
127 |
> |
if (DOT(nv, s->ss[i]) > offs) |
128 |
> |
VSUM(sc, sc, s->ss[i], corr); |
129 |
|
else |
130 |
< |
for (j = 0; j < 3; j++) |
131 |
< |
sc[j] -= s->ss[i][j]; |
123 |
< |
if (DOT(sc, nv) <= (s->sflags & SDISTANT ? FTINY : od+FTINY)) |
130 |
> |
VSUM(sc, sc, s->ss[i], -corr); |
131 |
> |
if (DOT(sc, nv) <= offs+FTINY) |
132 |
|
return(0); |
133 |
|
/* everything OK -- compute projection */ |
134 |
|
mirrorproj(pm, nv, od); |