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

Comparing ray/src/hd/rhd_qtree2r.c (file contents):
Revision 3.2 by gregl, Tue Nov 25 17:33:02 1997 UTC vs.
Revision 3.5 by schorsch, Sun Jul 27 22:12:02 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1997 Silicon Graphics, Inc. */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   * Quadtree display support routines for rectangle output.
6   */
# Line 26 | Line 23 | int    l[2][2];
23          my = (y0 + y1) >> 1;
24                                          /* see what to do */
25          if (l[0][0] > mx)
26 <                quads &= ~(CHF(2)|CHF(0));
26 >                quads &= ~(CHF(UL)|CHF(DL));
27          else if (l[0][1] < mx)
28 <                quads &= ~(CHF(3)|CHF(1));
28 >                quads &= ~(CHF(UR)|CHF(DR));
29          if (l[1][0] > my)
30 <                quads &= ~(CHF(1)|CHF(0));
30 >                quads &= ~(CHF(DR)|CHF(DL));
31          else if (l[1][1] < my)
32 <                quads &= ~(CHF(3)|CHF(2));
32 >                quads &= ~(CHF(UR)|CHF(UL));
33          tp->flgs |= quads;              /* mark quadrants for update */
34                                          /* climb the branches */
35          for (i = 0; i < 4; i++)
# Line 115 | Line 112 | int    x0, y0, x1, y1;
112  
113          if (is_stump(&qtrunk))
114                  return;
115 <        if (!qtMapLeaves((lim[0][0]=x0) <= 0 & (lim[1][0]=y0) <= 0 &
116 <                (lim[0][1]=x1) >= odev.hres-1 & (lim[1][1]=y1) >= odev.vres-1))
115 >        if (!qtMapLeaves(((lim[0][0]=x0) <= 0) & ((lim[1][0]=y0) <= 0) &
116 >                ((lim[0][1]=x1) >= odev.hres-1) & ((lim[1][1]=y1) >= odev.vres-1)))
117                  return;
118          redraw(&qtrunk, 0, 0, odev.hres, odev.vres, lim);
119   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines