ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/rxcmain.cpp
(Generate patch)

Comparing ray/src/rt/rxcmain.cpp (file contents):
Revision 2.12 by greg, Mon Dec 23 18:14:20 2024 UTC vs.
Revision 2.13 by greg, Tue Dec 24 16:58:13 2024 UTC

# Line 56 | Line 56 | printdefaults(void)                    /* print default values to stdou
56          printf("-f%c%c\t\t\t\t# format input/output = %s/%s\n",
57                          inpfmt, outfmt, formstr(inpfmt), formstr(outfmt));
58          if (report_intvl > 0)
59 <                printf("-t %-9d\t\t\t#  time between reports\n", report_intvl);
59 >                printf("-t %-9d\t\t\t# time between reports\n", report_intvl);
60          printf(erract[WARNING].pf != NULL ?
61                          "-w+\t\t\t\t# warning messages on\n" :
62                          "-w-\t\t\t\t# warning messages off\n");
# Line 509 | Line 509 | rxcontrib(const int rstart)
509                  r++;
510                  if (report_intvl <= 0)
511                          continue;
512 <                tnow = time(0);         // time to report progress?
513 <                if (r == totRows)       // finished?
512 >                if (r == totRows)       // need to finish up?
513                          myRCmanager.SetThreadCount(1);
514 <                else if (tnow < last_report+report_intvl)
514 >                tnow = time(0);
515 >                if ((r < totRows) & (tnow < last_report+report_intvl))
516                          continue;
517                  sprintf(errmsg, "%.2f%% done after %.3f hours\n",
518                                  100.*myRCmanager.GetRowFinished()/totRows,

Diff Legend

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