--- ray/src/rt/rv3.c 1989/02/02 10:41:39 1.1 +++ ray/src/rt/rv3.c 1989/06/13 08:17:24 1.5 @@ -260,28 +260,37 @@ register VIEW *vp; } -moveview(angle, mag, vc) /* move viewpoint */ -double angle, mag; +moveview(angle, elev, mag, vc) /* move viewpoint */ +double angle, elev, mag; FVECT vc; { extern double sqrt(), dist2(); double d; + FVECT v1; VIEW nv; register int i; VCOPY(nv.vup, ourview.vup); nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu; spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.)); - d = sqrt(dist2(ourview.vp, vc)) / mag; - for (i = 0; i < 3; i++) - nv.vp[i] = vc[i] - d*nv.vdir[i]; + if (elev != 0.0) { + fcross(v1, ourview.vup, nv.vdir); + normalize(v1); + spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.)); + } if ((nv.type = ourview.type) == VT_PAR) { nv.horiz = ourview.horiz / mag; nv.vert = ourview.vert / mag; + d = 0.0; /* don't move closer */ + for (i = 0; i < 3; i++) + d += (vc[i] - ourview.vp[i])*ourview.vdir[i]; } else { nv.horiz = ourview.horiz; nv.vert = ourview.vert; + d = sqrt(dist2(ourview.vp, vc)) / mag; } + for (i = 0; i < 3; i++) + nv.vp[i] = vc[i] - d*nv.vdir[i]; newview(&nv); }