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

Comparing ray/src/rt/sphere.c (file contents):
Revision 1.3 by greg, Sat Dec 15 15:03:37 1990 UTC vs.
Revision 1.4 by greg, Wed May 22 16:59:44 1991 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1990 Regents of the University of California */
1 > /* Copyright (c) 1991 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 26 | Line 26 | register RAY  *r;
26          register double  *ap;
27          register int  i;
28  
29 <        if (so->oargs.nfargs != 4 || so->oargs.farg[3] <= FTINY)
30 <                objerror(so, USER, "bad arguments");
31 <
29 >        if (so->oargs.nfargs != 4)
30 >                objerror(so, USER, "bad # arguments");
31          ap = so->oargs.farg;
32 +        if (ap[3] < -FTINY) {
33 +                objerror(so, WARNING, "negative radius");
34 +                so->otype = so->otype == OBJ_SPHERE ?
35 +                                OBJ_BUBBLE : OBJ_SPHERE;
36 +                ap[3] = -ap[3];
37 +        } else if (ap[3] <= FTINY)
38 +                objerror(so, USER, "zero radius");
39  
40          /*
41           *      We compute the intersection by substituting into

Diff Legend

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