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

Comparing ray/src/gen/mkillum.c (file contents):
Revision 2.11 by greg, Sat Feb 22 02:07:24 2003 UTC vs.
Revision 2.17 by greg, Wed Sep 24 14:55:54 2003 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   * Make illum sources for optimizing rendering process
6   */
7  
8 – #include  "mkillum.h"
9 –
8   #include  <signal.h>
11 –
9   #include  <ctype.h>
10  
11 + #include  "mkillum.h"
12 + #include  "platform.h"
13 +
14                                  /* default parameters */
15   #define  SAMPDENS       48              /* points per projected steradian */
16   #define  NSAMPS         32              /* samples per point */
# Line 24 | Line 24 | static const char      RCSid[] = "$Id$";
24  
25                                  /* rtrace command and defaults */
26   char  *rtargv[64] = { "rtrace", "-dj", ".25", "-dr", "3", "-dv-",
27 <                "-ab", "2", "-ad", "256", "-as", "128", "-aa", ".15", };
27 >                "-ab", "2", "-ad", "1024", "-as", "512", "-aa", ".1", };
28   int  rtargc = 14;
29                                  /* overriding rtrace options */
30   char  *myrtopts[] = { "-I-", "-i-", "-ld-", "-ov", "-h-",
# Line 136 | Line 136 | int  status;
136   {
137          int     rtstat;
138  
139 <        rtstat = close_process(rt.pd);
140 <        if (status == 0)
139 >        rtstat = close_process(&(rt.pd));
140 >        if (status == 0) {
141                  if (rtstat < 0)
142                          error(WARNING,
143                          "unknown return status from rtrace process");
144                  else
145                          status = rtstat;
146 +        }
147          exit(status);
148   }
149  
# Line 156 | Line 157 | init()                         /* start rtrace and set up buffers */
157          ofun[OBJ_SPHERE].funp = o_sphere;
158          ofun[OBJ_RING].funp = o_ring;
159                                          /* set up signal handling */
160 + #ifdef SIGPIPE /* not present on Windows */
161          signal(SIGPIPE, quit);
162 + #endif
163                                          /* start rtrace process */
164          errno = 0;
165 <        maxbytes = open_process(rt.pd, rtargv);
165 >        maxbytes = open_process(&(rt.pd), rtargv);
166          if (maxbytes == 0) {
167                  eputs(rtargv[0]);
168                  eputs(": command not found\n");
# Line 444 | Line 447 | char  *nm;
447          if (fgetword(str, MAXSTR, fp) == NULL)
448                  goto readerr;
449                                          /* is it an alias? */
450 <        if (!strcmp(str, ALIASID)) {
450 >        if (!strcmp(str, ALIASKEY)) {
451                  if (fgetword(str, MAXSTR, fp) == NULL)
452                          goto readerr;
453 <                printf("\n%s %s %s", thisillum.altmat, ALIASID, str);
453 >                printf("\n%s %s %s", thisillum.altmat, ALIASKEY, str);
454                  if (fgetword(str, MAXSTR, fp) == NULL)
455                          goto readerr;
456                  printf("\t%s\n", str);

Diff Legend

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