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

Comparing ray/src/rt/sphere.c (file contents):
Revision 1.2 by greg, Wed Apr 19 22:24:30 1989 UTC vs.
Revision 2.3 by greg, Sat Feb 22 02:07:29 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1986 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   *  sphere.c - compute ray intersection with spheres.
6 + */
7 +
8 + /* ====================================================================
9 + * The Radiance Software License, Version 1.0
10   *
11 < *     8/19/85
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   */
64  
65   #include  "ray.h"
# Line 23 | Line 75 | register RAY  *r;
75          double  root[2];        /* quadratic roots */
76          int  nroots;
77          double  t;
78 <        register double  *ap;
78 >        register FLOAT  *ap;
79          register int  i;
80  
81 <        if (so->oargs.nfargs != 4 || so->oargs.farg[3] <= FTINY)
82 <                objerror(so, USER, "bad arguments");
31 <
81 >        if (so->oargs.nfargs != 4)
82 >                objerror(so, USER, "bad # arguments");
83          ap = so->oargs.farg;
84 +        if (ap[3] < -FTINY) {
85 +                objerror(so, WARNING, "negative radius");
86 +                so->otype = so->otype == OBJ_SPHERE ?
87 +                                OBJ_BUBBLE : OBJ_SPHERE;
88 +                ap[3] = -ap[3];
89 +        } else if (ap[3] <= FTINY)
90 +                objerror(so, USER, "zero radius");
91  
92          /*
93           *      We compute the intersection by substituting into
# Line 37 | Line 95 | register RAY  *r;
95           *  quadratic equation in t is then solved for the
96           *  smallest positive root, which is our point of
97           *  intersection.
98 <         *      Because the ray direction is normalized, a is always 1.
98 >         *      Since the ray is normalized, a should always be
99 >         *  one.  We compute it here to prevent instability in the
100 >         *  intersection calculation.
101           */
102 <
103 <        a = 1.0;                /* compute quadratic coefficients */
44 <        b = c = 0.0;
102 >                                /* compute quadratic coefficients */
103 >        a = b = c = 0.0;
104          for (i = 0; i < 3; i++) {
105 +                a += r->rdir[i]*r->rdir[i];
106                  t = r->rorg[i] - ap[i];
107                  b += 2.0*r->rdir[i]*t;
108                  c += t*t;
# Line 71 | Line 131 | register RAY  *r;
131                  r->ron[i] = (r->rop[i] - ap[i]) / a;
132          }
133          r->rod = -DOT(r->rdir, r->ron);
134 <        r->rofs = 1.0; setident4(r->rofx);
75 <        r->robs = 1.0; setident4(r->robx);
134 >        r->rox = NULL;
135  
136          return(1);                      /* hit */
137   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines