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; |
84 |
|
} POLYTRIS; /* triangulated polygon */ |
85 |
|
|
86 |
|
typedef struct param_s { |
87 |
< |
char hemis[32]; /* hemispherical sampling spec. */ |
87 |
> |
char sign; /* '-' for axis reversal */ |
88 |
> |
char hemis[31]; /* hemispherical sampling spec. */ |
89 |
|
int hsiz; /* hemisphere basis size */ |
90 |
|
int nsurfs; /* number of surfaces */ |
91 |
|
SURF *slist; /* list of surfaces */ |
92 |
|
FVECT vup; /* up vector (zero if unset) */ |
93 |
|
FVECT nrm; /* average normal direction */ |
94 |
< |
FVECT udir, vdir; /* v-up tangent axes */ |
94 |
> |
FVECT udir, vdir; /* tangent axes */ |
95 |
|
char *outfn; /* output file name (receiver) */ |
96 |
|
int (*sample_basis)(struct param_s *p, int, FILE *); |
97 |
|
} PARAMS; /* sender/receiver parameters */ |
227 |
|
fputs(": command line too long in popen_arglist()\n", stderr); |
228 |
|
return(NULL); |
229 |
|
} |
230 |
< |
if (verbose) |
230 |
> |
if (verbose > 0) |
231 |
|
fprintf(stderr, "%s: opening pipe %s: %s\n", |
232 |
|
progname, (*mode=='w') ? "to" : "from", cmd); |
233 |
|
return(popen(cmd, mode)); |
245 |
|
fputs(": command line too long in my_exec()\n", stderr); |
246 |
|
return(1); |
247 |
|
} |
248 |
< |
if (verbose) |
248 |
> |
if (verbose > 0) |
249 |
|
fprintf(stderr, "%s: running: %s\n", progname, cmd); |
250 |
|
return(system(cmd)); |
251 |
|
} |
260 |
|
fprintf(stderr, "%s: cannot locate %s\n", progname, av[0]); |
261 |
|
return(1); |
262 |
|
} |
263 |
< |
if (verbose) { |
263 |
> |
if (verbose > 0) { |
264 |
|
char cmd[4096]; |
265 |
|
if (!convert_commandline(cmd, sizeof(cmd), av)) |
266 |
|
strcpy(cmd, "COMMAND TOO LONG TO SHOW"); |
325 |
|
case 'h': |
326 |
|
if (*cp++ != '=') |
327 |
|
break; |
328 |
+ |
if ((*cp == '+') | (*cp == '-')) |
329 |
+ |
p->sign = *cp++; |
330 |
+ |
else |
331 |
+ |
p->sign = '+'; |
332 |
|
p->hsiz = 0; |
333 |
|
i = 0; |
334 |
|
while (*cp && !isspace(*cp)) { |
367 |
|
case ' ': |
368 |
|
case '\t': |
369 |
|
case '\r': |
365 |
– |
continue; |
370 |
|
case '\n': |
371 |
+ |
continue; |
372 |
|
case '\0': |
373 |
|
return(nparams); |
374 |
|
default: |
422 |
|
} |
423 |
|
/* determine sample type/bin */ |
424 |
|
if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1') { |
425 |
< |
binv = "0"; /* uniform sampling -- one bin */ |
425 |
> |
sprintf(sbuf, "if(-Dx*%g-Dy*%g-Dz*%g,0,-1)", |
426 |
> |
curparams.nrm[0], curparams.nrm[1], curparams.nrm[2]); |
427 |
> |
binv = savqstr(sbuf); |
428 |
> |
nbins = "1"; /* uniform sampling -- one bin */ |
429 |
|
uniform = 1; |
430 |
|
} else if (tolower(curparams.hemis[0]) == 's' && |
431 |
|
tolower(curparams.hemis[1]) == 'c') { |
436 |
|
exit(1); |
437 |
|
} |
438 |
|
calfn = shirchiufn; shirchiufn = NULL; |
439 |
< |
sprintf(sbuf, "SCdim=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g", |
439 |
> |
sprintf(sbuf, "SCdim=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g,RHS=%c1", |
440 |
|
curparams.hsiz, |
441 |
|
curparams.nrm[0], curparams.nrm[1], curparams.nrm[2], |
442 |
< |
curparams.vup[0], curparams.vup[1], curparams.vup[2]); |
442 |
> |
curparams.vup[0], curparams.vup[1], curparams.vup[2], |
443 |
> |
curparams.sign); |
444 |
|
params = savqstr(sbuf); |
445 |
|
binv = "scbin"; |
446 |
|
nbins = "SCdim*SCdim"; |
447 |
|
} else if ((tolower(curparams.hemis[0]) == 'r') | |
448 |
|
(tolower(curparams.hemis[0]) == 't')) { |
449 |
|
calfn = reinhfn; reinhfn = NULL; |
450 |
< |
sprintf(sbuf, "MF=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g", |
450 |
> |
sprintf(sbuf, "MF=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g,RHS=%c1", |
451 |
|
curparams.hsiz, |
452 |
|
curparams.nrm[0], curparams.nrm[1], curparams.nrm[2], |
453 |
< |
curparams.vup[0], curparams.vup[1], curparams.vup[2]); |
453 |
> |
curparams.vup[0], curparams.vup[1], curparams.vup[2], |
454 |
> |
curparams.sign); |
455 |
|
params = savqstr(sbuf); |
456 |
|
binv = "rbin"; |
457 |
|
nbins = "Nrbins"; |
479 |
|
progname, curparams.hemis); |
480 |
|
exit(1); |
481 |
|
} |
482 |
+ |
if (tolower(curparams.hemis[0]) == 'k') { |
483 |
+ |
sprintf(sbuf, "RHS=%c1", curparams.sign); |
484 |
+ |
params = savqstr(sbuf); |
485 |
+ |
} |
486 |
|
if (!uniform & (curparams.slist->styp == ST_SOURCE)) { |
487 |
|
SURF *sp; |
488 |
|
for (sp = curparams.slist; sp != NULL; sp = sp->next) |
530 |
|
{ |
531 |
|
int i; |
532 |
|
|
533 |
< |
uva[1][0] = 0.5 - frandom(); |
520 |
< |
uva[1][1] = 0.5 - frandom(); |
521 |
< |
uva[1][2] = 0.5 - frandom(); |
522 |
< |
for (i = 3; i--; ) |
523 |
< |
if ((-0.6 < nrm[i]) & (nrm[i] < 0.6)) |
524 |
< |
break; |
525 |
< |
if (i < 0) { |
533 |
> |
if (!getperpendicular(uva[0], nrm)) { |
534 |
|
fputs(progname, stderr); |
535 |
|
fputs(": bad surface normal in make_axes!\n", stderr); |
536 |
|
exit(1); |
537 |
|
} |
538 |
< |
uva[1][i] = 1.0; |
531 |
< |
VCROSS(uva[0], uva[1], nrm); |
532 |
< |
normalize(uva[0]); |
533 |
< |
VCROSS(uva[1], nrm, uva[0]); |
538 |
> |
fcross(uva[1], nrm, uva[0]); |
539 |
|
} |
540 |
|
|
541 |
|
/* Illegal sender surfaces end up here */ |
797 |
|
alt = (row+samp3[1])*RAH; |
798 |
|
azi = (2.*PI)*(col+samp3[2]-.5)/rnaz(row); |
799 |
|
duvw[2] = cos(alt); /* measured from horizon */ |
800 |
< |
duvw[0] = tcos(azi)*duvw[2]; |
801 |
< |
duvw[1] = tsin(azi)*duvw[2]; |
800 |
> |
duvw[0] = tsin(azi)*duvw[2]; |
801 |
> |
duvw[1] = tcos(azi)*duvw[2]; |
802 |
|
duvw[2] = sqrt(1. - duvw[2]*duvw[2]); |
803 |
|
for (i = 3; i--; ) |
804 |
|
orig_dir[1][i] = -duvw[0]*p->udir[i] - |
849 |
|
|
850 |
|
while (n--) { /* stratified sampling */ |
851 |
|
SDmultiSamp(samp2, 2, (n+frandom())/sampcnt); |
852 |
< |
if (!bo_getvec(duvw, b+samp2[1], kbasis[bi])) |
852 |
> |
if (!fo_getvec(duvw, b+samp2[1], kbasis[bi])) |
853 |
|
return(0); |
854 |
|
for (i = 3; i--; ) |
855 |
< |
orig_dir[1][i] = duvw[0]*p->udir[i] + |
856 |
< |
duvw[1]*p->vdir[i] + |
855 |
> |
orig_dir[1][i] = -duvw[0]*p->udir[i] - |
856 |
> |
duvw[1]*p->vdir[i] - |
857 |
|
duvw[2]*p->nrm[i] ; |
858 |
|
if (!sample_origin(p, orig_dir[0], orig_dir[1], samp2[0])) |
859 |
|
return(0); |
872 |
|
fputs(": no sender surface!\n", stderr); |
873 |
|
return(-1); |
874 |
|
} |
875 |
< |
if (curparams.outfn != NULL) /* misplaced output file spec. */ |
875 |
> |
/* misplaced output file spec. */ |
876 |
> |
if ((curparams.outfn != NULL) & (verbose >= 0)) |
877 |
|
fprintf(stderr, "%s: warning - ignoring output file in sender ('%s')\n", |
878 |
|
progname, curparams.outfn); |
879 |
|
/* check/set basis hemisphere */ |
893 |
|
else |
894 |
|
curparams.vup[1] = 1; |
895 |
|
} |
896 |
< |
VCROSS(curparams.udir, curparams.vup, curparams.nrm); |
896 |
> |
fcross(curparams.udir, curparams.vup, curparams.nrm); |
897 |
|
if (normalize(curparams.udir) == 0) { |
898 |
|
fputs(progname, stderr); |
899 |
|
fputs(": up vector coincides with sender normal\n", stderr); |
900 |
|
return(-1); |
901 |
|
} |
902 |
< |
VCROSS(curparams.vdir, curparams.nrm, curparams.udir); |
902 |
> |
fcross(curparams.vdir, curparams.nrm, curparams.udir); |
903 |
> |
if (curparams.sign == '-') { /* left-handed coordinate system? */ |
904 |
> |
curparams.udir[0] *= -1.; |
905 |
> |
curparams.udir[1] *= -1.; |
906 |
> |
curparams.udir[2] *= -1.; |
907 |
> |
} |
908 |
|
if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1') |
909 |
|
curparams.sample_basis = sample_uniform; |
910 |
|
else if (tolower(curparams.hemis[0]) == 's' && |
1029 |
|
snew->area *= PI*snew->area; |
1030 |
|
break; |
1031 |
|
} |
1032 |
< |
if (snew->area <= FTINY) { |
1032 |
> |
if ((snew->area <= FTINY) & (verbose >= 0)) { |
1033 |
|
fprintf(stderr, "%s: warning - zero area for surface '%s'\n", |
1034 |
|
progname, oname); |
1035 |
|
free(snew); |
1099 |
|
add_send_object(FILE *fp) |
1100 |
|
{ |
1101 |
|
int st; |
1102 |
< |
char otype[32], oname[128]; |
1102 |
> |
char thismod[128], otype[32], oname[128]; |
1103 |
|
int n; |
1104 |
|
|
1105 |
< |
if (fscanf(fp, "%*s %s %s", otype, oname) != 2) |
1105 |
> |
if (fscanf(fp, "%s %s %s", thismod, otype, oname) != 3) |
1106 |
|
return(0); /* must have hit EOF! */ |
1107 |
|
if (!strcmp(otype, "alias")) { |
1108 |
|
fscanf(fp, "%*s"); /* skip alias */ |
1115 |
|
fputs(": cannot use source as a sender!\n", stderr); |
1116 |
|
return(-1); |
1117 |
|
} |
1118 |
+ |
if (strcmp(thismod, curmod)) { |
1119 |
+ |
if (curmod[0]) { |
1120 |
+ |
fputs(progname, stderr); |
1121 |
+ |
fputs(": warning - multiple modifiers in sender\n", |
1122 |
+ |
stderr); |
1123 |
+ |
} |
1124 |
+ |
strcpy(curmod, thismod); |
1125 |
+ |
} |
1126 |
|
parse_params(&curparams, newparams); |
1127 |
|
newparams[0] = '\0'; |
1128 |
|
add_surface(st, oname, fp); /* read & store surface */ |
1224 |
|
na = 1; |
1225 |
|
switch (argv[a][1]) { /* !! Keep consistent !! */ |
1226 |
|
case 'v': /* verbose mode */ |
1227 |
< |
verbose = !verbose; |
1227 |
> |
verbose = 1; |
1228 |
|
na = 0; |
1229 |
|
continue; |
1230 |
|
case 'f': /* special case for -fo, -ff, etc. */ |
1265 |
|
iropt = argv[a]; |
1266 |
|
na = 0; |
1267 |
|
continue; |
1268 |
< |
case 'V': /* options without arguments */ |
1269 |
< |
case 'w': |
1268 |
> |
case 'w': /* options without arguments */ |
1269 |
> |
if (argv[a][2] != '+') verbose = -1; |
1270 |
> |
case 'V': |
1271 |
|
case 'u': |
1272 |
|
case 'h': |
1273 |
|
case 'r': |
1357 |
|
return(my_exec(rcarg)); /* rcontrib does everything */ |
1358 |
|
} |
1359 |
|
clear_params(&curparams, 0); /* else load sender surface & params */ |
1360 |
+ |
curmod[0] = '\0'; |
1361 |
|
if (load_scene(sendfn, add_send_object) < 0) |
1362 |
|
return(1); |
1363 |
|
if ((nsbins = prepare_sampler()) <= 0) |
1375 |
|
#ifdef getc_unlocked |
1376 |
|
flockfile(rcfp); |
1377 |
|
#endif |
1378 |
< |
if (verbose) { |
1378 |
> |
if (verbose > 0) { |
1379 |
|
fprintf(stderr, "%s: sampling %d directions", progname, nsbins); |
1380 |
|
if (curparams.nsurfs > 1) |
1381 |
|
fprintf(stderr, " (%d elements)\n", curparams.nsurfs); |
1385 |
|
for (i = 0; i < nsbins; i++) /* send rcontrib ray samples */ |
1386 |
|
if (!(*curparams.sample_basis)(&curparams, i, rcfp)) |
1387 |
|
return(1); |
1388 |
< |
return(pclose(rcfp) == 0); /* all finished! */ |
1388 |
> |
return(pclose(rcfp) < 0); /* all finished! */ |
1389 |
|
userr: |
1390 |
|
if (a < argc-2) |
1391 |
|
fprintf(stderr, "%s: unsupported option '%s'", progname, argv[a]); |