ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/util/rtcontrib.c
(Generate patch)

Comparing ray/src/util/rtcontrib.c (file contents):
Revision 1.36 by greg, Tue Oct 11 19:02:51 2005 UTC vs.
Revision 1.39 by greg, Fri Oct 21 01:12:59 2005 UTC

# Line 325 | Line 325 | main(int argc, char *argv[])
325                                  rtargv[rtargc++] = argv[++i];
326                                  addmodfile(argv[i], curout, binval, bincnt);
327                                  continue;
328 +                        case 'P':               /* persist file */
329 +                                error(USER, "persist file is automatic");
330 +                                break;
331                          }
332                  rtargv[rtargc++] = argv[i];     /* assume rtrace option */
333          }
# Line 1076 | Line 1079 | trace_contribs(FILE *fin)
1079                          writebuf(rtp->pd.w, inpbuf, iblen);
1080                  } else {                        /* else bypass dummy ray */
1081                          queue_raytree(rtp);     /* empty tree */
1082 <                        if ((yres <= 0) & (waitflush > 0))
1082 >                        if ((yres <= 0) | (waitflush > 1))
1083                                  waitflush = 1;  /* flush after this */
1084                  }
1082 –                if (raysleft && !--raysleft)
1083 –                        break;
1085                  process_queue();                /* catch up with results */
1086 +                if (raysleft && !--raysleft)
1087 +                        break;                  /* preemptive EOI */
1088          }
1089          while (wait_rproc() != NULL)            /* process outstanding rays */
1090                  process_queue();

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)