--- ray/src/rt/rtrace.c	1990/01/19 00:00:26	1.8
+++ ray/src/rt/rtrace.c	1991/05/01 11:16:58	1.13
@@ -20,14 +20,18 @@ 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 '-i' option indicates that
+ *  radiance is computed.  The '-i' or '-I' options indicate that
  *  irradiance values are desired.
  */
 
 #include  "ray.h"
 
+#include  "octree.h"
+
 #include  "otypes.h"
 
+int  imm_irrad = 0;			/* compute immediate irradiance? */
+
 int  inform = 'a';			/* input format */
 int  outform = 'a';			/* output format */
 char  *outvals = "v";			/* output specification */
@@ -51,14 +55,17 @@ 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 */
 
-extern int  oputo(), oputd(), oputv(), oputl(), 
+static int  oputo(), oputd(), oputv(), oputl(), 
 		oputp(), oputn(), oputs(), oputw(), oputm();
 
 static int  (*ray_out[10])(), (*every_out[10])();
+static int  castonly;
 
-extern int  puta(), putf(), putd();
+static int  puta(), putf(), putd();
 
 static int  (*putreal)();
 
@@ -100,10 +107,10 @@ char  *fname;
 			continue;
 		}
 							/* compute and print */
-		if (outvals[0] == 'i')
+		if (imm_irrad)
 			irrad(orig, direc);
 		else
-			radiance(orig, direc);
+			traceray(orig, direc);
 							/* flush if time */
 		if (--nextflush == 0) {
 			fflush(stdout);
@@ -126,12 +133,14 @@ register char  *vs;
 	extern int  ourtrace(), (*trace)();
 	register int (**table)() = ray_out;
 
+	castonly = 1;
 	while (*vs)
 		switch (*vs++) {
 		case 't':				/* trace */
 			*table = NULL;
 			table = every_out;
 			trace = ourtrace;
+			castonly = 0;
 			break;
 		case 'o':				/* origin */
 			*table++ = oputo;
@@ -141,9 +150,11 @@ register char  *vs;
 			break;
 		case 'v':				/* value */
 			*table++ = oputv;
+			castonly = 0;
 			break;
 		case 'l':				/* length */
 			*table++ = oputl;
+			castonly = 0;
 			break;
 		case 'p':				/* point */
 			*table++ = oputp;
@@ -165,7 +176,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)();
@@ -173,7 +184,10 @@ FVECT  org, dir;
 	VCOPY(thisray.rorg, org);
 	VCOPY(thisray.rdir, dir);
 	rayorigin(&thisray, NULL, PRIMARY, 1.0);
-	rayvalue(&thisray);
+	if (castonly)
+		localhit(&thisray, &thescene) || sourcehit(&thisray);
+	else
+		rayvalue(&thisray);
 
 	if (ray_out[0] == NULL)
 		return;
@@ -184,14 +198,9 @@ FVECT  org, dir;
 }
 
 
-irrad(org, dir)			/* compute irradiance value */
+irrad(org, dir)			/* compute immediate irradiance value */
 FVECT  org, dir;
 {
-	static double  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
-	static OBJREC  Lamb = {
-		OVOID, MAT_PLASTIC, "Lambertian",
-		{0, 5, NULL, Lambfa}, NULL, -1,
-	};
 	register int  i;
 
 	for (i = 0; i < 3; i++) {
@@ -299,10 +308,7 @@ static
 oputl(r)				/* print length */
 register RAY  *r;
 {
-	if (r->rot < FHUGE)
-		(*putreal)(r->rot);
-	else
-		(*putreal)(0.0);
+	(*putreal)(r->rt);
 }