--- ray/src/rt/rtrace.c	1991/03/28 10:16:35	1.12
+++ ray/src/rt/rtrace.c	1992/03/12 09:46:19	2.5
@@ -20,7 +20,7 @@ static char SCCSid[] = "$SunId$ LBL";
  *  All values default to ascii representation of real
  *  numbers.  Binary representations can be selected
  *  with '-ff' for float or '-fd' for double.  By default,
- *  radiance is computed.  The '-oi' or '-oI' options indicate that
+ *  radiance is computed.  The '-i' or '-I' options indicate that
  *  irradiance values are desired.
  */
 
@@ -30,6 +30,12 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "otypes.h"
 
+int  dimlist[MAXDIM];			/* sampling dimensions */
+int  ndims = 0;				/* number of sampling dimensions */
+int  samplendx = 0;			/* index for this sample */
+
+int  imm_irrad = 0;			/* compute immediate irradiance? */
+
 int  inform = 'a';			/* input format */
 int  outform = 'a';			/* output format */
 char  *outvals = "v";			/* output specification */
@@ -40,7 +46,14 @@ int  vresolu = 0;			/* vertical resolution */
 double  dstrsrc = 0.0;			/* square source distribution */
 double  shadthresh = .05;		/* shadow threshold */
 double  shadcert = .5;			/* shadow certainty */
+int  directrelay = 1;			/* number of source relays */
+int  vspretest = 512;			/* virtual source pretest density */
+int  directinvis = 0;			/* sources invisible? */
+double  srcsizerat = .25;		/* maximum ratio source size/dist. */
 
+double  specthresh = .15;		/* specular sampling threshold */
+double  specjitter = 1.;		/* specular sampling jitter */
+
 int  maxdepth = 6;			/* maximum recursion depth */
 double  minweight = 4e-3;		/* minimum ray weight */
 
@@ -53,9 +66,11 @@ int  ambounce = 0;			/* ambient bounces */
 char  *amblist[128];			/* ambient include/exclude list */
 int  ambincl = -1;			/* include == 1, exclude == 0 */
 
+extern OBJREC  Lamb;			/* a Lambertian surface */
+
 static RAY  thisray;			/* for our convenience */
 
-static int  oputo(), oputd(), oputv(), oputl(), 
+static int  oputo(), oputd(), oputv(), oputl(), oputL(),
 		oputp(), oputn(), oputs(), oputw(), oputm();
 
 static int  (*ray_out[10])(), (*every_out[10])();
@@ -65,13 +80,7 @@ static int  puta(), putf(), putd();
 
 static int  (*putreal)();
 
-static double  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
-static OBJREC  Lamb = {
-	OVOID, MAT_PLASTIC, "Lambertian",
-	{0, 5, NULL, Lambfa}, NULL, -1,
-};					/* a Lambertian surface */
 
-
 quit(code)			/* quit program */
 int  code;
 {
@@ -108,13 +117,12 @@ char  *fname;
 			fflush(stdout);
 			continue;
 		}
+		samplendx++;
 							/* compute and print */
-		if (outvals[0] == 'i')
+		if (imm_irrad)
 			irrad(orig, direc);
-		else if (outvals[0] == 'I')
-			Irrad(orig, direc);
 		else
-			radiance(orig, direc);
+			traceray(orig, direc);
 							/* flush if time */
 		if (--nextflush == 0) {
 			fflush(stdout);
@@ -156,10 +164,13 @@ register char  *vs;
 			*table++ = oputv;
 			castonly = 0;
 			break;
-		case 'l':				/* length */
+		case 'l':				/* effective distance */
 			*table++ = oputl;
 			castonly = 0;
 			break;
+		case 'L':				/* single ray length */
+			*table++ = oputL;
+			break;
 		case 'p':				/* point */
 			*table++ = oputp;
 			break;
@@ -180,7 +191,7 @@ register char  *vs;
 }
 
 
-radiance(org, dir)		/* compute radiance value */
+traceray(org, dir)		/* compute and print ray value(s) */
 FVECT  org, dir;
 {
 	register int  (**tp)();
@@ -202,7 +213,7 @@ FVECT  org, dir;
 }
 
 
-irrad(org, dir)			/* compute irradiance value */
+irrad(org, dir)			/* compute immediate irradiance value */
 FVECT  org, dir;
 {
 	register int  i;
@@ -226,33 +237,25 @@ FVECT  org, dir;
 }
 
 
-Irrad(org, dir)		/* compute irradiance value after intersection */
-FVECT  org, dir;
-{
-					/* compute intersection */
-	VCOPY(thisray.rorg, org);
-	VCOPY(thisray.rdir, dir);
-	rayorigin(&thisray, NULL, PRIMARY, 1.0);
-	localhit(&thisray, &thescene);
-	if (thisray.ro != NULL)		/* pretend we hit Lambertian surf. */
-		(*ofun[Lamb.otype].funp)(&Lamb, &thisray);
-	oputv(&thisray);
-	if (outform == 'a')
-		putchar('\n');
-}
-
-
 getvec(vec, fmt, fp)		/* get a vector from fp */
 register FVECT  vec;
 int  fmt;
 FILE  *fp;
 {
+	extern char  *fgetword();
 	static float  vf[3];
+	static double  vd[3];
+	char  buf[32];
+	register int  i;
 
 	switch (fmt) {
 	case 'a':					/* ascii */
-		if (fscanf(fp, "%lf %lf %lf", vec, vec+1, vec+2) != 3)
-			return(-1);
+		for (i = 0; i < 3; i++) {
+			if (fgetword(buf, sizeof(buf), fp) == NULL ||
+					!isflt(buf))
+				return(-1);
+			vec[i] = atof(buf);
+		}
 		break;
 	case 'f':					/* binary float */
 		if (fread((char *)vf, sizeof(float), 3, fp) != 3)
@@ -260,8 +263,9 @@ FILE  *fp;
 		vec[0] = vf[0]; vec[1] = vf[1]; vec[2] = vf[2];
 		break;
 	case 'd':					/* binary double */
-		if (fread((char *)vec, sizeof(double), 3, fp) != 3)
+		if (fread((char *)vd, sizeof(double), 3, fp) != 3)
 			return(-1);
+		vec[0] = vd[0]; vec[1] = vd[1]; vec[2] = vd[2];
 		break;
 	}
 	return(0);
@@ -325,10 +329,18 @@ register RAY  *r;
 
 
 static
-oputl(r)				/* print length */
+oputl(r)				/* print effective distance */
 register RAY  *r;
 {
 	(*putreal)(r->rt);
+}
+
+
+static
+oputL(r)				/* print single ray length */
+register RAY  *r;
+{
+	(*putreal)(r->rot);
 }