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

Comparing ray/src/rt/o_instance.c (file contents):
Revision 2.2 by greg, Sun Dec 20 10:11:53 1992 UTC vs.
Revision 2.3 by greg, Tue Dec 20 20:18:19 1994 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1990 Regents of the University of California */
1 > /* Copyright (c) 1994 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 24 | Line 24 | register RAY  *r;
24          register int  i;
25                                          /* get the octree */
26          in = getinstance(o, IO_ALL);
27 <                                        /* duplicate and clear ray */
27 >                                        /* copy and transform ray */
28          copystruct(&rcont, r);
29 –        rayclear(&rcont);
30 –                                        /* transform ray to new space */
29          multp3(rcont.rorg, r->rorg, in->x.b.xfm);
30          multv3(rcont.rdir, r->rdir, in->x.b.xfm);
31          for (i = 0; i < 3; i++)
32                  rcont.rdir[i] /= in->x.b.sca;
33 <                                        /* trace it */
33 >        rcont.rmax *= in->x.b.sca;
34 >                                        /* clear and trace it */
35 >        rayclear(&rcont);
36          if (!localhit(&rcont, &in->obj->scube))
37                  return(0);                      /* missed */
38          if (rcont.rot * in->x.f.sca >= r->rot)

Diff Legend

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