768 |
|
{ |
769 |
|
VIEW nv; |
770 |
|
FVECT odir, v1, wip; |
771 |
< |
double d, d1; |
771 |
> |
double d; |
772 |
> |
#ifdef DOBJ |
773 |
> |
double d1; |
774 |
> |
#endif |
775 |
|
/* start with old view */ |
776 |
|
nv = odev.v; |
777 |
|
/* orient our motion */ |
796 |
|
VSUM(nv.vp, wip, odir, -1.); |
797 |
|
spinvector(nv.vdir, nv.vdir, nv.vup, d); |
798 |
|
} else if (orb) { /* orbit up/down */ |
799 |
< |
fcross(v1, odir, nv.vup); |
800 |
< |
if (normalize(v1) == 0.) |
799 |
> |
if (geodesic(odir, odir, nv.vup, |
800 |
> |
d=MOVDEG*PI/180.*orb, GEOD_RAD) == 0.0) |
801 |
|
return(0); |
799 |
– |
spinvector(odir, odir, v1, d=MOVDEG*PI/180.*orb); |
802 |
|
VSUM(nv.vp, wip, odir, -1.); |
803 |
< |
spinvector(nv.vdir, nv.vdir, v1, d); |
803 |
> |
geodesic(nv.vdir, nv.vdir, nv.vup, d, GEOD_RAD); |
804 |
|
} else if (mov) { /* move forward/backward */ |
805 |
|
d = MOVPCT/100. * mov; |
806 |
|
VSUM(nv.vp, nv.vp, odir, d); |
826 |
|
int startx = ebut->x, starty = ebut->y; |
827 |
|
int endx, endy, midx, midy; |
828 |
|
FVECT odir, v1; |
829 |
< |
double d, d1; |
829 |
> |
double d; |
830 |
> |
#ifdef DOBJ |
831 |
> |
double d1; |
832 |
> |
#endif |
833 |
|
/* get mouse drag */ |
834 |
|
XMaskEvent(ourdisplay, ButtonReleaseMask, levptr(XEvent)); |
835 |
|
endx = levptr(XButtonReleasedEvent)->x; |