36 |
|
|
37 |
|
char *progname; /* global argv[0] */ |
38 |
|
|
39 |
< |
int verbose = 0; /* verbose mode? */ |
39 |
> |
int verbose = 0; /* verbose mode (< 0 no warnings) */ |
40 |
|
|
41 |
|
char *rcarg[MAXRCARG+1] = {"rcontrib", "-fo+"}; |
42 |
|
int nrcargs = 2; |
226 |
|
fputs(": command line too long in popen_arglist()\n", stderr); |
227 |
|
return(NULL); |
228 |
|
} |
229 |
< |
if (verbose) |
229 |
> |
if (verbose > 0) |
230 |
|
fprintf(stderr, "%s: opening pipe %s: %s\n", |
231 |
|
progname, (*mode=='w') ? "to" : "from", cmd); |
232 |
|
return(popen(cmd, mode)); |
244 |
|
fputs(": command line too long in my_exec()\n", stderr); |
245 |
|
return(1); |
246 |
|
} |
247 |
< |
if (verbose) |
247 |
> |
if (verbose > 0) |
248 |
|
fprintf(stderr, "%s: running: %s\n", progname, cmd); |
249 |
|
return(system(cmd)); |
250 |
|
} |
259 |
|
fprintf(stderr, "%s: cannot locate %s\n", progname, av[0]); |
260 |
|
return(1); |
261 |
|
} |
262 |
< |
if (verbose) { |
262 |
> |
if (verbose > 0) { |
263 |
|
char cmd[4096]; |
264 |
|
if (!convert_commandline(cmd, sizeof(cmd), av)) |
265 |
|
strcpy(cmd, "COMMAND TOO LONG TO SHOW"); |
319 |
|
int nparams = 0; |
320 |
|
int i; |
321 |
|
|
322 |
< |
for ( ; ; ) |
322 |
> |
for ( ; ; ) { |
323 |
|
switch (*cp++) { |
324 |
|
case 'h': |
325 |
|
if (*cp++ != '=') |
342 |
|
break; |
343 |
|
if (!get_direction(p->vup, cp)) |
344 |
|
break; |
345 |
+ |
while (*cp && !isspace(*cp++)) |
346 |
+ |
; |
347 |
|
++nparams; |
348 |
|
continue; |
349 |
|
case 'o': |
369 |
|
default: |
370 |
|
break; |
371 |
|
} |
372 |
< |
fprintf(stderr, "%s: bad parameter string '%s'\n", progname, pargs); |
372 |
> |
break; |
373 |
> |
} |
374 |
> |
fprintf(stderr, "%s: bad parameter string: %s", progname, pargs); |
375 |
|
exit(1); |
376 |
|
return(-1); /* pro forma return */ |
377 |
|
} |
417 |
|
} |
418 |
|
/* determine sample type/bin */ |
419 |
|
if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1') { |
420 |
< |
binv = "0"; /* uniform sampling -- one bin */ |
420 |
> |
sprintf(sbuf, "if(-Dx*%g-Dy*%g-Dz*%g,0,-1)", |
421 |
> |
curparams.nrm[0], curparams.nrm[1], curparams.nrm[2]); |
422 |
> |
binv = savqstr(sbuf); |
423 |
> |
nbins = "1"; /* uniform sampling -- one bin */ |
424 |
|
uniform = 1; |
425 |
|
} else if (tolower(curparams.hemis[0]) == 's' && |
426 |
|
tolower(curparams.hemis[1]) == 'c') { |
519 |
|
{ |
520 |
|
int i; |
521 |
|
|
522 |
< |
uva[1][0] = 0.5 - frandom(); |
516 |
< |
uva[1][1] = 0.5 - frandom(); |
517 |
< |
uva[1][2] = 0.5 - frandom(); |
518 |
< |
for (i = 3; i--; ) |
519 |
< |
if ((-0.6 < nrm[i]) & (nrm[i] < 0.6)) |
520 |
< |
break; |
521 |
< |
if (i < 0) { |
522 |
> |
if (!getperpendicular(uva[0], nrm)) { |
523 |
|
fputs(progname, stderr); |
524 |
|
fputs(": bad surface normal in make_axes!\n", stderr); |
525 |
|
exit(1); |
526 |
|
} |
527 |
< |
uva[1][i] = 1.0; |
527 |
< |
VCROSS(uva[0], uva[1], nrm); |
528 |
< |
normalize(uva[0]); |
529 |
< |
VCROSS(uva[1], nrm, uva[0]); |
527 |
> |
fcross(uva[1], nrm, uva[0]); |
528 |
|
} |
529 |
|
|
530 |
|
/* Illegal sender surfaces end up here */ |
786 |
|
alt = (row+samp3[1])*RAH; |
787 |
|
azi = (2.*PI)*(col+samp3[2]-.5)/rnaz(row); |
788 |
|
duvw[2] = cos(alt); /* measured from horizon */ |
789 |
< |
duvw[0] = tcos(azi)*duvw[2]; |
790 |
< |
duvw[1] = tsin(azi)*duvw[2]; |
789 |
> |
duvw[0] = tsin(azi)*duvw[2]; |
790 |
> |
duvw[1] = tcos(azi)*duvw[2]; |
791 |
|
duvw[2] = sqrt(1. - duvw[2]*duvw[2]); |
792 |
|
for (i = 3; i--; ) |
793 |
|
orig_dir[1][i] = -duvw[0]*p->udir[i] - |
838 |
|
|
839 |
|
while (n--) { /* stratified sampling */ |
840 |
|
SDmultiSamp(samp2, 2, (n+frandom())/sampcnt); |
841 |
< |
if (!bo_getvec(duvw, b+samp2[1], kbasis[bi])) |
841 |
> |
if (!bi_getvec(duvw, b+samp2[1], kbasis[bi])) |
842 |
|
return(0); |
843 |
|
for (i = 3; i--; ) |
844 |
|
orig_dir[1][i] = duvw[0]*p->udir[i] + |
861 |
|
fputs(": no sender surface!\n", stderr); |
862 |
|
return(-1); |
863 |
|
} |
864 |
< |
if (curparams.outfn != NULL) /* misplaced output file spec. */ |
864 |
> |
/* misplaced output file spec. */ |
865 |
> |
if ((curparams.outfn != NULL) & (verbose >= 0)) |
866 |
|
fprintf(stderr, "%s: warning - ignoring output file in sender ('%s')\n", |
867 |
|
progname, curparams.outfn); |
868 |
|
/* check/set basis hemisphere */ |
1013 |
|
snew->area *= PI*snew->area; |
1014 |
|
break; |
1015 |
|
} |
1016 |
< |
if (snew->area <= FTINY) { |
1016 |
> |
if ((snew->area <= FTINY) & (verbose >= 0)) { |
1017 |
|
fprintf(stderr, "%s: warning - zero area for surface '%s'\n", |
1018 |
|
progname, oname); |
1019 |
|
free(snew); |
1200 |
|
na = 1; |
1201 |
|
switch (argv[a][1]) { /* !! Keep consistent !! */ |
1202 |
|
case 'v': /* verbose mode */ |
1203 |
< |
verbose = !verbose; |
1203 |
> |
verbose = 1; |
1204 |
|
na = 0; |
1205 |
|
continue; |
1206 |
|
case 'f': /* special case for -fo, -ff, etc. */ |
1241 |
|
iropt = argv[a]; |
1242 |
|
na = 0; |
1243 |
|
continue; |
1244 |
< |
case 'V': /* options without arguments */ |
1245 |
< |
case 'w': |
1244 |
> |
case 'w': /* options without arguments */ |
1245 |
> |
if (argv[a][2] != '+') verbose = -1; |
1246 |
> |
case 'V': |
1247 |
|
case 'u': |
1248 |
|
case 'h': |
1249 |
|
case 'r': |