--- ray/src/util/glrad.c	1998/06/19 11:29:50	3.6
+++ ray/src/util/glrad.c	2003/06/26 00:58:11	3.15
@@ -1,23 +1,23 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: glrad.c,v 3.15 2003/06/26 00:58:11 schorsch Exp $";
 #endif
-
 /*
  * Program to display Radiance scene using OpenGL.
  */
 
-#include "radogl.h"
-#include "view.h"
-#include "paths.h"
 #include <sys/types.h>
 #include <GL/glx.h>
 #ifndef NOSTEREO
 #include <X11/extensions/SGIStereo.h>
 #endif
 #include <ctype.h>
+#include <time.h>
+
+#include "radogl.h"
+#include "view.h"
+#include "paths.h"
 #include "glradicon.h"
+#include "rtprocess.h"
 
 #ifndef MAXVIEW
 #define MAXVIEW		63		/* maximum number of standard views */
@@ -74,7 +74,7 @@ char	*scene[MAXSCENE+1];		/* material and scene file l
 int	nscenef = 0;			/* number of scene files */
 char	*octree;			/* octree name (NULL if unnec.) */
 
-int	rtpd[3];			/* rtrace process descriptors */
+SUBPROC	rtpd;			/* rtrace process descriptors */
 
 int	silent = 0;			/* run rad silently? */
 int	backvis = 1;			/* back faces visible? */
@@ -92,13 +92,8 @@ int	displist;			/* our scene display list */
 
 int	no_render = 0;			/* don't rerender */
 
-#ifdef BSD
-#define strchr		index
-#endif
-
-extern char	*strchr(), *fgets(), *fgetline(), *atos(), *scan4var();
+extern char	*fgetline(), *atos(), *scan4var();
 extern int	nowarn;			/* turn warnings off? */
-extern time_t	time();
 
 
 main(argc, argv)
@@ -161,10 +156,10 @@ char	*argv[];
 	dev_open(radfile = argv[i]);
 					/* load octree or scene files */
 	if (octree != NULL) {
-		displist = rgl_octlist(octree, NULL, NULL);
+		displist = rgl_octlist(octree, NULL, NULL, NULL);
 		startrtrace(octree);
 	} else
-		displist = rgl_filelist(nscenef, scene);
+		displist = rgl_filelist(nscenef, scene, NULL);
 					/* set initial view */
 	dev_view(currentview < 0 ? &thisview : vwl[currentview].v);
 					/* input/render loop */
@@ -173,21 +168,24 @@ char	*argv[];
 					/* all done */
 	quit(0);
 userr:
-	fprintf(stderr, "Usage: %s [-w][-b][-v view] rfile [VAR=value]..\n",
+	fprintf(stderr,
+		"Usage: %s [-w][-s][-b][-S][-v view] rfile [VAR=value]..\n",
 			argv[0]);
 	quit(1);
 }
 
 
+void
 quit(code)				/* exit gracefully */
 int	code;
 {
 	if (ourdisplay != NULL)
 		dev_close();
-	if (rtpd[2] > 0) {
-		if (close_process(rtpd) > 0)
+	/* if (rtpd.pid > 0) { */
+	if (rtpd.running) {
+		if (close_process(&rtpd) > 0)
 			wputs("bad exit status from rtrace\n");
-		rtpd[2] = 0;
+		/* rtpd.pid = 0; */
 	}
 	exit(code);
 }
@@ -203,7 +201,7 @@ char	*octname;
 	if (nowarn) av[ac++] = "-w-";
 	av[ac++] = octname;
 	av[ac] = NULL;
-	if (open_process(rtpd, av) <= 0)
+	if (open_process(&rtpd, av) <= 0)
 		error(SYSTEM, "cannot start rtrace process");
 }
 
@@ -297,7 +295,7 @@ char	**av;
 					atof(sskip2(buf+4,1)),
 					atof(sskip2(buf+4,2)));
 		else if (backvis && !strncmp(buf, "-bv", 3) &&
-				(!buf[3] || strchr(" 0-FfNn", buf[3]) != NULL))
+				(!buf[3] || strchr("0-FfNn \n",buf[3])!=NULL))
 			backvis = 0;
 	fclose(fp);
 	unlink(optfile);			/* delete options file */
@@ -423,15 +421,14 @@ char  *id;
 	glDepthFunc(GL_LESS);
 	glShadeModel(GL_SMOOTH);
 	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-	glLightModelf(GL_LIGHT_MODEL_TWO_SIDE, GL_TRUE);
+	glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_TRUE);
 	glEnable(GL_LIGHTING);
+	glFrontFace(GL_CCW);
+	glCullFace(GL_BACK);
 	if (backvis)
 		glDisable(GL_CULL_FACE);
-	else {
-		glFrontFace(GL_CCW);
-		glCullFace(GL_BACK);
+	else
 		glEnable(GL_CULL_FACE);
-	}
 	glDrawBuffer(GL_BACK);
 					/* figure out sensible view */
 	pwidth = (double)DisplayWidthMM(ourdisplay, ourscreen) /
@@ -626,6 +623,16 @@ int	dx, dy, mov, orb;
 }
 
 
+static
+waitabit()				/* pause a moment */
+{
+	struct timespec	ts;
+	ts.tv_sec = 0;
+	ts.tv_nsec = 5000000;
+	nanosleep(&ts, NULL);
+}
+
+
 getmove(ebut)				/* get view change */
 XButtonPressedEvent	*ebut;
 {
@@ -642,6 +649,8 @@ XButtonPressedEvent	*ebut;
 
 	while (!XCheckMaskEvent(ourdisplay,
 			ButtonReleaseMask, levptr(XEvent))) {
+					/* pause so as not to move too fast */
+		waitabit();
 
 		if (!XQueryPointer(ourdisplay, gwind, &rootw, &childw,
 				&rootx, &rooty, &wx, &wy, &statemask))
@@ -669,7 +678,8 @@ double	md;
 {
 	float	fbuf[6];
 				/* check to see if rtrace is running */
-	if (rtpd[2] <= 0)
+	/* if (rtpd.pid <= 0) */
+	if (!rtpd.running)
 		return(0);
 				/* assign origin */
 	fbuf[0] = org[0]; fbuf[1] = org[1]; fbuf[2] = org[2];
@@ -677,8 +687,8 @@ double	md;
 	if (md <= FTINY) md = FHUGE;
 	fbuf[3] = dir[0]*md; fbuf[4] = dir[1]*md; fbuf[5] = dir[2]*md;
 				/* trace that ray */
-	if (process(rtpd, fbuf, fbuf, 4*sizeof(float), 6*sizeof(float)) !=
-			4*sizeof(float))
+	if (process(&rtpd, (char *)fbuf, (char *)fbuf,
+			4*sizeof(float), 6*sizeof(float)) != 4*sizeof(float))
 		error(INTERNAL, "error getting data back from rtrace process");
 	if (fbuf[3] >= .99*FHUGE)
 		return(0);	/* missed local objects */