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

Comparing ray/src/ot/bbox.c (file contents):
Revision 2.4 by greg, Tue Mar 11 17:08:55 2003 UTC vs.
Revision 2.6 by greg, Tue Jun 14 17:10:06 2005 UTC

# Line 8 | Line 8 | static const char RCSid[] = "$Id$";
8   #include  "copyright.h"
9  
10   #include  "standard.h"
11 –
11   #include  "object.h"
13 –
12   #include  "octree.h"
15 –
13   #include  "otypes.h"
17 –
14   #include  "face.h"
19 –
15   #include  "cone.h"
21 –
16   #include  "instance.h"
23 –
17   #include  "mesh.h"
18 + #include  "oconv.h"
19  
20  
21 < add2bbox(o, bbmin, bbmax)               /* expand bounding box to fit object */
22 < register OBJREC  *o;
23 < FVECT  bbmin, bbmax;
21 > static void point2bbox(FVECT  p, FVECT  bbmin, FVECT  bbmax);
22 > static void circle2bbox(FVECT  cent, FVECT  norm, double  rad, FVECT  bbmin, FVECT  bbmax);
23 >
24 >
25 > void
26 > add2bbox(               /* expand bounding box to fit object */
27 >        register OBJREC  *o,
28 >        FVECT  bbmin,
29 >        FVECT  bbmax
30 > )
31   {
32          CONE  *co;
33          FACE  *fo;
# Line 92 | Line 93 | FVECT  bbmin, bbmax;
93   }
94  
95  
96 < point2bbox(p, bbmin, bbmax)             /* expand bounding box to fit point */
97 < register FVECT  p, bbmin, bbmax;
96 > static void
97 > point2bbox(             /* expand bounding box to fit point */
98 >        register FVECT  p,
99 >        register FVECT  bbmin,
100 >        register FVECT  bbmax
101 > )
102   {
103          register int  i;
104  
# Line 106 | Line 111 | register FVECT  p, bbmin, bbmax;
111   }
112  
113  
114 < circle2bbox(cent, norm, rad, bbmin, bbmax)      /* expand bbox to fit circle */
115 < FVECT  cent, norm;
116 < double  rad;
117 < FVECT  bbmin, bbmax;
114 > static void
115 > circle2bbox(    /* expand bbox to fit circle */
116 >        FVECT  cent,
117 >        FVECT  norm,
118 >        double  rad,
119 >        FVECT  bbmin,
120 >        FVECT  bbmax
121 > )
122   {
123 <        FVECT  v1, v2;
124 <        register int  i, j;
123 >        double  d, r;
124 >        register int  i;
125  
126          for (i = 0; i < 3; i++) {
127 <                v1[0] = v1[1] = v1[2] = 0;
128 <                v1[i] = 1.0;
129 <                fcross(v2, norm, v1);
130 <                if (normalize(v2) == 0.0)
131 <                        continue;
132 <                for (j = 0; j < 3; j++)
133 <                        v1[j] = cent[j] + rad*v2[j];
125 <                point2bbox(v1, bbmin, bbmax);
126 <                for (j = 0; j < 3; j++)
127 <                        v1[j] = cent[j] - rad*v2[j];
128 <                point2bbox(v1, bbmin, bbmax);
127 >                r = sqrt(1. - norm[i]*norm[i]);
128 >                d = cent[i] + r*rad;
129 >                if (d > bbmax[i])
130 >                        bbmax[i] = d;
131 >                d = cent[i] - r*rad;
132 >                if (d < bbmin[i])
133 >                        bbmin[i] = d;
134          }
135   }

Diff Legend

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