--- ray/src/util/rfluxmtx.c 2014/07/23 22:39:40 2.7 +++ ray/src/util/rfluxmtx.c 2014/08/15 19:59:56 2.15 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rfluxmtx.c,v 2.7 2014/07/23 22:39:40 greg Exp $"; +static const char RCSid[] = "$Id: rfluxmtx.c,v 2.15 2014/08/15 19:59:56 greg Exp $"; #endif /* * Calculate flux transfer matrix or matrices using rcontrib @@ -11,6 +11,7 @@ static const char RCSid[] = "$Id: rfluxmtx.c,v 2.7 201 #include #include "rtio.h" #include "rtmath.h" +#include "rtprocess.h" #include "bsdf.h" #include "bsdf_m.h" #include "random.h" @@ -144,20 +145,23 @@ surf_type(const char *otype) static char * oconv_command(int ac, char *av[]) { - static char oconvbuf[2048] = "!oconv -f"; - char *cp = oconvbuf + 9; - + static char oconvbuf[2048] = "!oconv -f "; + char *cp = oconvbuf + 10; + char *recv = *av++; + + if (ac-- <= 0) + return(NULL); while (ac-- > 0) { + strcpy(cp, *av++); + while (*cp) cp++; + *cp++ = ' '; if (cp >= oconvbuf+(sizeof(oconvbuf)-32)) { fputs(progname, stderr); fputs(": too many file arguments!\n", stderr); exit(1); } - *cp++ = ' '; - strcpy(cp, *av++); - while (*cp) cp++; } - *cp = '\0'; + strcpy(cp, recv); /* receiver goes last */ return(oconvbuf); } @@ -315,7 +319,7 @@ parse_params(PARAMS *p, char *pargs) int nparams = 0; int i; - for ( ; ; ) + for ( ; ; ) { switch (*cp++) { case 'h': if (*cp++ != '=') @@ -338,6 +342,8 @@ parse_params(PARAMS *p, char *pargs) break; if (!get_direction(p->vup, cp)) break; + while (*cp && !isspace(*cp++)) + ; ++nparams; continue; case 'o': @@ -356,14 +362,16 @@ parse_params(PARAMS *p, char *pargs) case ' ': case '\t': case '\r': - case '\n': continue; + case '\n': case '\0': return(nparams); default: break; } - fprintf(stderr, "%s: bad parameter string '%s'\n", progname, pargs); + break; + } + fprintf(stderr, "%s: bad parameter string: %s", progname, pargs); exit(1); return(-1); /* pro forma return */ } @@ -401,11 +409,12 @@ finish_receiver(void) fputs(": undefined normal for hemisphere sampling\n", stderr); exit(1); } - if (normalize(curparams.vup) == 0) + if (normalize(curparams.vup) == 0) { if (fabs(curparams.nrm[2]) < .7) curparams.vup[2] = 1; else curparams.vup[1] = 1; + } /* determine sample type/bin */ if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1') { binv = "0"; /* uniform sampling -- one bin */ @@ -419,7 +428,7 @@ finish_receiver(void) exit(1); } calfn = shirchiufn; shirchiufn = NULL; - sprintf(sbuf, "SCdim=%d,Nx=%g,Ny=%g,Nz=%g,Ux=%g,Uy=%g,Uz=%g", + sprintf(sbuf, "SCdim=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g", curparams.hsiz, curparams.nrm[0], curparams.nrm[1], curparams.nrm[2], curparams.vup[0], curparams.vup[1], curparams.vup[2]); @@ -429,7 +438,7 @@ finish_receiver(void) } else if ((tolower(curparams.hemis[0]) == 'r') | (tolower(curparams.hemis[0]) == 't')) { calfn = reinhfn; reinhfn = NULL; - sprintf(sbuf, "MF=%d,Nx=%g,Ny=%g,Nz=%g,Ux=%g,Uy=%g,Uz=%g", + sprintf(sbuf, "MF=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g", curparams.hsiz, curparams.nrm[0], curparams.nrm[1], curparams.nrm[2], curparams.vup[0], curparams.vup[1], curparams.vup[2]); @@ -872,11 +881,12 @@ prepare_sampler(void) fputs(": undefined normal for sender sampling\n", stderr); return(-1); } - if (normalize(curparams.vup) == 0) + if (normalize(curparams.vup) == 0) { if (fabs(curparams.nrm[2]) < .7) curparams.vup[2] = 1; else curparams.vup[1] = 1; + } VCROSS(curparams.udir, curparams.vup, curparams.nrm); if (normalize(curparams.udir) == 0) { fputs(progname, stderr); @@ -1000,7 +1010,8 @@ add_surface(int st, const char *oname, FILE *fp) case ST_SOURCE: if (snew->nfargs != 4) goto badcount; - VCOPY(snew->snrm, snew->farg); + for (n = 3; n--; ) /* need to reverse "normal" */ + snew->snrm[n] = -snew->farg[n]; if (normalize(snew->snrm) == 0) goto badnorm; snew->area = sin((PI/180./2.)*snew->farg[3]); @@ -1063,11 +1074,11 @@ add_recv_object(FILE *fp) return(1); } /* else skip arguments */ - if (!fscanf(fp, "%d", &n)) return; + if (!fscanf(fp, "%d", &n)) return(0); while (n-- > 0) fscanf(fp, "%*s"); - if (!fscanf(fp, "%d", &n)) return; + if (!fscanf(fp, "%d", &n)) return(0); while (n-- > 0) fscanf(fp, "%*d"); - if (!fscanf(fp, "%d", &n)) return; + if (!fscanf(fp, "%d", &n)) return(0); while (n-- > 0) fscanf(fp, "%*f"); return(0); } @@ -1099,11 +1110,11 @@ add_send_object(FILE *fp) return(0); } /* else skip arguments */ - if (!fscanf(fp, "%d", &n)) return; + if (!fscanf(fp, "%d", &n)) return(0); while (n-- > 0) fscanf(fp, "%*s"); - if (!fscanf(fp, "%d", &n)) return; + if (!fscanf(fp, "%d", &n)) return(0); while (n-- > 0) fscanf(fp, "%*d"); - if (!fscanf(fp, "%d", &n)) return; + if (!fscanf(fp, "%d", &n)) return(0); while (n-- > 0) fscanf(fp, "%*f"); return(0); } @@ -1146,7 +1157,7 @@ load_scene(const char *inspec, int (*ocb)(FILE *)) strcat(newparams, inpbuf); continue; } - while ((c = getc(fp)) != EOF && c != '\n'); + while ((c = getc(fp)) != EOF && c != '\n') ; /* else skipping comment */ continue; } @@ -1171,6 +1182,7 @@ main(int argc, char *argv[]) { char fmtopt[6] = "-faa"; /* default output is ASCII */ char *xrs=NULL, *yrs=NULL, *ldopt=NULL; + char *iropt = NULL; char *sendfn; char sampcntbuf[32], nsbinbuf[32]; FILE *rcfp; @@ -1178,9 +1190,20 @@ main(int argc, char *argv[]) int a, i; /* screen rcontrib options */ progname = argv[0]; - for (a = 1; a < argc-2 && argv[a][0] == '-'; a++) { - int na = 1; /* !! Keep consistent !! */ - switch (argv[a][1]) { + for (a = 1; a < argc-2; a++) { + int na; + /* check for argument expansion */ + while ((na = expandarg(&argc, &argv, a)) > 0) + ; + if (na < 0) { + fprintf(stderr, "%s: cannot expand '%s'\n", + progname, argv[a]); + return(1); + } + if (argv[a][0] != '-' || !argv[a][1]) + break; + na = 1; + switch (argv[a][1]) { /* !! Keep consistent !! */ case 'v': /* verbose mode */ verbose = !verbose; na = 0; @@ -1218,10 +1241,14 @@ main(int argc, char *argv[]) goto userr; na = 0; /* we re-add this later */ continue; + case 'I': /* only for pass-through mode */ + case 'i': + iropt = argv[a]; + na = 0; + continue; case 'V': /* options without arguments */ case 'w': case 'u': - case 'i': case 'h': case 'r': break; @@ -1251,8 +1278,6 @@ main(int argc, char *argv[]) if (!argv[a][2]) goto userr; na = (argv[a][2] == 'e') | (argv[a][2] == 'a') ? 4 : 2; break; - case '\0': /* pass-through mode */ - goto done_opts; default: /* anything else is verbotten */ goto userr; } @@ -1262,13 +1287,16 @@ main(int argc, char *argv[]) while (--na) /* + arguments if any */ rcarg[nrcargs++] = argv[++a]; } -done_opts: if (a > argc-2) goto userr; /* check at end of options */ sendfn = argv[a++]; /* assign sender & receiver inputs */ if (sendfn[0] == '-') { /* user wants pass-through mode? */ if (sendfn[1]) goto userr; sendfn = NULL; + if (iropt) { + CHECKARGC(1); + rcarg[nrcargs++] = iropt; + } if (xrs) { CHECKARGC(2); rcarg[nrcargs++] = "-x"; @@ -1284,7 +1312,12 @@ done_opts: rcarg[nrcargs++] = ldopt; } if (sampcnt <= 0) sampcnt = 1; - } else { /* else FVECT determines input format */ + } else { /* else in sampling mode */ + if (iropt) { + fputs(progname, stderr); + fputs(": -i, -I supported for pass-through only\n", stderr); + return(1); + } fmtopt[2] = (sizeof(RREAL)==sizeof(double)) ? 'd' : 'f'; if (sampcnt <= 0) sampcnt = 10000; } @@ -1335,7 +1368,7 @@ done_opts: userr: if (a < argc-2) fprintf(stderr, "%s: unsupported option '%s'", progname, argv[a]); - fprintf(stderr, "Usage: %s [-v][rcontrib options] sender.rad receiver.rad [system.rad ..]\n", + fprintf(stderr, "Usage: %s [-v][rcontrib options] sender.rad receiver.rad [-i system.oct] [system.rad ..]\n", progname); return(1); }