--- ray/src/rt/rv3.c	1990/10/14 11:06:27	1.17
+++ ray/src/rt/rv3.c	1993/02/11 16:42:22	2.4
@@ -19,10 +19,20 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  "random.h"
 
 #ifndef WFLUSH
-#define WFLUSH		30		/* flush after this many rays */
+#ifdef SPEED
+#define WFLUSH		(5*SPEED)
+#else
+#define WFLUSH		100		/* flush after this many rays */
 #endif
+#endif
 
+#ifdef  SMLFLT
+#define  sscanvec(s,v)	(sscanf(s,"%f %f %f",v,v+1,v+2)==3)
+#else
+#define  sscanvec(s,v)	(sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
+#endif
 
+
 getrect(s, r)				/* get a box */
 char  *s;
 register RECT  *r;
@@ -87,7 +97,7 @@ double  *mp;
 		error(COMMAND, "illegal magnification");
 		return(-1);
 	}
-	if (sscanf(s, "%*lf %lf %lf %lf", &vec[0], &vec[1], &vec[2]) != 3) {
+	if (!sscanvec(sskip(s), vec)) {
 		if (dev->getcur == NULL)
 			return(-1);
 		(*dev->comout)("Pick view center\n");
@@ -157,6 +167,7 @@ int  xmin, ymin, xmax, ymax;
 		setcolor(thisray.rcol, 0.0, 0.0, 0.0);
 	} else {
 		rayorigin(&thisray, NULL, PRIMARY, 1.0);
+		samplendx++;
 		rayvalue(&thisray);
 	}
 
@@ -178,6 +189,8 @@ newimage()				/* start a new image */
 {
 						/* free old image */
 	freepkids(&ptrunk);
+						/* save reserve memory */
+	fillreserves();
 						/* compute resolution */
 	hresolu = dev->xsiz;
 	vresolu = dev->ysiz;
@@ -372,7 +385,6 @@ moveview(angle, elev, mag, vc)			/* move viewpoint */
 double  angle, elev, mag;
 FVECT  vc;
 {
-	extern double  sqrt(), dist2();
 	double  d;
 	FVECT  v1;
 	VIEW  nv;
@@ -432,27 +444,4 @@ double  zf;
 			vp->vert = asin(vp->vert) / (PI/180./2.);
 		return;
 	}
-}
-
-
-spinvector(vres, vorig, vnorm, theta)	/* rotate vector around normal */
-FVECT  vres, vorig, vnorm;
-double  theta;
-{
-	extern double  sin(), cos();
-	double  sint, cost, dotp;
-	FVECT  vperp;
-	register int  i;
-	
-	if (theta == 0.0) {
-		VCOPY(vres, vorig);
-		return;
-	}
-	sint = sin(theta);
-	cost = cos(theta);
-	dotp = DOT(vorig, vnorm);
-	fcross(vperp, vnorm, vorig);
-	for (i = 0; i < 3; i++)
-		vres[i] = vnorm[i]*dotp*(1.-cost) +
-				vorig[i]*cost + vperp[i]*sint;
 }