--- ray/src/rt/sphere.c 1990/12/15 15:03:37 1.3 +++ ray/src/rt/sphere.c 1991/10/23 13:43:48 1.5 @@ -1,4 +1,4 @@ -/* Copyright (c) 1990 Regents of the University of California */ +/* Copyright (c) 1991 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -23,13 +23,19 @@ register RAY *r; double root[2]; /* quadratic roots */ int nroots; double t; - register double *ap; + register FLOAT *ap; register int i; - if (so->oargs.nfargs != 4 || so->oargs.farg[3] <= FTINY) - objerror(so, USER, "bad arguments"); - + if (so->oargs.nfargs != 4) + objerror(so, USER, "bad # arguments"); ap = so->oargs.farg; + if (ap[3] < -FTINY) { + objerror(so, WARNING, "negative radius"); + so->otype = so->otype == OBJ_SPHERE ? + OBJ_BUBBLE : OBJ_SPHERE; + ap[3] = -ap[3]; + } else if (ap[3] <= FTINY) + objerror(so, USER, "zero radius"); /* * We compute the intersection by substituting into