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.12 by gwlarson, Thu Dec 31 13:24:36 1998 UTC vs.
Revision 3.15 by gwlarson, Tue Jan 5 18:16:17 1999 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1998 Silicon Graphics, Inc. */
1 > /* Copyright (c) 1999 Silicon Graphics, Inc. */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ SGI";
# Line 39 | Line 39 | static char SCCSid[] = "$SunId$ SGI";
39   #ifndef RAYQLEN
40   #define RAYQLEN         0               /* max. rays to queue before flush */
41   #endif
42 + #ifndef MINWIDTH
43 + #define MINWIDTH        480             /* minimum graphics window width */
44 + #define MINHEIGHT       400             /* minimum graphics window height */
45 + #endif
46 + #ifndef VIEWDIST
47 + #define VIEWDIST        356             /* assumed viewing distance (mm) */
48 + #endif
49 + #ifndef BORWIDTH
50 + #define BORWIDTH        5               /* border width */
51 + #endif
52  
53   #ifndef FEQ
54   #define FEQ(a,b)        ((a)-(b) <= FTINY && (a)-(b) >= -FTINY)
# Line 60 | Line 70 | static char SCCSid[] = "$SunId$ SGI";
70   #define MOVDEG          (-5)            /* degrees to orbit CW/down /frame */
71   #define MOVORB(s)       ((s)&ShiftMask ? 1 : (s)&ControlMask ? -1 : 0)
72  
63 – #define MINWIDTH        480             /* minimum graphics window width */
64 – #define MINHEIGHT       400             /* minimum graphics window height */
65 –
66 – #define VIEWDIST        356             /* assumed viewing distance (mm) */
67 –
68 – #define BORWIDTH        5               /* border width */
69 –
73   #define setstereobuf(bid)       (glXWaitGL(), \
74                                  XSGISetStereoBuffer(ourdisplay, gwind, bid), \
75                                  glXWaitX())
# Line 331 | Line 334 | register VIEW  *nv;
334                          dev_input();    /* get resize event */
335                  }
336                  copystruct(&odev.v, nv);        /* setview() already called */
334 – #ifdef STEREO
335 –                copystruct(&vwright, nv);
336 –                d = eyesepdist / sqrt(nv->hn2);
337 –                VSUM(vwright.vp, nv->vp, nv->hvec, d);
338 –                /* setview(&vwright);   -- Unnecessary */
339 – #endif
337                  viewflags |= VWCHANGE;
338          }
339 + #ifdef STEREO
340 +        copystruct(&vwright, nv);
341 +        d = eyesepdist / sqrt(nv->hn2);
342 +        VSUM(vwright.vp, nv->vp, nv->hvec, d);
343 +        /* setview(&vwright);   -- Unnecessary */
344 + #endif
345          wipeclean();
346          return(1);
347   }
# Line 857 | Line 860 | setglpersp()                   /* set perspective view in GL */
860                  dev_zmax = 100.;
861          } else {
862                  dev_zmin = 0.5*depthlim[0];
863 <                dev_zmax = 2.0*depthlim[1];
863 >                dev_zmax = 1.25*depthlim[1];
864                  if (dev_zmin > dev_zmax/5.)
865                          dev_zmin = dev_zmax/5.;
866          }

Diff Legend

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