--- ray/src/gen/mkillum.c 2003/03/11 19:29:05 2.12 +++ ray/src/gen/mkillum.c 2003/09/24 14:55:54 2.17 @@ -1,16 +1,16 @@ #ifndef lint -static const char RCSid[] = "$Id: mkillum.c,v 2.12 2003/03/11 19:29:05 greg Exp $"; +static const char RCSid[] = "$Id: mkillum.c,v 2.17 2003/09/24 14:55:54 greg Exp $"; #endif /* * Make illum sources for optimizing rendering process */ -#include "mkillum.h" - #include - #include +#include "mkillum.h" +#include "platform.h" + /* default parameters */ #define SAMPDENS 48 /* points per projected steradian */ #define NSAMPS 32 /* samples per point */ @@ -24,7 +24,7 @@ static const char RCSid[] = "$Id: mkillum.c,v 2.12 200 /* rtrace command and defaults */ char *rtargv[64] = { "rtrace", "-dj", ".25", "-dr", "3", "-dv-", - "-ab", "2", "-ad", "256", "-as", "128", "-aa", ".15", }; + "-ab", "2", "-ad", "1024", "-as", "512", "-aa", ".1", }; int rtargc = 14; /* overriding rtrace options */ char *myrtopts[] = { "-I-", "-i-", "-ld-", "-ov", "-h-", @@ -136,13 +136,14 @@ int status; { int rtstat; - rtstat = close_process(rt.pd); - if (status == 0) + rtstat = close_process(&(rt.pd)); + if (status == 0) { if (rtstat < 0) error(WARNING, "unknown return status from rtrace process"); else status = rtstat; + } exit(status); } @@ -156,10 +157,12 @@ init() /* start rtrace and set up buffers */ ofun[OBJ_SPHERE].funp = o_sphere; ofun[OBJ_RING].funp = o_ring; /* set up signal handling */ +#ifdef SIGPIPE /* not present on Windows */ signal(SIGPIPE, quit); +#endif /* start rtrace process */ errno = 0; - maxbytes = open_process(rt.pd, rtargv); + maxbytes = open_process(&(rt.pd), rtargv); if (maxbytes == 0) { eputs(rtargv[0]); eputs(": command not found\n");