--- ray/src/hd/rhd_ogl.c 2003/02/22 02:07:24 3.19 +++ ray/src/hd/rhd_ogl.c 2003/07/21 22:30:18 3.22 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rhd_ogl.c,v 3.19 2003/02/22 02:07:24 greg Exp $"; +static const char RCSid[] = "$Id: rhd_ogl.c,v 3.22 2003/07/21 22:30:18 schorsch Exp $"; #endif /* * OpenGL driver for holodeck display. @@ -243,7 +243,7 @@ char *id; setstereobuf(STEREO_BUFFER_LEFT); #endif checkglerr("setting rendering parameters"); - copystruct(&odev.v, &stdview); + odev.v = stdview; odev.v.type = VT_PER; viewflags = VWSTEADY; /* view starts static */ /* map the window */ @@ -330,11 +330,11 @@ register VIEW *nv; XResizeWindow(ourdisplay, gwind, odev.hres, odev.vres); dev_input(); /* get resize event */ } - copystruct(&odev.v, nv); /* setview() already called */ + odev.v = *nv; /* setview() already called */ viewflags |= VWCHANGE; } #ifdef STEREO - copystruct(&vwright, nv); + vwright = *nv; d = eyesepdist / sqrt(nv->hn2); VSUM(vwright.vp, nv->vp, nv->hvec, d); /* setview(&vwright); -- Unnecessary */ @@ -347,7 +347,6 @@ register VIEW *nv; dev_section(gfn, pfn) /* add octree for geometry rendering */ char *gfn, *pfn; { - extern char *index(); char *cp; if (gfn == NULL) { @@ -720,7 +719,7 @@ int dx, dy, mov, orb; double d, d1; register int li; /* start with old view */ - copystruct(&nv, &odev.v); + nv = odev.v; /* orient our motion */ if (viewray(v1, odir, &odev.v, (dx+.5)/odev.hres, (dy+.5)/odev.vres) < -FTINY) @@ -794,7 +793,7 @@ waitabit() /* pause a moment */ { struct timespec ts; ts.tv_sec = 0; - ts.tv_nsec = 5000000; + ts.tv_nsec = 50000000; nanosleep(&ts, NULL); }