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

Comparing src/hd/rhd_ogl.c (file contents):
Revision 3.23 by greg, Fri Sep 19 18:33:05 2003 UTC vs.
Revision 3.27 by greg, Fri Jan 21 00:52:59 2005 UTC

# Line 17 | Line 17 | static const char      RCSid[] = "$Id$";
17   #endif
18   #endif
19  
20 – #include "standard.h"
20  
21 + #include <time.h>
22   #include <GL/glx.h>
23   #include <GL/glu.h>
24   #ifdef STEREO
25   #include <X11/extensions/SGIStereo.h>
26   #endif
27 – #include <time.h>
27  
28 + #include "standard.h"
29   #include "rhd_odraw.h"
30 + #include "rhdisp.h"
31 + #include "paths.h"
32   #ifdef DOBJ
33   #include "rhdobj.h"
34   #endif
# Line 80 | Line 82 | static const char      RCSid[] = "$Id$";
82  
83   struct driver   odev;                   /* global device driver structure */
84  
85 + TMstruct        *tmGlobal;              /* global tone-mapping structure */
86 +
87   char odev_args[64];                     /* command arguments */
88  
89   static GLfloat  *depthbuffer = NULL;    /* depth buffer */
# Line 112 | Line 116 | static int     inpresflags;            /* input result flags */
116  
117   static int      viewflags;              /* what's happening with view */
118  
119 + /*
120   static int  resizewindow(), getevent(), getkey(), moveview(), wipeclean(),
121                  xferdepth(), freedepth(), setglortho(),
122                  setglpersp(), getframe(), getmove(), fixwindow(), mytmflags();
123  
124   static double   getdistance();
125 + */
126 + static void checkglerr(char *where);
127 + static void xferdepth(void);
128 + static void freedepth(void);
129 + static double getdistance(int dx, int dy, FVECT direc);
130 + static int mytmflags(void);
131 + static void getevent(void);
132 + static void draw3dline(register FVECT wp[2]);
133 + static void draw_grids(int fore);
134 + static int moveview(int dx, int dy, int mov, int orb);
135 + static void getframe(XButtonPressedEvent *ebut);
136 + static void getmove(XButtonPressedEvent *ebut);
137 + static void getkey(register XKeyPressedEvent *ekey);
138 + static void fixwindow(register XExposeEvent *eexp);
139 + static void resizewindow(register XConfigureEvent *ersz);
140 + static void waitabit(void);
141 + static void setglpersp(void);
142 + static void setglortho(void);
143 + static void wipeclean(void);
144  
145 +
146   #ifdef STEREO
147 < static int  pushright(), popright();
147 > static void pushright(void);
148 > static void popright(void);
149   #endif
150  
151   extern int      gmPortals;      /* GL portal list id */
# Line 127 | Line 153 | extern int     gmPortals;      /* GL portal list id */
153   extern time_t   time();
154  
155  
156 + extern void
157   dev_open(id)                    /* initialize GLX driver */
158   char  *id;
159   {
# Line 184 | Line 211 | char  *id;
211                                  &myprims[BLU][CIEX],&myprims[BLU][CIEY],
212                                  &myprims[WHT][CIEX],&myprims[WHT][CIEY]) >= 6)
213                  dpri = myprims;
214 <        if (tmInit(mytmflags(), dpri, gamval) == NULL)
214 >        tmGlobal = tmInit(mytmflags(), dpri, gamval);
215 >        if (tmGlobal == NULL)
216                  error(SYSTEM, "not enough memory in dev_open");
217                                          /* open window */
218          ourwinattr.background_pixel = ourblack;
# Line 258 | Line 286 | char  *id;
286   }
287  
288  
289 < dev_close()                     /* close our display and free resources */
289 > extern void
290 > dev_close(void)                 /* close our display and free resources */
291   {
292   #ifdef DOBJ
293          dobj_cleanup();
# Line 273 | Line 302 | dev_close()                    /* close our display and free resources
302          gwind = 0;
303          XCloseDisplay(ourdisplay);
304          ourdisplay = NULL;
305 <        tmDone(NULL);
305 >        tmDone(tmGlobal);
306          odev.v.type = 0;
307          odev.hres = odev.vres = 0;
308          odev.ifd = -1;
309   }
310  
311  
312 < dev_clear()                     /* clear our representation */
312 > extern void
313 > dev_clear(void)                 /* clear our representation */
314   {
315          viewflags |= VWCHANGE;          /* pretend our view has changed */
316          wipeclean();                    /* clean off display and samples */
# Line 289 | Line 319 | dev_clear()                    /* clear our representation */
319   }
320  
321  
322 < int
323 < dev_view(nv)                    /* assign new driver view */
324 < register VIEW   *nv;
322 > extern int
323 > dev_view(                       /* assign new driver view */
324 >        register VIEW   *nv
325 > )
326   {
296 –        double  d;
297 –
327          if (nv->type != VT_PER ||               /* check view legality */
328                          nv->horiz > 160. || nv->vert > 160.) {
329                  error(COMMAND, "illegal view type/angle");
# Line 344 | Line 373 | register VIEW  *nv;
373   }
374  
375  
376 < dev_section(gfn, pfn)           /* add octree for geometry rendering */
377 < char    *gfn, *pfn;
376 > extern void
377 > dev_section(            /* add octree for geometry rendering */
378 >        char    *gfn,
379 >        char    *pfn
380 > )
381   {
350 –        char    *cp;
351 –
382          if (gfn == NULL) {
383                  gmEndGeom();
384                  gmEndPortal();
# Line 368 | Line 398 | char   *gfn, *pfn;
398   }
399  
400  
401 < dev_auxcom(cmd, args)           /* process an auxiliary command */
402 < char    *cmd, *args;
401 > extern void
402 > dev_auxcom(             /* process an auxiliary command */
403 >        char    *cmd,
404 >        char    *args
405 > )
406   {
407   #ifdef DOBJ
408          int     vischange;
# Line 387 | Line 420 | char   *cmd, *args;
420   }
421  
422  
423 < VIEW *
424 < dev_auxview(n, hvres)           /* return nth auxiliary view */
425 < int     n;
426 < int     hvres[2];
423 > extern VIEW *
424 > dev_auxview(            /* return nth auxiliary view */
425 >        int     n,
426 >        int     hvres[2]
427 > )
428   {
429          hvres[0] = odev.hres; hvres[1] = odev.vres;
430          if (n == 0)
# Line 403 | Line 437 | int    hvres[2];
437   }
438  
439  
440 < int
441 < dev_input()                     /* get X11 input */
440 > extern int
441 > dev_input(void)                 /* get X11 input */
442   {
443          inpresflags = 0;
444  
# Line 419 | Line 453 | dev_input()                    /* get X11 input */
453   }
454  
455  
456 < dev_value(c, d, p)              /* add a pixel value to our texture */
457 < COLR    c;
458 < FVECT   d, p;
456 > extern void
457 > dev_value(              /* add a pixel value to our texture */
458 >        COLR    c,
459 >        FVECT   d,
460 >        FVECT   p
461 > )
462   {
463   #ifdef DOBJ
464          if (dobj_lightsamp != NULL) {   /* in light source sampling */
# Line 435 | Line 472 | FVECT  d, p;
472   }
473  
474  
475 < int
476 < dev_flush()                     /* flush output as appropriate */
475 > extern int
476 > dev_flush(void)                 /* flush output as appropriate */
477   {
478          int     ndrawn;
479  
# Line 482 | Line 519 | dev_flush()                    /* flush output as appropriate */
519   }
520  
521  
522 < checkglerr(where)               /* check for GL or GLU error */
523 < char    *where;
522 > static void
523 > checkglerr(             /* check for GL or GLU error */
524 >        char    *where
525 > )
526   {
527          register GLenum errcode;
528  
# Line 495 | Line 534 | char   *where;
534   }
535  
536  
537 < static
538 < xferdepth()                     /* load and clear depth buffer */
537 > static void
538 > xferdepth(void)                 /* load and clear depth buffer */
539   {
540          register GLfloat        *dbp;
541          register GLubyte        *pbuf;
# Line 558 | Line 597 | xferdepth()                    /* load and clear depth buffer */
597   }
598  
599  
600 < static
601 < freedepth()                             /* free recorded depth buffer */
600 > static void
601 > freedepth(void)                         /* free recorded depth buffer */
602   {
603          if (depthbuffer == NULL)
604                  return;
# Line 575 | Line 614 | freedepth()                            /* free recorded depth buffer */
614  
615  
616   static double
617 < getdistance(dx, dy, direc)      /* distance from fore plane along view ray */
618 < int     dx, dy;
619 < FVECT   direc;
617 > getdistance(    /* distance from fore plane along view ray */
618 >        int     dx,
619 >        int     dy,
620 >        FVECT   direc
621 > )
622   {
623          GLfloat gldepth;
624          double  dist;
625  
626 <        if (dx<0 | dx>=odev.hres | dy<0 | dy>=odev.vres)
626 >        if ((dx<0) | (dx>=odev.hres) | (dy<0) | (dy>=odev.vres))
627                  return(FHUGE);
628          if (depthbuffer != NULL)
629                  dist = depthbuffer[dy*odev.hres + dx];
# Line 600 | Line 641 | FVECT  direc;
641  
642  
643   #ifdef STEREO
644 < static
645 < pushright()                     /* push on right view & buffer */
644 > static void
645 > pushright(void)                 /* push on right view & buffer */
646   {
647          double  d;
648  
# Line 617 | Line 658 | pushright()                    /* push on right view & buffer */
658   }
659  
660  
661 < static
662 < popright()                      /* pop off right view & buffer */
661 > static void
662 > popright(void)                  /* pop off right view & buffer */
663   {
664          if (viewflags & VWPERSP) {
665                  glMatrixMode(GL_MODELVIEW);
# Line 630 | Line 671 | popright()                     /* pop off right view & buffer */
671  
672  
673   static int
674 < mytmflags()                     /* figure out tone mapping flags */
674 > mytmflags(void)                 /* figure out tone mapping flags */
675   {
676          extern char     *progname;
677          register char   *cp, *tail;
# Line 654 | Line 695 | mytmflags()                    /* figure out tone mapping flags */
695   }
696  
697  
698 < static
699 < getevent()                      /* get next event */
698 > static void
699 > getevent(void)                  /* get next event */
700   {
701          XNextEvent(ourdisplay, levptr(XEvent));
702          switch (levptr(XEvent)->type) {
# Line 685 | Line 726 | getevent()                     /* get next event */
726   }
727  
728  
729 < static
730 < draw3dline(wp)                  /* draw 3d line in world coordinates */
731 < register FVECT  wp[2];
729 > static void
730 > draw3dline(                     /* draw 3d line in world coordinates */
731 >        register FVECT  wp[2]
732 > )
733   {
734          glVertex3d(wp[0][0], wp[0][1], wp[0][2]);
735          glVertex3d(wp[1][0], wp[1][1], wp[1][2]);
736   }
737  
738  
739 < static
740 < draw_grids(fore)                /* draw holodeck section grids */
741 < int     fore;
739 > static void
740 > draw_grids(             /* draw holodeck section grids */
741 >        int     fore
742 > )
743   {
744          glPushAttrib(GL_LIGHTING_BIT|GL_ENABLE_BIT);
745          glDisable(GL_LIGHTING);
# Line 712 | Line 755 | int    fore;
755   }
756  
757  
758 < static
759 < moveview(dx, dy, mov, orb)      /* move our view */
760 < int     dx, dy, mov, orb;
758 > static int
759 > moveview(       /* move our view */
760 >        int     dx,
761 >        int     dy,
762 >        int     mov,
763 >        int     orb
764 > )
765   {
766          VIEW    nv;
767          FVECT   odir, v1, wip;
768          double  d, d1;
722 –        register int    li;
769                                  /* start with old view */
770          nv = odev.v;
771                                  /* orient our motion */
# Line 767 | Line 813 | int    dx, dy, mov, orb;
813   }
814  
815  
816 < static
817 < getframe(ebut)                          /* get focus frame */
818 < XButtonPressedEvent     *ebut;
816 > static void
817 > getframe(                               /* get focus frame */
818 >        XButtonPressedEvent     *ebut
819 > )
820   {
821          int     startx = ebut->x, starty = ebut->y;
822 <        int     endx, endy;
823 <
822 >        int     endx, endy, midx, midy;
823 >        FVECT   odir, v1;
824 >        double  d, d1;
825 >                                                /* get mouse drag */
826          XMaskEvent(ourdisplay, ButtonReleaseMask, levptr(XEvent));
827          endx = levptr(XButtonReleasedEvent)->x;
828          endy = levptr(XButtonReleasedEvent)->y;
829 <        if (endx == startx | endy == starty) {
830 <                XBell(ourdisplay, 0);
829 >        midx = (startx + endx) >> 1;
830 >        midy = (starty + endy) >> 1;
831 >                                                /* set focus distance */
832 >        if (viewray(v1, odir, &odev.v,
833 >                        (midx+.5)/odev.hres, (midy+.5)/odev.vres) < -FTINY)
834                  return;
835 <        }
835 >        d = getdistance(midx, midy, odir);      /* distance from front plane */
836 > #ifdef DOBJ
837 >        d1 = dobj_trace(NULL, v1, odir);
838 >        if (d1 < d)
839 >                d = d1;
840 > #endif
841 >        if (d < .99*FHUGE)
842 >                odev.v.vdist = d + sqrt(dist2(v1, odev.v.vp));
843 >                                                /* set frame for rendering */
844 >        if ((endx == startx) | (endy == starty))
845 >                return;
846          if (endx < startx) {register int c = endx; endx = startx; startx = c;}
847          if (endy < starty) {register int c = endy; endy = starty; starty = c;}
848          sprintf(odev_args, "%.3f %.3f %.3f %.3f",
# Line 790 | Line 852 | XButtonPressedEvent    *ebut;
852   }
853  
854  
855 < static
856 < waitabit()                              /* pause a moment */
855 > static void
856 > waitabit(void)                          /* pause a moment */
857   {
858          struct timespec ts;
859          ts.tv_sec = 0;
# Line 800 | Line 862 | waitabit()                             /* pause a moment */
862   }
863  
864  
865 < static
866 < getmove(ebut)                           /* get view change */
867 < XButtonPressedEvent     *ebut;
865 > static void
866 > getmove(                                /* get view change */
867 >        XButtonPressedEvent     *ebut
868 > )
869   {
870          int     movdir = MOVDIR(ebut->button);
871          int     movorb = MOVORB(ebut->state);
# Line 857 | Line 920 | XButtonPressedEvent    *ebut;
920   }
921  
922  
923 < static
924 < setglpersp()                    /* set perspective view in GL */
923 > static void
924 > setglpersp(void)                        /* set perspective view in GL */
925   {
926          double  d, xmin, xmax, ymin, ymax;
927          GLfloat vec[4];
# Line 919 | Line 982 | setglpersp()                   /* set perspective view in GL */
982   }
983  
984  
985 < static
986 < setglortho()                    /* set up orthographic view for cone drawing */
985 > static void
986 > setglortho(void)                        /* set up orthographic view for cone drawing */
987   {
988          glDrawBuffer(GL_FRONT);         /* use single-buffer mode */
989                                          /* set view matrix */
# Line 936 | Line 999 | setglortho()                   /* set up orthographic view for cone dr
999   }
1000  
1001  
1002 < static
1003 < wipeclean()                     /* prepare for redraw */
1002 > static void
1003 > wipeclean(void)                 /* prepare for redraw */
1004   {
1005          glDrawBuffer(GL_BACK);          /* use double-buffer mode */
1006          glReadBuffer(GL_BACK);
# Line 959 | Line 1022 | wipeclean()                    /* prepare for redraw */
1022   }
1023  
1024  
1025 < static
1026 < getkey(ekey)                            /* get input key */
1027 < register XKeyPressedEvent  *ekey;
1025 > static void
1026 > getkey(                         /* get input key */
1027 >        register XKeyPressedEvent  *ekey
1028 > )
1029   {
1030          Window  rootw, childw;
1031          int     rootx, rooty, wx, wy;
# Line 1042 | Line 1106 | register XKeyPressedEvent  *ekey;
1106   }
1107  
1108  
1109 < static
1110 < fixwindow(eexp)                         /* repair damage to window */
1111 < register XExposeEvent  *eexp;
1109 > static void
1110 > fixwindow(                              /* repair damage to window */
1111 >        register XExposeEvent  *eexp
1112 > )
1113   {
1114          int     xmin, ymin, xmax, ymax;
1115  
1116 <        if (odev.hres == 0 | odev.vres == 0) {  /* first exposure */
1116 >        if ((odev.hres == 0) | (odev.vres == 0)) {      /* first exposure */
1117                  resizewindow((XConfigureEvent *)eexp);
1118                  return;
1119          }
# Line 1087 | Line 1152 | register XExposeEvent  *eexp;
1152   }
1153  
1154  
1155 < static
1156 < resizewindow(ersz)                      /* resize window */
1157 < register XConfigureEvent  *ersz;
1155 > static void
1156 > resizewindow(                   /* resize window */
1157 >        register XConfigureEvent  *ersz
1158 > )
1159   {
1160          glViewport(0, 0, ersz->width, ersz->height);
1161  

Diff Legend

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