--- ray/src/rt/rtrace.c	1992/07/10 14:56:24	2.6
+++ ray/src/rt/rtrace.c	1993/05/04 13:26:52	2.14
@@ -50,7 +50,7 @@ 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? */
+int  directvis = 1;			/* sources visible? */
 double  srcsizerat = .25;		/* maximum ratio source size/dist. */
 
 double  specthresh = .15;		/* specular sampling threshold */
@@ -73,10 +73,11 @@ extern OBJREC  Lamb;			/* a Lambertian surface */
 static RAY  thisray;			/* for our convenience */
 
 static int  oputo(), oputd(), oputv(), oputl(), oputL(),
-		oputp(), oputn(), oputs(), oputw(), oputm();
+		oputp(), oputn(), oputN(), oputs(), oputw(), oputm();
 
-static int  (*ray_out[10])(), (*every_out[10])();
-static int  castonly;
+static int  ourtrace(), tabin();
+static int  (*ray_out[16])(), (*every_out[16])();
+static int  castonly = 0;
 
 static int  puta(), putf(), putd();
 
@@ -86,6 +87,10 @@ static int  (*putreal)();
 quit(code)			/* quit program */
 int  code;
 {
+#ifndef  NIX
+	headclean();		/* delete header file */
+	pfclean();		/* clean up persist files */
+#endif
 	exit(code);
 }
 
@@ -118,8 +123,15 @@ char  *fname;
 		sprintf(errmsg, "cannot open input file \"%s\"", fname);
 		error(SYSTEM, errmsg);
 	}
+#ifdef MSDOS
+	if (inform != 'a')
+		setmode(fileno(fp), O_BINARY);
+#endif
 					/* set up output */
-	setoutput(outvals);
+	if (imm_irrad)
+		outvals = "v";
+	else
+		setoutput(outvals);
 	switch (outform) {
 	case 'a': putreal = puta; break;
 	case 'f': putreal = putf; break;
@@ -131,10 +143,11 @@ char  *fname;
 	default:
 		error(CONSISTENCY, "botched output format");
 	}
-	fputformat(formstr(outform), stdout);
-	putchar('\n');
-	if (hresolu > 0 && vresolu > 0)
-		fprtresolu(hresolu, vresolu, stdout);
+	if (hresolu > 0) {
+		if (vresolu > 0)
+			fprtresolu(hresolu, vresolu, stdout);
+		fflush(stdout);
+	}
 					/* process file */
 	while (getvec(orig, inform, fp) == 0 &&
 			getvec(direc, inform, fp) == 0) {
@@ -159,16 +172,18 @@ char  *fname;
 		if (--vcount == 0)			/* check for end */
 			break;
 	}
+	fflush(stdout);
 	if (vcount > 0)
 		error(USER, "read error");
-	fclose(fp);
+	if (fname != NULL)
+		fclose(fp);
 }
 
 
 setoutput(vs)				/* set up output tables */
 register char  *vs;
 {
-	extern int  ourtrace(), (*trace)();
+	extern int  (*trace)();
 	register int (**table)() = ray_out;
 
 	castonly = 1;
@@ -200,9 +215,13 @@ register char  *vs;
 		case 'p':				/* point */
 			*table++ = oputp;
 			break;
-		case 'n':				/* normal */
+		case 'n':				/* perturbed normal */
 			*table++ = oputn;
+			castonly = 0;
 			break;
+		case 'N':				/* unperturbed normal */
+			*table++ = oputN;
+			break;
 		case 's':				/* surface */
 			*table++ = oputs;
 			break;
@@ -398,7 +417,7 @@ register RAY  *r;
 
 
 static
-oputn(r)				/* print normal */
+oputN(r)				/* print unperturbed normal */
 register RAY  *r;
 {
 	if (r->rot < FHUGE) {
@@ -410,6 +429,25 @@ register RAY  *r;
 		(*putreal)(0.0);
 		(*putreal)(0.0);
 	}
+}
+
+
+static
+oputn(r)				/* print perturbed normal */
+RAY  *r;
+{
+	FVECT  pnorm;
+
+	if (r->rot >= FHUGE) {
+		(*putreal)(0.0);
+		(*putreal)(0.0);
+		(*putreal)(0.0);
+		return;
+	}
+	raynormal(pnorm, r);
+	(*putreal)(pnorm[0]);
+	(*putreal)(pnorm[1]);
+	(*putreal)(pnorm[2]);
 }