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

Comparing ray/src/rt/raytrace.c (file contents):
Revision 2.20 by greg, Fri Sep 29 10:46:12 1995 UTC vs.
Revision 2.22 by greg, Wed Dec 6 12:07:50 1995 UTC

# Line 61 | Line 61 | double  rw;
61                          r->rlvl++;
62                          r->rsrc = -1;
63                          r->clipset = ro->clipset;
64 +                        r->rmax = 0.0;
65                  } else {
66                          r->rsrc = ro->rsrc;
67                          r->clipset = ro->newcset;
68 +                        r->rmax = ro->rmax <= FTINY ? 0.0 : ro->rmax - ro->rot;
69                  }
70                  r->revf = ro->revf;
71                  r->rweight = ro->rweight * rw;
72                  r->crtype = ro->crtype | (r->rtype = rt);
73                  VCOPY(r->rorg, ro->rop);
72 –                r->rmax = 0.0;
74          }
75          rayclear(r);
76          return(r->rlvl <= maxdepth && r->rweight >= minweight ? 0 : -1);
# Line 131 | Line 132 | register RAY  *r;
132  
133          if (rayorigin(&tr, r, TRANS, 1.0) == 0) {
134                  VCOPY(tr.rdir, r->rdir);
134 –                if (r->rmax > FTINY)
135 –                        tr.rmax = r->rmax - r->rot;
135                  rayvalue(&tr);
136                  copycolor(r->rcol, tr.rcol);
137                  r->rt = r->rot + tr.rt;
# Line 256 | Line 255 | double  coef;
255          }
256                                          /* return value tells if material */
257          return(foremat);
258 + }
259 +
260 +
261 + double
262 + raydist(r, flags)               /* compute (cumulative) ray distance */
263 + register RAY  *r;
264 + register int  flags;
265 + {
266 +        double  sum = 0.0;
267 +
268 +        while (r != NULL && r->crtype&flags) {
269 +                sum += r->rot;
270 +                r = r->parent;
271 +        }
272 +        return(sum);
273   }
274  
275  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)