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

Comparing src/hd/rhd_glx1.c (file contents):
Revision 3.4 by schorsch, Sun Mar 28 20:33:13 2004 UTC vs.
Revision 3.7 by greg, Fri May 20 02:06:39 2011 UTC

# Line 61 | Line 61 | static const char      RCSid[] = "$Id$";
61  
62   struct driver   odev;                   /* global device driver structure */
63  
64 + TMstruct        *tmGlobal;              /* global tone-mapping structure */
65 +
66   char odev_args[64];                     /* command arguments */
67  
68   static XEvent  currentevent;            /* current event */
# Line 142 | Line 144 | dev_open(
144                                  &myprims[BLU][CIEX],&myprims[BLU][CIEY],
145                                  &myprims[WHT][CIEX],&myprims[WHT][CIEY]) >= 6)
146                  dpri = myprims;
147 <        if (tmInit(mytmflags(), dpri, gamval) == NULL)
147 >        tmGlobal = tmInit(mytmflags(), dpri, gamval);
148 >        if (tmGlobal == NULL)
149                  error(SYSTEM, "not enough memory in dev_open");
150                                          /* open window */
151          ourwinattr.background_pixel = ourblack;
# Line 211 | Line 214 | dev_close(void)                        /* close our display and free resour
214          XCloseDisplay(ourdisplay);
215          ourdisplay = NULL;
216          qtFreeLeaves();
217 <        tmDone(NULL);
217 >        tmDone(tmGlobal);
218          freecones();
219          odev.v.type = 0;
220          odev.hres = odev.vres = 0;
# Line 283 | Line 286 | dev_view(                      /* assign new driver view */
286  
287   extern void
288   dev_section(            /* add octree for geometry rendering */
289 <        char    *ofn
289 >        char    *gfn,
290 >        char    *pfn
291   )
292   {
293          /* unimplemented */
# Line 340 | Line 344 | dev_flush(void)                        /* flush output */
344  
345   extern void
346   dev_cone(               /* render a cone in view coordinates */
347 <        BYTE    rgb[3],
347 >        uby8    rgb[3],
348          FVECT   ip,
349          double  rad
350   )
# Line 480 | Line 484 | draw3dline(                    /* draw 3d line in world coordinates */
484   static void
485   draw_grids(void)                        /* draw holodeck section grids */
486   {
487 <        static BYTE     gridrgba[4] = {0x0, 0xff, 0xff, 0x00};
487 >        static uby8     gridrgba[4] = {0x0, 0xff, 0xff, 0x00};
488          double  xmin, xmax, ymin, ymax, zmin, zmax;
489          double  d;
490                                          /* can we even do it? */

Diff Legend

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