ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/m_direct.c
(Generate patch)

Comparing ray/src/rt/m_direct.c (file contents):
Revision 2.12 by schorsch, Tue Mar 30 16:13:01 2004 UTC vs.
Revision 2.13 by greg, Tue Apr 19 01:15:06 2005 UTC

# Line 100 | Line 100 | redirect(              /* compute n'th ray redirection */
100          errno = 0;
101          va = mf->ep + 4*n;
102          coef = evalue(va[0]);
103 <        if (errno == EDOM || errno == ERANGE)
103 >        if ((errno == EDOM) | (errno == ERANGE))
104                  goto computerr;
105 <        if (coef <= FTINY || rayorigin(&nr, r, TRANS, coef) < 0)
105 >        setcolor(nr.rcoef, coef, coef, coef);
106 >        if (rayorigin(&nr, TRANS, r, nr.rcoef) < 0)
107                  return(0);
108          va++;                           /* compute direction */
109          for (j = 0; j < 3; j++) {
# Line 120 | Line 121 | redirect(              /* compute n'th ray redirection */
121          if (r->rsrc >= 0)
122                  nr.rsrc = source[r->rsrc].sa.sv.sn;
123          rayvalue(&nr);
124 <        scalecolor(nr.rcol, coef);
124 >        multcolor(nr.rcol, nr.rcoef);
125          addcolor(r->rcol, nr.rcol);
126          if (r->ro != NULL && isflat(r->ro->otype))
127                  r->rt = r->rot + nr.rt;
# Line 166 | Line 167 | dir_proj(              /* compute a director's projection */
167          if (olddot <= FTINY && olddot >= -FTINY)
168                  return(0);              /* old dir parallels plane */
169          tr.rmax = 0.0;
170 <        rayorigin(&tr, NULL, PRIMARY, 1.0);
170 >        rayorigin(&tr, PRIMARY, NULL, NULL);
171          if (!(*ofun[o->otype].funp)(o, &tr))
172                  return(0);              /* no intersection! */
173                                  /* compute redirection */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines