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

Comparing ray/src/ot/o_instance.c (file contents):
Revision 1.4 by greg, Tue Oct 24 13:57:42 1989 UTC vs.
Revision 1.6 by greg, Sat Dec 15 19:55:05 1990 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1988 Regents of the University of California */
1 > /* Copyright (c) 1990 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 56 | Line 56 | CUBE  *cu;
56          in = getinstance(o, IO_BOUNDS);
57                                          /* check if cube vertex in octree */
58          for (j = 0; j < 3; j++)
59 <                cumax[j] = (cumin[j] = in->obj->scube.cuorg[j]) +
60 <                                in->obj->scube.cusize;
59 >                cumax[j] = (cumin[j] = cu->cuorg[j]-FTINY)
60 >                                + cu->cusize + 2.0*FTINY;
61          vloc = ABOVE | BELOW;
62          vout = 0;
63          for (i = 0; i < 8; i++) {
# Line 66 | Line 66 | CUBE  *cu;
66                          if (i & 1<<j)
67                                  v1[j] += cu->cusize;
68                  }
69 <                multp3(v2, v1, in->b.xfm);
69 >                multp3(v2, v1, in->x.b.xfm);
70                  if (j = plocate(v2, cumin, cumax))
71                          vout++;
72                  vloc &= j;
# Line 87 | Line 87 | CUBE  *cu;
87                          if (i & 1<<j)
88                                  v1[j] += in->obj->scube.cusize;
89                  }
90 <                multp3(vert[i], v1, in->f.xfm);
90 >                multp3(vert[i], v1, in->x.f.xfm);
91                  if (j = plocate(vert[i], cumin, cumax))
92                          vloc &= j;
93                  else

Diff Legend

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