--- ray/src/rt/sphere.c 1992/10/24 08:15:32 2.2 +++ ray/src/rt/sphere.c 2003/06/26 00:58:10 2.6 @@ -1,15 +1,12 @@ -/* Copyright (c) 1992 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: sphere.c,v 2.6 2003/06/26 00:58:10 schorsch Exp $"; #endif - /* * sphere.c - compute ray intersection with spheres. - * - * 8/19/85 */ +#include "copyright.h" + #include "ray.h" #include "otypes.h" @@ -23,7 +20,7 @@ register RAY *r; double root[2]; /* quadratic roots */ int nroots; double t; - register FLOAT *ap; + register RREAL *ap; register int i; if (so->oargs.nfargs != 4) @@ -80,6 +77,8 @@ register RAY *r; } r->rod = -DOT(r->rdir, r->ron); r->rox = NULL; + r->pert[0] = r->pert[1] = r->pert[2] = 0.0; + r->uv[0] = r->uv[1] = 0.0; return(1); /* hit */ }