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

Comparing ray/src/hd/rholo2.c (file contents):
Revision 3.9 by gregl, Mon Dec 15 21:04:24 1997 UTC vs.
Revision 3.12 by gwlarson, Wed Jun 10 17:46:21 1998 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1997 Silicon Graphics, Inc. */
1 > /* Copyright (c) 1998 Silicon Graphics, Inc. */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ SGI";
# Line 82 | Line 82 | done_rtrace()                  /* clean up and close rtrace calculati
82          if ((status = end_rtrace()))
83                  error(WARNING, "bad exit status from rtrace");
84          if (vdef(REPORT)) {             /* report time */
85 <                eputs("rtrace process ended\n");
85 >                eputs("rtrace process closed\n");
86                  report(0);
87          }
88          return(status);                 /* return status */
# Line 115 | Line 115 | new_rtrace()                   /* restart rtrace calculation */
115  
116   getradfile()                    /* run rad and get needed variables */
117   {
118 <        static short    mvar[] = {OCTREE,-1};
118 >        static short    mvar[] = {OCTREE,EYESEP,-1};
119          static char     tf1[] = TEMPLATE;
120          char    tf2[64];
121          char    combuf[256];
# Line 124 | Line 124 | getradfile()                   /* run rad and get needed variables */
124          register char   *cp;
125                                          /* check if rad file specified */
126          if (!vdef(RIF))
127 <                return;
127 >                return(0);
128                                          /* create rad command */
129          mktemp(tf1);
130          sprintf(tf2, "%s.rif", tf1);
# Line 150 | Line 150 | getradfile()                   /* run rad and get needed variables */
150          if (system(combuf)) {
151                  unlink(tf2);                    /* clean up */
152                  unlink(tf1);
153 <                error(SYSTEM, "cannot execute rad command");
153 >                error(WARNING, "error executing rad command");
154 >                return(-1);
155          }
156          if (pippt == NULL) {
157                  loadvars(tf2);                  /* load variables */
# Line 158 | Line 159 | getradfile()                   /* run rad and get needed variables */
159          }
160          rtargc += wordfile(rtargv+rtargc, tf1); /* get rtrace options */
161          unlink(tf1);                    /* clean up */
162 +        return(1);
163   }
164  
165  

Diff Legend

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