--- ray/src/rt/rtmain.c 2020/04/06 04:10:44 2.32 +++ ray/src/rt/rtmain.c 2024/10/30 16:47:03 2.56 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rtmain.c,v 2.32 2020/04/06 04:10:44 greg Exp $"; +static const char RCSid[] = "$Id: rtmain.c,v 2.56 2024/10/30 16:47:03 greg Exp $"; #endif /* * rtmain.c - main for rtrace per-ray calculation program @@ -21,8 +21,6 @@ static const char RCSid[] = "$Id: rtmain.c,v 2.32 2020 extern char *progname; /* global argv[0] */ -extern char *shm_boundary; /* boundary of shared memory */ - /* persistent processes define */ #ifdef F_SETLKW #define PERSIST 1 /* normal persist */ @@ -35,7 +33,6 @@ char *errfile = NULL; /* error output file */ int nproc = 1; /* number of processes */ -extern char *formstr(int f); /* string from format */ extern int setrtoutput(void); /* set output values */ int inform = 'a'; /* input format */ @@ -45,7 +42,7 @@ char *outvals = "v"; /* output specification */ int hresolu = 0; /* horizontal (scan) size */ int vresolu = 0; /* vertical resolution */ -int castonly = 0; /* only doing ray-casting? */ +extern int castonly; /* only doing ray-casting? */ int imm_irrad = 0; /* compute immediate irradiance? */ int lim_dist = 0; /* limit distance? */ @@ -60,13 +57,37 @@ 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)(const 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" \ + "OutputCS=RGB,XYZ,Y,S,M,prims,spec\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" \ + "OutputCS=RGB,XYZ,Y,S,M,prims,spec\n" +#endif + int main(int argc, char *argv[]) { @@ -89,6 +110,10 @@ main(int argc, char *argv[]) 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++) ; @@ -133,7 +158,7 @@ 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; check_bool(2,rval); if (rval) erract[WARNING].pf = wputs; @@ -235,6 +260,74 @@ 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 */ + if (argv[i][3]) + goto badopt; + sens_curve = scolor_photopic; + out_scalefactor = WHTEFFICACY; + break; + case 'S': /* scotopic response */ + if (argv[i][3]) + goto badopt; + sens_curve = scolor_scotopic; + out_scalefactor = WHTSCOTOPIC; + break; + case 'M': /* melanopic response */ + if (argv[i][3]) + goto badopt; + 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') { @@ -251,14 +344,17 @@ main(int argc, char *argv[]) goto badopt; } } - if (nproc > 1) { - if (persist) - error(USER, "multiprocessing incompatible with persist file"); - if (!vresolu && 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 */ @@ -317,7 +413,8 @@ main(int argc, char *argv[]) if (outform != 'a') SET_FILE_BINARY(stdout); rval = setrtoutput(); - readoct(octname = octnm, loadflags, &thescene, NULL); + octname = savqstr(octnm); + readoct(octname, loadflags, &thescene, NULL); nsceneobjs = nobjects; if (loadflags & IO_INFO) { /* print header */ @@ -325,11 +422,15 @@ main(int argc, char *argv[]) printf("SOFTWARE= %s\n", VersionID); fputnow(stdout); if (rval > 0) /* saved from setrtoutput() call */ - printf("NCOMP=%d\n", rval); + 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 */ } if (!castonly) { /* any actual ray traversal to do? */ @@ -339,17 +440,18 @@ main(int argc, char *argv[]) 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); if (persist == PARALLEL) { /* multiprocessing */ - preload_objs(); /* preload scene */ - shm_boundary = (char *)malloc(16); - strcpy(shm_boundary, "SHM_BOUNDARY"); + cow_memshare(); /* preloads scene */ while ((rval=fork()) == 0) { /* keep on forkin' */ pflock(1); pfhold(); @@ -402,10 +504,12 @@ badopt: void wputs( /* warning output function */ - char *s + const char *s ) { int lasterrno = errno; + if (erract[WARNING].pf == NULL) + return; /* called by calcomp or someone */ eputs(s); errno = lasterrno; } @@ -413,7 +517,7 @@ wputs( /* warning output function */ void eputs( /* put string to stderr */ - register char *s + const char *s ) { static int midline = 0; @@ -468,8 +572,11 @@ 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); @@ -478,8 +585,8 @@ printdefaults(void) /* print default values to stdou 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); @@ -504,11 +611,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 ((sens_curve == NULL) & (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(); }