ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/hd/rhd_ogl.c
(Generate patch)

Comparing ray/src/hd/rhd_ogl.c (file contents):
Revision 3.27 by greg, Fri Jan 21 00:52:59 2005 UTC vs.
Revision 3.31 by greg, Thu Sep 6 00:07:43 2012 UTC

# Line 235 | Line 235 | char  *id;
235                                          /* set window manager hints */
236          ourxwmhints.flags = InputHint|IconPixmapHint;
237          ourxwmhints.input = True;
238 <        ourxwmhints.icon_pixmap = XCreateBitmapFromData(ourdisplay,
239 <                        gwind, x11icon_bits, x11icon_width, x11icon_height);
238 >        ourxwmhints.icon_pixmap = XCreateBitmapFromData(ourdisplay, gwind,
239 >                        (char *)x11icon_bits, x11icon_width, x11icon_height);
240          XSetWMHints(ourdisplay, gwind, &ourxwmhints);
241          oursizhints.min_width = MINWIDTH;
242   #ifdef STEREO
# Line 324 | Line 324 | dev_view(                      /* assign new driver view */
324          register VIEW   *nv
325   )
326   {
327 + #ifdef STEREO
328 +        double  d;
329 + #endif
330          if (nv->type != VT_PER ||               /* check view legality */
331                          nv->horiz > 160. || nv->vert > 160.) {
332                  error(COMMAND, "illegal view type/angle");
# Line 765 | Line 768 | moveview(      /* move our view */
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 */
# Line 790 | Line 796 | moveview(      /* move our view */
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);
796 –                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);
# Line 821 | Line 826 | getframe(                              /* get focus frame */
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;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines