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

Comparing ray/src/rt/o_cone.c (file contents):
Revision 2.2 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.7 by greg, Mon Oct 25 22:57:45 2010 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   *  o_cone.c - routine to determine ray intersection with cones.
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
11 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 < *
14 < * Redistribution and use in source and binary forms, with or without
15 < * modification, are permitted provided that the following conditions
16 < * are met:
17 < *
18 < * 1. Redistributions of source code must retain the above copyright
19 < *         notice, this list of conditions and the following disclaimer.
20 < *
21 < * 2. Redistributions in binary form must reproduce the above copyright
22 < *       notice, this list of conditions and the following disclaimer in
23 < *       the documentation and/or other materials provided with the
24 < *       distribution.
25 < *
26 < * 3. The end-user documentation included with the redistribution,
27 < *           if any, must include the following acknowledgment:
28 < *             "This product includes Radiance software
29 < *                 (http://radsite.lbl.gov/)
30 < *                 developed by the Lawrence Berkeley National Laboratory
31 < *               (http://www.lbl.gov/)."
32 < *       Alternately, this acknowledgment may appear in the software itself,
33 < *       if and wherever such third-party acknowledgments normally appear.
34 < *
35 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 < *       and "The Regents of the University of California" must
37 < *       not be used to endorse or promote products derived from this
38 < *       software without prior written permission. For written
39 < *       permission, please contact [email protected].
40 < *
41 < * 5. Products derived from this software may not be called "Radiance",
42 < *       nor may "Radiance" appear in their name, without prior written
43 < *       permission of Lawrence Berkeley National Laboratory.
44 < *
45 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 < * SUCH DAMAGE.
57 < * ====================================================================
58 < *
59 < * This software consists of voluntary contributions made by many
60 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 < * information on Lawrence Berkeley National Laboratory, please see
62 < * <http://www.lbl.gov/>.
63 < */
8 > #include "copyright.h"
9  
10   #include  "ray.h"
66
11   #include  "otypes.h"
12 <
12 > #include  "rtotypes.h"
13   #include  "cone.h"
14  
15  
16 < o_cone(o, r)                    /* intersect ray with cone */
17 < OBJREC  *o;
18 < register RAY  *r;
16 > extern int
17 > o_cone(                 /* intersect ray with cone */
18 >        OBJREC  *o,
19 >        register RAY  *r
20 > )
21   {
22          FVECT  rox, rdx;
23          double  a, b, c;
# Line 134 | Line 80 | register RAY  *r;
80                          return(0);                      /* outside radii */
81                  r->ro = o;
82                  r->rot = root[0];
83 <                for (i = 0; i < 3; i++)
138 <                        r->rop[i] = r->rorg[i] + r->rdir[i]*r->rot;
83 >                VSUM(r->rop, r->rorg, r->rdir, r->rot);
84                  VCOPY(r->ron, co->ad);
85                  r->rod = -rdx[2];
86                  r->rox = NULL;
# Line 150 | Line 95 | register RAY  *r;
95                  if (root[rn] >= r->rot)
96                          break;                  /* too big */
97                                                  /* check endpoints */
98 <                for (i = 0; i < 3; i++) {
99 <                        rox[i] = r->rorg[i] + root[rn]*r->rdir[i];
155 <                        rdx[i] = rox[i] - CO_P0(co)[i];
156 <                }
98 >                VSUM(rox, r->rorg, r->rdir, root[rn]);
99 >                VSUB(rdx, rox, CO_P0(co));
100                  b = DOT(rdx, co->ad);
101                  if (b < 0.0)
102                          continue;               /* before p0 */
# Line 180 | Line 123 | register RAY  *r;
123                  if (o->otype == OBJ_CONE || o->otype == OBJ_CUP)
124                          for (i = 0; i < 3; i++)
125                                  r->ron[i] = (co->al*r->ron[i] - c*co->ad[i])
126 <                                                /co->sl;
126 >                                                / co->sl;
127 >                a = DOT(r->ron, r->ron);
128 >                if (a > 1.+FTINY || a < 1.-FTINY) {
129 >                        c = 1./(.5 + .5*a);     /* avoid numerical error */
130 >                        r->ron[0] *= c; r->ron[1] *= c; r->ron[2] *= c;
131 >                }
132                  r->rod = -DOT(r->rdir, r->ron);
133 +                r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
134 +                r->uv[0] = r->uv[1] = 0.0;
135                  r->rox = NULL;
136                  return(1);                      /* good */
137          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines