--- ray/src/rt/rtmain.c 2009/12/12 19:01:00 2.18 +++ ray/src/rt/rtmain.c 2023/12/11 17:21:59 2.49 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rtmain.c,v 2.18 2009/12/12 19:01:00 greg Exp $"; +static const char RCSid[] = "$Id: rtmain.c,v 2.49 2023/12/11 17:21:59 greg Exp $"; #endif /* * rtmain.c - main for rtrace per-ray calculation program @@ -17,6 +17,7 @@ static const char RCSid[] = "$Id: rtmain.c,v 2.18 2009 #include "ambient.h" #include "random.h" #include "paths.h" +#include "pmapray.h" extern char *progname; /* global argv[0] */ @@ -34,7 +35,8 @@ char *errfile = NULL; /* error output file */ int nproc = 1; /* number of processes */ -extern char *formstr(); /* string from format */ +extern int setrtoutput(void); /* set output values */ + int inform = 'a'; /* input format */ int outform = 'a'; /* output format */ char *outvals = "v"; /* output specification */ @@ -42,6 +44,8 @@ char *outvals = "v"; /* output specification */ int hresolu = 0; /* horizontal (scan) size */ int vresolu = 0; /* vertical resolution */ +extern int castonly; /* only doing ray-casting? */ + int imm_irrad = 0; /* compute immediate irradiance? */ int lim_dist = 0; /* limit distance? */ @@ -55,41 +59,65 @@ extern void tranotify(OBJECT obj); char *tralist[MAXMODLIST]; /* list of modifers to trace (or no) */ int traincl = -1; /* include == 1, exclude == 0 */ +double (*sens_curve)(SCOLOR scol) = NULL; /* spectral conversion for 1-channel */ +double out_scalefactor = 1; /* output calibration scale factor */ +RGBPRIMP out_prims = stdprims; /* output color primitives (NULL if spectral) */ +static RGBPRIMS our_prims; /* private output color primitives */ + static int loadflags = ~IO_FILES; /* what to load from octree */ static void onsig(int signo); static void sigdie(int signo, char *msg); static void printdefaults(void); +#ifdef PERSIST +#define RTRACE_FEATURES "Persist\nParallelPersist\nMultiprocessing\n" \ + "IrradianceCalc\nImmediateIrradiance\nDistanceLimiting\n" \ + "ParticipatingMedia=Mist\n" \ + "HessianAmbientCache\nAmbientAveraging\n" \ + "AmbientValueSharing\nAdaptiveShadowTesting\n" \ + "InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \ + "Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n" +#else +#define RTRACE_FEATURES "IrradianceCalc\nIrradianceCalc\nDistanceLimiting\n" \ + "ParticipatingMedia=Mist\n" \ + "HessianAmbientCache\nAmbientAveraging\n" \ + "AmbientValueSharing\nAdaptiveShadowTesting\n" \ + "InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \ + "Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n" +#endif + int main(int argc, char *argv[]) { #define check(ol,al) if (argv[i][ol] || \ badarg(argc-i-1,argv+i+1,al)) \ goto badopt -#define bool(olen,var) switch (argv[i][olen]) { \ +#define check_bool(olen,var) switch (argv[i][olen]) { \ case '\0': var = !var; break; \ case 'y': case 'Y': case 't': case 'T': \ case '+': case '1': var = 1; break; \ case 'n': case 'N': case 'f': case 'F': \ case '-': case '0': var = 0; break; \ default: goto badopt; } + extern char *octname; int persist = 0; char *octnm = NULL; - char **tralp; - int duped1; + char **tralp = NULL; + int duped1 = -1; int rval; int i; /* global program name */ progname = argv[0] = fixargv0(argv[0]); + /* feature check only? */ + strcat(RFeatureList, RTRACE_FEATURES); + if (argc > 1 && !strcmp(argv[1], "-features")) + return feature_status(argc-2, argv+2); /* add trace notify function */ for (i = 0; addobjnotify[i] != NULL; i++) ; addobjnotify[i] = tranotify; - /* set our defaults */ - maxdepth = -10; - minweight = 2e-3; /* option city */ for (i = 1; i < argc; i++) { /* expand arguments */ @@ -130,9 +158,9 @@ main(int argc, char *argv[]) check(2,"i"); vresolu = atoi(argv[++i]); break; - case 'w': /* warnings */ + case 'w': /* warnings & spectral */ rval = erract[WARNING].pf != NULL; - bool(2,rval); + check_bool(2,rval); if (rval) erract[WARNING].pf = wputs; else erract[WARNING].pf = NULL; break; @@ -143,10 +171,10 @@ main(int argc, char *argv[]) case 'l': /* limit distance */ if (argv[i][2] != 'd') goto badopt; - bool(3,lim_dist); + check_bool(3,lim_dist); break; case 'I': /* immed. irradiance */ - bool(2,imm_irrad); + check_bool(2,imm_irrad); break; case 'f': /* format i/o */ switch (argv[i][2]) { @@ -178,7 +206,7 @@ main(int argc, char *argv[]) break; case 'h': /* header output */ rval = loadflags & IO_INFO; - bool(2,rval); + check_bool(2,rval); loadflags = rval ? loadflags | IO_INFO : loadflags & ~IO_INFO; break; @@ -192,7 +220,7 @@ main(int argc, char *argv[]) tralp = tralist; } if (argv[i][2] == 'I') { /* file */ - rval = wordfile(tralp, + rval = wordfile(tralp, MAXMODLIST-(tralp-tralist), getpath(argv[++i],getrlibpath(),R_OK)); if (rval < 0) { sprintf(errmsg, @@ -214,7 +242,7 @@ main(int argc, char *argv[]) tralp = tralist; } if (argv[i][2] == 'E') { /* file */ - rval = wordfile(tralp, + rval = wordfile(tralp, MAXMODLIST-(tralp-tralist), getpath(argv[++i],getrlibpath(),R_OK)); if (rval < 0) { sprintf(errmsg, @@ -232,6 +260,68 @@ main(int argc, char *argv[]) goto badopt; } break; + case 'p': /* value output */ + switch (argv[i][2]) { + case 'R': /* standard RGB output */ + if (strcmp(argv[i]+2, "RGB")) + goto badopt; + out_prims = stdprims; + out_scalefactor = 1; + sens_curve = NULL; + break; + case 'X': /* XYZ output */ + if (strcmp(argv[i]+2, "XYZ")) + goto badopt; + out_prims = xyzprims; + out_scalefactor = WHTEFFICACY; + sens_curve = NULL; + break; + case 'c': { + int j; + check(3,"ffffffff"); + rval = 0; + for (j = 0; j < 8; j++) { + our_prims[0][j] = atof(argv[++i]); + rval |= fabs(our_prims[0][j]-stdprims[0][j]) > .001; + } + if (rval) { + if (!colorprimsOK(our_prims)) + error(USER, "illegal primary chromaticities"); + out_prims = our_prims; + } else + out_prims = stdprims; + out_scalefactor = 1; + sens_curve = NULL; + } break; + case 'Y': /* photopic response */ + sens_curve = scolor_photopic; + out_scalefactor = WHTEFFICACY; + break; + case 'S': /* scotopic response */ + sens_curve = scolor_scotopic; + out_scalefactor = WHTSCOTOPIC; + break; + case 'M': /* melanopic response */ + sens_curve = scolor_melanopic; + out_scalefactor = WHTMELANOPIC; + break; + default: + goto badopt; + } + break; +#if MAXCSAMP>3 + case 'c': /* output spectral results */ + if (argv[i][2] != 'o') + goto badopt; + rval = (out_prims == NULL) & (sens_curve == NULL); + check_bool(3,rval); + if (rval) { + out_prims = NULL; + sens_curve = NULL; + } else if (out_prims == NULL) + out_prims = stdprims; + break; +#endif #ifdef PERSIST case 'P': /* persist file */ if (argv[i][2] == 'P') { @@ -248,16 +338,17 @@ main(int argc, char *argv[]) goto badopt; } } - if (nproc > 1) { - if (persist) - error(USER, "multiprocessing incompatible with persist file"); - if (imm_irrad) - error(USER, "multiprocessing incompatible with immediate irradiance"); - if (hresolu > 0 && hresolu < nproc) - error(WARNING, "number of cores should not exceed horizontal resolution"); - if (trace != NULL) - error(WARNING, "multiprocessing does not work properly with trace mode"); - } + /* set/check spectral sampling */ + rval = setspectrsamp(CNDX, WLPART); + if (rval < 0) + error(USER, "unsupported spectral sampling"); + if (out_prims != NULL) { + if (!rval) + error(WARNING, "spectral range incompatible with color output"); + } else if (NCSAMP == 3) + out_prims = stdprims; /* 3 samples do not a spectrum make */ + if (nproc > 1 && persist) + error(USER, "multiprocessing incompatible with persist file"); /* initialize object types */ initotypes(); /* initialize urand */ @@ -315,24 +406,41 @@ main(int argc, char *argv[]) #endif if (outform != 'a') SET_FILE_BINARY(stdout); - readoct(octnm, loadflags, &thescene, NULL); + rval = setrtoutput(); + octname = savqstr(octnm); + readoct(octname, loadflags, &thescene, NULL); nsceneobjs = nobjects; if (loadflags & IO_INFO) { /* print header */ printargs(i, argv, stdout); printf("SOFTWARE= %s\n", VersionID); fputnow(stdout); + if (rval > 0) /* saved from setrtoutput() call */ + fputncomp(rval, stdout); + if (NCSAMP > 3) + fputwlsplit(WLPART, stdout); + if ((out_prims != stdprims) & (out_prims != NULL)) + fputprims(out_prims, stdout); + if ((outform == 'f') | (outform == 'd')) + fputendian(stdout); fputformat(formstr(outform), stdout); - putchar('\n'); + fputc('\n', stdout); /* end of header */ } - marksources(); /* find and mark sources */ + if (!castonly) { /* any actual ray traversal to do? */ - setambient(); /* initialize ambient calculation */ + ray_init_pmap(); /* PMAP: set up & load photon maps */ + + marksources(); /* find and mark sources */ + setambient(); /* initialize ambient calculation */ + } else + distantsources(); /* else mark only distant sources */ + + fflush(stdout); /* in case we're duplicating header */ + #ifdef PERSIST if (persist) { - fflush(stdout); /* reconnect stdout */ dup2(duped1, fileno(stdout)); close(duped1); @@ -354,10 +462,8 @@ runagain: if (persist) dupheader(); /* send header to stdout */ #endif - if (nproc > 1) /* start multiprocessing */ - ray_popen(nproc); /* trace rays */ - rtrace(NULL); + rtrace(NULL, nproc); /* flush ambient file */ ambsync(); #ifdef PERSIST @@ -377,6 +483,9 @@ runagain: goto runagain; } #endif + + ray_done_pmap(); /* PMAP: free photon maps */ + quit(0); badopt: @@ -385,13 +494,13 @@ badopt: return 1; /* pro forma return */ #undef check -#undef bool +#undef check_bool } void wputs( /* warning output function */ - char *s + const char *s ) { int lasterrno = errno; @@ -402,7 +511,7 @@ wputs( /* warning output function */ void eputs( /* put string to stderr */ - register char *s + const char *s ) { static int midline = 0; @@ -457,17 +566,21 @@ sigdie( /* set fatal signal */ static void printdefaults(void) /* print default values to stdout */ { - register char *cp; + char *cp; + printf(erract[WARNING].pf != NULL ? + "-w+\t\t\t\t# warning messages on\n" : + "-w-\t\t\t\t# warning messages off\n"); if (imm_irrad) printf("-I+\t\t\t\t# immediate irradiance on\n"); printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc); - printf("-x %-9d\t\t\t# x resolution (flush interval)\n", hresolu); + printf("-x %-9d\t\t\t# %s\n", hresolu, + vresolu && hresolu ? "x resolution" : "flush interval"); printf("-y %-9d\t\t\t# y resolution\n", vresolu); printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" : "-ld-\t\t\t\t# limit distance off\n"); - printf("-h%c\t\t\t\t# %s header\n", loadflags & IO_INFO ? '+' : '-', - loadflags & IO_INFO ? "output" : "no"); + printf(loadflags & IO_INFO ? "-h+\t\t\t\t# output header\n" : + "-h-\t\t\t\t# no header\n"); printf("-f%c%c\t\t\t\t# format input/output = %s/%s\n", inform, outform, formstr(inform), formstr(outform)); printf("-o%-9s\t\t\t# output", outvals); @@ -476,6 +589,10 @@ printdefaults(void) /* print default values to stdou case 't': case 'T': printf(" trace"); break; case 'o': printf(" origin"); break; case 'd': printf(" direction"); break; + case 'r': printf(" reflect_contrib"); break; + case 'R': printf(" reflect_length"); break; + case 'x': printf(" unreflect_contrib"); break; + case 'X': printf(" unreflect_length"); break; case 'v': printf(" value"); break; case 'V': printf(" contribution"); break; case 'l': printf(" length"); break; @@ -488,11 +605,27 @@ printdefaults(void) /* print default values to stdou case 'W': printf(" coefficient"); break; case 'm': printf(" modifier"); break; case 'M': printf(" material"); break; - case '-': printf(" stroke"); break; + case '~': printf(" tilde"); break; } - putchar('\n'); - printf(erract[WARNING].pf != NULL ? - "-w+\t\t\t\t# warning messages on\n" : - "-w-\t\t\t\t# warning messages off\n"); + fputc('\n', stdout); + if (sens_curve == scolor_photopic) + printf("-pY\t\t\t\t# photopic output\n"); + else if (sens_curve == scolor_scotopic) + printf("-pS\t\t\t\t# scotopic output\n"); + else if (sens_curve == scolor_melanopic) + printf("-pM\t\t\t\t# melanopic output\n"); + else if (out_prims == stdprims) + printf("-pRGB\t\t\t\t# standard RGB color output\n"); + else if (out_prims == xyzprims) + printf("-pXYZ\t\t\t\t# CIE XYZ color output\n"); + else if (out_prims != NULL) + printf("-pc %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f\t# output color primaries and white point\n", + out_prims[RED][0], out_prims[RED][1], + out_prims[GRN][0], out_prims[GRN][1], + out_prims[BLU][0], out_prims[BLU][1], + out_prims[WHT][0], out_prims[WHT][1]); + if (NCSAMP > 3) + printf(out_prims != NULL ? "-co-\t\t\t\t# output tristimulus colors\n" : + "-co+\t\t\t\t# output spectral values\n"); print_rdefaults(); }