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

Comparing ray/src/ot/sphere.c (file contents):
Revision 1.2 by greg, Sat Oct 14 11:19:36 1989 UTC vs.
Revision 2.6 by greg, Wed Apr 20 18:51:35 2016 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 - routines for creating octrees for spheres.
6   *
# Line 53 | Line 50 | static char SCCSid[] = "$SunId$ LBL";
50   */
51  
52  
53 < o_sphere(o, cu)                 /* determine if sphere intersects cube */
54 < OBJREC  *o;
55 < register CUBE  *cu;
53 > int
54 > o_sphere(                       /* determine if sphere intersects cube */
55 >        OBJREC  *o,
56 >        CUBE  *cu
57 > )
58   {
59          FVECT  v1;
60          double  d1, d2;
61 <        register double  *fa;
62 <        register int  i;
61 >        RREAL  *fa;
62 >        int  i;
63   #define  cent           fa
64   #define  rad            fa[3]
65                                          /* get arguments */
66 +        if (o->oargs.nfargs != 4)
67 +                objerror(o, USER, "bad # arguments");
68          fa = o->oargs.farg;
69 <        if (o->oargs.nfargs != 4 || rad <= FTINY)
70 <                objerror(o, USER, "bad arguments");
69 >        if (rad < -FTINY) {
70 >                objerror(o, WARNING, "negative radius");
71 >                o->otype = o->otype == OBJ_SPHERE ?
72 >                                OBJ_BUBBLE : OBJ_SPHERE;
73 >                rad = -rad;
74 >        } else if (rad <= FTINY) {
75 >                objerror(o, WARNING, "zero radius");
76 >                return(O_MISS);
77 >        }
78  
79          d1 = ROOT3/2.0 * cu->cusize;    /* bounding radius for cube */
80  

Diff Legend

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