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

Comparing ray/src/hd/rhd_x11.c (file contents):
Revision 3.18 by gregl, Wed Dec 24 14:04:22 1997 UTC vs.
Revision 3.22 by gregl, Sun Jan 4 08:32:01 1998 UTC

# Line 18 | Line 18 | static char SCCSid[] = "$SunId$ SGI";
18  
19   #include  "x11icon.h"
20  
21 + #ifndef RAYQLEN
22 + #define RAYQLEN         50000           /* max. rays to queue before flush */
23 + #endif
24 +
25   #ifndef FEQ
26   #define FEQ(a,b)        ((a)-(b) <= FTINY && (a)-(b) >= -FTINY)
27   #endif
# Line 81 | Line 85 | mytmflags()                    /* figure out tone mapping flags */
85          for (cp = tail; *cp && *cp != '.'; cp++)
86                  ;
87          if (cp-tail == 3 && !strncmp(tail, "x11", 3))
88 <                return(TM_F_CAMERA);
88 >                return(TM_F_CAMERA|TM_F_NOSTDERR);
89          if (cp-tail == 4 && !strncmp(tail, "x11h", 4))
90 <                return(TM_F_HUMAN);
90 >                return(TM_F_HUMAN|TM_F_NOSTDERR);
91          error(USER, "illegal driver name");
92   }
93  
# Line 170 | Line 174 | char  *id;
174          dev_input();                    /* sets size and view angles */
175                                          /* allocate our leaf pile */
176          if (!qtAllocLeaves(DisplayWidth(ourdisplay,ourscreen) *
177 <                        DisplayHeight(ourdisplay,ourscreen) /
178 <                        (qtMinNodesiz*qtMinNodesiz)))
177 >                        DisplayHeight(ourdisplay,ourscreen) * 3 /
178 >                        (qtMinNodesiz*qtMinNodesiz*2)))
179                  error(SYSTEM, "insufficient memory for leaf storage");
180          odev.name = id;
181          odev.ifd = ConnectionNumber(ourdisplay);
# Line 278 | Line 282 | int
282   dev_flush()                     /* flush output */
283   {
284          qtUpdate();
285 +        rayqleft = RAYQLEN;
286          return(XPending(ourdisplay));
287   }
288  
# Line 453 | Line 458 | draw_grids()                   /* draw holodeck section grids */
458          static BYTE     gridrgb[3] = {0x0, 0xff, 0xff};
459          unsigned long  pixel;
460  
461 <        if (!mapped || odev.v.type != VT_PER)
461 >        if (!mapped)
462                  return;
463          if (ncolors > 0)
464                  pixel = pixval[get_pixel(gridrgb, xnewcolr)];
# Line 599 | Line 604 | register XKeyPressedEvent  *ekey;
604                  if (ncolors > 0)
605                          new_ctab(ncolors);
606                  inpresflags |= DFL(DC_REDRAW);  /* resend values from server */
607 +                rayqleft = 0;                   /* hold off update */
608                  return;
609          case 'K':                       /* kill rtrace process(es) */
610                  inpresflags |= DFL(DC_KILL);

Diff Legend

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