--- ray/src/rt/rtrace.c	1990/01/04 11:16:05	1.7
+++ ray/src/rt/rtrace.c	1991/03/28 10:16:35	1.12
@@ -20,12 +20,14 @@ 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 '-oi' or '-oI' options indicate that
  *  irradiance values are desired.
  */
 
 #include  "ray.h"
 
+#include  "octree.h"
+
 #include  "otypes.h"
 
 int  inform = 'a';			/* input format */
@@ -53,16 +55,23 @@ int  ambincl = -1;			/* include == 1, exclude == 0 */
 
 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)();
 
+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;
 {
@@ -102,6 +111,8 @@ char  *fname;
 							/* compute and print */
 		if (outvals[0] == 'i')
 			irrad(orig, direc);
+		else if (outvals[0] == 'I')
+			Irrad(orig, direc);
 		else
 			radiance(orig, direc);
 							/* flush if time */
@@ -126,12 +137,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 +154,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;
@@ -173,7 +188,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;
@@ -187,11 +205,6 @@ FVECT  org, dir;
 irrad(org, dir)			/* compute 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++) {
@@ -213,6 +226,22 @@ 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;
@@ -226,12 +255,12 @@ FILE  *fp;
 			return(-1);
 		break;
 	case 'f':					/* binary float */
-		if (fread(vf, sizeof(float), 3, fp) != 3)
+		if (fread((char *)vf, sizeof(float), 3, fp) != 3)
 			return(-1);
 		vec[0] = vf[0]; vec[1] = vf[1]; vec[2] = vf[2];
 		break;
 	case 'd':					/* binary double */
-		if (fread(vec, sizeof(double), 3, fp) != 3)
+		if (fread((char *)vec, sizeof(double), 3, fp) != 3)
 			return(-1);
 		break;
 	}
@@ -299,10 +328,7 @@ static
 oputl(r)				/* print length */
 register RAY  *r;
 {
-	if (r->rot < FHUGE)
-		(*putreal)(r->rot);
-	else
-		(*putreal)(0.0);
+	(*putreal)(r->rt);
 }
 
 
@@ -382,7 +408,7 @@ static
 putd(v)				/* print binary double */
 double  v;
 {
-	fwrite(&v, sizeof(v), 1, stdout);
+	fwrite((char *)&v, sizeof(v), 1, stdout);
 }
 
 
@@ -392,5 +418,5 @@ double  v;
 {
 	float f = v;
 
-	fwrite(&f, sizeof(f), 1, stdout);
+	fwrite((char *)&f, sizeof(f), 1, stdout);
 }