--- ray/src/hd/rhd_ogl.c	1998/12/31 13:24:36	3.12
+++ ray/src/hd/rhd_ogl.c	2003/02/22 02:07:24	3.19
@@ -1,9 +1,6 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rhd_ogl.c,v 3.19 2003/02/22 02:07:24 greg Exp $";
 #endif
-
 /*
  * OpenGL driver for holodeck display.
  * Based on GLX driver using T-mesh.
@@ -22,12 +19,12 @@ static char SCCSid[] = "$SunId$ SGI";
 
 #include "standard.h"
 
-#include <sys/types.h>
 #include <GL/glx.h>
 #include <GL/glu.h>
 #ifdef STEREO
 #include <X11/extensions/SGIStereo.h>
 #endif
+#include <time.h>
 
 #include "rhd_odraw.h"
 #ifdef DOBJ
@@ -39,6 +36,16 @@ static char SCCSid[] = "$SunId$ SGI";
 #ifndef RAYQLEN
 #define RAYQLEN		0		/* max. rays to queue before flush */
 #endif
+#ifndef MINWIDTH
+#define MINWIDTH	480		/* minimum graphics window width */
+#define MINHEIGHT	400		/* minimum graphics window height */
+#endif
+#ifndef VIEWDIST
+#define VIEWDIST	356		/* assumed viewing distance (mm) */
+#endif
+#ifndef BORWIDTH
+#define BORWIDTH	5		/* border width */
+#endif
 
 #ifndef FEQ
 #define FEQ(a,b)	((a)-(b) <= FTINY && (a)-(b) >= -FTINY)
@@ -60,13 +67,6 @@ static char SCCSid[] = "$SunId$ SGI";
 #define MOVDEG		(-5)		/* degrees to orbit CW/down /frame */
 #define MOVORB(s)	((s)&ShiftMask ? 1 : (s)&ControlMask ? -1 : 0)
 
-#define MINWIDTH	480		/* minimum graphics window width */
-#define MINHEIGHT	400		/* minimum graphics window height */
-
-#define VIEWDIST	356		/* assumed viewing distance (mm) */
-
-#define BORWIDTH	5		/* border width */
-
 #define setstereobuf(bid)	(glXWaitGL(), \
 				XSGISetStereoBuffer(ourdisplay, gwind, bid), \
 				glXWaitX())
@@ -331,14 +331,14 @@ register VIEW	*nv;
 			dev_input();	/* get resize event */
 		}
 		copystruct(&odev.v, nv);	/* setview() already called */
-#ifdef STEREO
-		copystruct(&vwright, nv);
-		d = eyesepdist / sqrt(nv->hn2);
-		VSUM(vwright.vp, nv->vp, nv->hvec, d);
-		/* setview(&vwright);	-- Unnecessary */
-#endif
 		viewflags |= VWCHANGE;
 	}
+#ifdef STEREO
+	copystruct(&vwright, nv);
+	d = eyesepdist / sqrt(nv->hn2);
+	VSUM(vwright.vp, nv->vp, nv->hvec, d);
+	/* setview(&vwright);	-- Unnecessary */
+#endif
 	wipeclean();
 	return(1);
 }
@@ -555,7 +555,7 @@ xferdepth()			/* load and clear depth buffer */
 	glClear(GL_DEPTH_BUFFER_BIT);		/* clear system depth buffer */
 	odDepthMap(0, depthbuffer);		/* transfer depth data */
 	if (pbuf != NULL)
-		free((char *)pbuf);		/* free our portal buffer */
+		free((void *)pbuf);		/* free our portal buffer */
 }
 
 
@@ -566,11 +566,11 @@ freedepth()				/* free recorded depth buffer */
 		return;
 #ifdef STEREO
 	odDepthMap(1, NULL);
-	free((char *)depthright);
+	free((void *)depthright);
 	depthright = NULL;
 #endif
 	odDepthMap(0, NULL);
-	free((char *)depthbuffer);
+	free((void *)depthbuffer);
 	depthbuffer = NULL;
 }
 
@@ -790,6 +790,16 @@ XButtonPressedEvent	*ebut;
 
 
 static
+waitabit()				/* pause a moment */
+{
+	struct timespec	ts;
+	ts.tv_sec = 0;
+	ts.tv_nsec = 5000000;
+	nanosleep(&ts, NULL);
+}
+
+
+static
 getmove(ebut)				/* get view change */
 XButtonPressedEvent	*ebut;
 {
@@ -806,6 +816,8 @@ XButtonPressedEvent	*ebut;
 	setglpersp();			/* start us off in perspective */
 	while (!XCheckMaskEvent(ourdisplay,
 			ButtonReleaseMask, levptr(XEvent))) {
+					/* pause so as not to move too fast */
+		waitabit();
 					/* get cursor position */
 		if (!XQueryPointer(ourdisplay, gwind, &rootw, &childw,
 				&rootx, &rooty, &wx, &wy, &statemask))
@@ -857,7 +869,7 @@ setglpersp()			/* set perspective view in GL */
 		dev_zmax = 100.;
 	} else {
 		dev_zmin = 0.5*depthlim[0];
-		dev_zmax = 2.0*depthlim[1];
+		dev_zmax = 1.25*depthlim[1];
 		if (dev_zmin > dev_zmax/5.)
 			dev_zmin = dev_zmax/5.;
 	}
@@ -865,8 +877,8 @@ setglpersp()			/* set perspective view in GL */
 		dev_zmin = odev.v.vfore;
 	if (odev.v.vaft > FTINY)
 		dev_zmax = odev.v.vaft;
-	if (dev_zmin < dev_zmax/100.)
-		dev_zmin = dev_zmax/100.;
+	if (dev_zmin*500. < dev_zmax)
+		dev_zmin = dev_zmax/500.;
 	setzrat();
 	xmax = dev_zmin * tan(PI/180./2. * odev.v.horiz);
 	xmin = -xmax;
@@ -942,7 +954,7 @@ wipeclean()			/* prepare for redraw */
 		viewflags &= ~VWCHANGE;		/* change noted */
 	} else if (viewflags & VWSTEADY)
 		odRedrawAll();
-	setglpersp(&odev.v);		/* reset view & clipping planes */
+	setglpersp();			/* reset view & clipping planes */
 }