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

Comparing ray/src/hd/rholo.c (file contents):
Revision 3.19 by gregl, Thu Dec 11 12:09:33 1997 UTC vs.
Revision 3.20 by gregl, Fri Dec 12 11:13:16 1997 UTC

# Line 32 | Line 32 | char   *outdev = NULL;         /* output device name */
32  
33   int     readinp = 0;            /* read commands from stdin */
34  
35 + int     force = 0;              /* allow overwrite of holodeck */
36 +
37   time_t  starttime;              /* time we got started */
38   time_t  endtime;                /* time we should end by */
39   time_t  reporttime;             /* time for next report */
# Line 59 | Line 61 | char   *argv[];
61   {
62          HDGRID  hdg;
63          int     i;
62 –        int     force = 0;
64                                                  /* mark start time */
65          starttime = time(NULL);
66          initurand(16384);                       /* initialize urand */
# Line 224 | Line 225 | initrholo()                    /* get our holodeck running */
225          if (ncprocs > 0) {
226                  i = start_rtrace();
227                  if (i < 1)
228 <                        error(USER, "cannot start rtrace process");
228 >                        error(USER, "cannot start rtrace process(es)");
229                  if (vdef(REPORT)) {             /* make first report */
230                          printargs(rtargc, rtargv, stderr);
231                          report(0);
# Line 507 | Line 508 | PACKET *pl;
508   }
509  
510  
511 + checkrad()                      /* check to make sure octree is up to date */
512 + {
513 +        char    combuf[128];
514 +
515 +        if (!vdef(RIF))
516 +                return;
517 +        sprintf(combuf, "rad -v 0 -s -w %s", vval(RIF));
518 +        if (system(combuf))
519 +                error(WARNING, "error running rad");
520 + }
521 +
522 +
523   getradfile(rfargs)              /* run rad and get needed variables */
524   char    *rfargs;
525   {
# Line 540 | Line 553 | char   *rfargs;
553          else
554                  sprintf(cp, ")[ \t]*=' > %s", tf2);
555          if (system(combuf)) {
543 –                error(SYSTEM, "cannot execute rad command");
556                  unlink(tf2);                    /* clean up */
557                  unlink(tf1);
558 <                quit(1);
558 >                error(SYSTEM, "cannot execute rad command");
559          }
560          if (pippt == NULL) {
561                  loadvars(tf2);                  /* load variables */

Diff Legend

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