--- ray/src/hd/rhdisp.c	1997/12/19 14:49:05	3.17
+++ ray/src/hd/rhdisp.c	1998/01/08 21:19:05	3.23
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ SGI";
@@ -24,10 +24,20 @@ char	cmdlist[DC_NCMDS][8] = DC_INIT;
 
 int	imm_mode = 0;		/* bundles are being delivered immediately */
 
+int	do_outside = 0;		/* render from outside sections */
+
 char	*progname;		/* global argv[0] */
 
 FILE	*sstdin, *sstdout;	/* server's standard input and output */
 
+#ifdef DEBUG
+#include <sys/types.h>
+extern time_t	time();
+static time_t	tmodesw;
+static time_t	timm, tadd;
+static long	nimmrays, naddrays;
+#endif
+
 #define RDY_SRV		01
 #define RDY_DEV		02
 #define RDY_SIN		04
@@ -53,9 +63,21 @@ char	*argv[];
 		sstdin = fdopen(inp, "r");
 					/* set command error vector */
 	erract[COMMAND].pf = eputs;
+#ifdef DEBUG
+	tmodesw = time(NULL);
+#endif
 					/* enter main loop */
 	do {
 		rdy = disp_wait();
+		if (rdy & RDY_SRV) {		/* process server result */
+			res = serv_result();
+			if (pause && res != DS_SHUTDOWN) {
+				serv_request(DR_ATTEN, 0, NULL);
+				while ((res = serv_result()) != DS_ACKNOW &&
+						res != DS_SHUTDOWN)
+					;
+			}
+		}
 		if (rdy & RDY_DEV) {		/* user input from driver */
 			inp = dev_input();
 			if (inp & DFL(DC_SETVIEW))
@@ -98,16 +120,17 @@ char	*argv[];
 				pause = 0;
 				break;
 			}
-		if (rdy & RDY_SRV) {		/* process server result */
-			res = serv_result();
-			if (pause && res != DS_SHUTDOWN) {
-				serv_request(DR_ATTEN, 0, NULL);
-				while ((res = serv_result()) != DS_ACKNOW &&
-						res != DS_SHUTDOWN)
-					;
-			}
-		}
 	} while (res != DS_SHUTDOWN);
+#ifdef DEBUG
+	if (timm && nimmrays)
+		fprintf(stderr,
+			"%s: %.1f rays recalled/second (%ld rays total)\n",
+				progname, (double)nimmrays/timm, nimmrays);
+	if (tadd && naddrays)
+		fprintf(stderr,
+			"%s: %.1f rays calculated/second (%ld rays total)\n",
+				progname, (double)naddrays/tadd, naddrays);
+#endif
 					/* all done */
 	quit(0);
 }
@@ -136,6 +159,7 @@ disp_wait()			/* wait for more input */
 	n = odev.ifd+1;
 	if (sstdin != NULL) {
 		FD_SET(fileno(sstdin), &readset);
+		FD_SET(fileno(sstdin), &errset);
 		if (fileno(sstdin) >= n)
 			n = fileno(sstdin) + 1;
 	}
@@ -150,7 +174,8 @@ disp_wait()			/* wait for more input */
 		flgs |= RDY_SRV;
 	if (FD_ISSET(odev.ifd, &readset) || FD_ISSET(odev.ifd, &errset))
 		flgs |= RDY_DEV;
-	if (sstdin != NULL && FD_ISSET(fileno(sstdin), &readset))
+	if (sstdin != NULL && (FD_ISSET(fileno(sstdin), &readset) ||
+				FD_ISSET(fileno(sstdin), &errset)))
 		flgs |= RDY_SIN;
 	return(flgs);
 }
@@ -160,6 +185,7 @@ add_holo(hdg)			/* register a new holodeck section */
 HDGRID	*hdg;
 {
 	VIEW	nv;
+	double	d;
 	register int	hd;
 
 	for (hd = 0; hd < HDMAX && hdlist[hd] != NULL; hd++)
@@ -180,6 +206,12 @@ HDGRID	*hdg;
 	VSUM(nv.vp, nv.vp, hdlist[0]->xv[2], 0.5);
 	fcross(nv.vdir, hdlist[0]->xv[1], hdlist[0]->xv[2]);
 	VCOPY(nv.vup, hdlist[0]->xv[2]);
+	if (do_outside) {
+		normalize(nv.vdir);
+		d = VLEN(hdlist[0]->xv[1]);
+		d += VLEN(hdlist[0]->xv[2]);
+		VSUM(nv.vp, nv.vp, nv.vdir, -d);
+	}
 	new_view(&nv);
 }
 
@@ -203,6 +235,10 @@ register PACKHEAD	*p;
 		VSUM(wp, ro, rd, d);		/* might be behind viewpoint */
 		dev_value(packra(p)[i].v, wp, rd);
 	}
+#ifdef DEBUG
+	if (imm_mode) nimmrays += p->nr;
+	else naddrays += p->nr;
+#endif
 }
 
 
@@ -247,12 +283,15 @@ int
 usr_input()			/* get user input and process it */
 {
 	VIEW	vparams;
-	char	cmd[128];
+	char	cmd[256];
 	register char	*args;
 	register int	i;
 
-	if (fgets(cmd, sizeof(cmd), sstdin) == NULL)
-		return(DC_QUIT);
+	if (fgets(cmd, sizeof(cmd), sstdin) == NULL) {
+		fclose(sstdin);
+		sstdin = NULL;
+		return(0);
+	}
 	for (args = cmd; *args && !isspace(*args); args++)
 		;
 	while (isspace(*args))
@@ -289,6 +328,7 @@ usr_input()			/* get user input and process it */
 		break;
 	case DC_REDRAW:			/* redraw from server */
 		imm_mode = beam_sync() > 0;
+		dev_clear();
 		break;
 	case DC_KILL:			/* kill rtrace process(es) */
 		serv_request(DR_KILL, 0, NULL);
@@ -352,11 +392,20 @@ serv_result()			/* get next server result and process 
 			error(INTERNAL, "bad holodeck record from server");
 		add_holo((HDGRID *)buf);
 		break;
+	case DS_OUTSECT:
+		do_outside = 1;
+		break;
 	case DS_STARTIMM:
 	case DS_ENDIMM:
+#ifdef DEBUG
+		if (imm_mode != (msg.type==DS_STARTIMM)) {
+			time_t	tnow = time(NULL);
+			if (imm_mode) timm += tnow - tmodesw;
+			else tadd += tnow - tmodesw;
+			tmodesw = tnow;
+		}
+#endif
 		imm_mode = msg.type==DS_STARTIMM;
-		if (msg.type == DS_ENDIMM)
-			dev_flush();		/* update display NOW */
 		/* fall through */
 	case DS_ACKNOW:
 	case DS_SHUTDOWN: