11 |
|
#include <stdlib.h> |
12 |
|
#include "rtio.h" |
13 |
|
#include "rtmath.h" |
14 |
+ |
#include "rtprocess.h" |
15 |
|
#include "bsdf.h" |
16 |
|
#include "bsdf_m.h" |
17 |
|
#include "random.h" |
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 */ |
142 |
|
return(ST_NONE); |
143 |
|
} |
144 |
|
|
143 |
– |
/* Add arguments to oconv command */ |
144 |
– |
static char * |
145 |
– |
oconv_command(int ac, char *av[]) |
146 |
– |
{ |
147 |
– |
static char oconvbuf[2048] = "!oconv -f"; |
148 |
– |
char *cp = oconvbuf + 9; |
149 |
– |
|
150 |
– |
while (ac-- > 0) { |
151 |
– |
if (cp >= oconvbuf+(sizeof(oconvbuf)-32)) { |
152 |
– |
fputs(progname, stderr); |
153 |
– |
fputs(": too many file arguments!\n", stderr); |
154 |
– |
exit(1); |
155 |
– |
} |
156 |
– |
*cp++ = ' '; |
157 |
– |
strcpy(cp, *av++); |
158 |
– |
while (*cp) cp++; |
159 |
– |
} |
160 |
– |
*cp = '\0'; |
161 |
– |
return(oconvbuf); |
162 |
– |
} |
163 |
– |
|
145 |
|
/* Check if any of the characters in str2 are found in str1 */ |
146 |
|
static int |
147 |
|
matchany(const char *str1, const char *str2) |
156 |
|
return(0); |
157 |
|
} |
158 |
|
|
159 |
+ |
/* Add arguments to oconv command */ |
160 |
+ |
static char * |
161 |
+ |
oconv_command(int ac, char *av[]) |
162 |
+ |
{ |
163 |
+ |
static char oconvbuf[2048] = "!oconv -f "; |
164 |
+ |
char *cp = oconvbuf + 10; |
165 |
+ |
char *recv = *av++; |
166 |
+ |
|
167 |
+ |
if (ac-- <= 0) |
168 |
+ |
return(NULL); |
169 |
+ |
while (ac-- > 0) { |
170 |
+ |
strcpy(cp, *av++); |
171 |
+ |
while (*cp) cp++; |
172 |
+ |
*cp++ = ' '; |
173 |
+ |
if (cp >= oconvbuf+(sizeof(oconvbuf)-32)) |
174 |
+ |
goto overrun; |
175 |
+ |
} |
176 |
+ |
/* receiver goes last */ |
177 |
+ |
if (matchany(recv, SPECIALS)) { |
178 |
+ |
*cp++ = QUOTCHAR; |
179 |
+ |
while (*recv) { |
180 |
+ |
if (cp >= oconvbuf+(sizeof(oconvbuf)-3)) |
181 |
+ |
goto overrun; |
182 |
+ |
*cp++ = *recv++; |
183 |
+ |
} |
184 |
+ |
*cp++ = QUOTCHAR; |
185 |
+ |
*cp = '\0'; |
186 |
+ |
} else |
187 |
+ |
strcpy(cp, recv); |
188 |
+ |
return(oconvbuf); |
189 |
+ |
overrun: |
190 |
+ |
fputs(progname, stderr); |
191 |
+ |
fputs(": too many file arguments!\n", stderr); |
192 |
+ |
exit(1); |
193 |
+ |
} |
194 |
|
|
195 |
|
/* Convert a set of arguments into a command line for pipe() or system() */ |
196 |
|
static char * |
201 |
|
|
202 |
|
for (cp = cmd; *av != NULL; av++) { |
203 |
|
const int n = strlen(*av); |
204 |
< |
if (cp+n >= cmd+(len-3)) { |
189 |
< |
fputs(progname, stderr); |
204 |
> |
if (cp+n >= cmd+(len-3)) |
205 |
|
return(NULL); |
206 |
< |
} |
192 |
< |
if ((match = matchany(*av, SPECIALS))) { |
206 |
> |
if (matchany(*av, SPECIALS)) { |
207 |
|
const int quote = |
208 |
|
#ifdef ALTQUOT |
209 |
< |
(match == QUOTCHAR) ? ALTQUOT : |
209 |
> |
strchr(*av, QUOTCHAR) ? ALTQUOT : |
210 |
|
#endif |
211 |
|
QUOTCHAR; |
212 |
|
*cp++ = quote; |
236 |
|
fputs(": command line too long in popen_arglist()\n", stderr); |
237 |
|
return(NULL); |
238 |
|
} |
239 |
< |
if (verbose) |
239 |
> |
if (verbose > 0) |
240 |
|
fprintf(stderr, "%s: opening pipe %s: %s\n", |
241 |
|
progname, (*mode=='w') ? "to" : "from", cmd); |
242 |
|
return(popen(cmd, mode)); |
254 |
|
fputs(": command line too long in my_exec()\n", stderr); |
255 |
|
return(1); |
256 |
|
} |
257 |
< |
if (verbose) |
257 |
> |
if (verbose > 0) |
258 |
|
fprintf(stderr, "%s: running: %s\n", progname, cmd); |
259 |
|
return(system(cmd)); |
260 |
|
} |
269 |
|
fprintf(stderr, "%s: cannot locate %s\n", progname, av[0]); |
270 |
|
return(1); |
271 |
|
} |
272 |
< |
if (verbose) { |
272 |
> |
if (verbose > 0) { |
273 |
|
char cmd[4096]; |
274 |
|
if (!convert_commandline(cmd, sizeof(cmd), av)) |
275 |
|
strcpy(cmd, "COMMAND TOO LONG TO SHOW"); |
327 |
|
{ |
328 |
|
char *cp = pargs; |
329 |
|
int nparams = 0; |
330 |
+ |
int quot; |
331 |
|
int i; |
332 |
|
|
333 |
< |
for ( ; ; ) |
333 |
> |
for ( ; ; ) { |
334 |
|
switch (*cp++) { |
335 |
|
case 'h': |
336 |
|
if (*cp++ != '=') |
337 |
|
break; |
338 |
+ |
if ((*cp == '+') | (*cp == '-')) |
339 |
+ |
p->sign = *cp++; |
340 |
+ |
else |
341 |
+ |
p->sign = '+'; |
342 |
|
p->hsiz = 0; |
343 |
|
i = 0; |
344 |
|
while (*cp && !isspace(*cp)) { |
357 |
|
break; |
358 |
|
if (!get_direction(p->vup, cp)) |
359 |
|
break; |
360 |
+ |
while (*cp && !isspace(*cp++)) |
361 |
+ |
; |
362 |
|
++nparams; |
363 |
|
continue; |
364 |
|
case 'o': |
365 |
|
if (*cp++ != '=') |
366 |
|
break; |
367 |
+ |
quot = 0; |
368 |
+ |
if ((*cp == '"') | (*cp == '\'')) |
369 |
+ |
quot = *cp++; |
370 |
|
i = 0; |
371 |
< |
while (*cp && !isspace(*cp++)) |
372 |
< |
i++; |
371 |
> |
while (*cp && (quot ? (*cp != quot) : !isspace(*cp))) { |
372 |
> |
i++; cp++; |
373 |
> |
} |
374 |
|
if (!i) |
375 |
|
break; |
376 |
< |
*--cp = '\0'; |
376 |
> |
if (!*cp) { |
377 |
> |
if (quot) |
378 |
> |
break; |
379 |
> |
cp[1] = '\0'; |
380 |
> |
} |
381 |
> |
*cp = '\0'; |
382 |
|
p->outfn = savqstr(cp-i); |
383 |
< |
*cp++ = ' '; |
383 |
> |
*cp++ = quot ? quot : ' '; |
384 |
|
++nparams; |
385 |
|
continue; |
386 |
|
case ' ': |
393 |
|
default: |
394 |
|
break; |
395 |
|
} |
396 |
< |
fprintf(stderr, "%s: bad parameter string '%s'\n", progname, pargs); |
396 |
> |
break; |
397 |
> |
} |
398 |
> |
fprintf(stderr, "%s: bad parameter string: %s", progname, pargs); |
399 |
|
exit(1); |
400 |
|
return(-1); /* pro forma return */ |
401 |
|
} |
441 |
|
} |
442 |
|
/* determine sample type/bin */ |
443 |
|
if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1') { |
444 |
< |
binv = "0"; /* uniform sampling -- one bin */ |
444 |
> |
sprintf(sbuf, "if(-Dx*%g-Dy*%g-Dz*%g,0,-1)", |
445 |
> |
curparams.nrm[0], curparams.nrm[1], curparams.nrm[2]); |
446 |
> |
binv = savqstr(sbuf); |
447 |
> |
nbins = "1"; /* uniform sampling -- one bin */ |
448 |
|
uniform = 1; |
449 |
|
} else if (tolower(curparams.hemis[0]) == 's' && |
450 |
|
tolower(curparams.hemis[1]) == 'c') { |
455 |
|
exit(1); |
456 |
|
} |
457 |
|
calfn = shirchiufn; shirchiufn = NULL; |
458 |
< |
sprintf(sbuf, "SCdim=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g", |
458 |
> |
sprintf(sbuf, "SCdim=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g,RHS=%c1", |
459 |
|
curparams.hsiz, |
460 |
|
curparams.nrm[0], curparams.nrm[1], curparams.nrm[2], |
461 |
< |
curparams.vup[0], curparams.vup[1], curparams.vup[2]); |
461 |
> |
curparams.vup[0], curparams.vup[1], curparams.vup[2], |
462 |
> |
curparams.sign); |
463 |
|
params = savqstr(sbuf); |
464 |
|
binv = "scbin"; |
465 |
|
nbins = "SCdim*SCdim"; |
466 |
|
} else if ((tolower(curparams.hemis[0]) == 'r') | |
467 |
|
(tolower(curparams.hemis[0]) == 't')) { |
468 |
|
calfn = reinhfn; reinhfn = NULL; |
469 |
< |
sprintf(sbuf, "MF=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g", |
469 |
> |
sprintf(sbuf, "MF=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g,RHS=%c1", |
470 |
|
curparams.hsiz, |
471 |
|
curparams.nrm[0], curparams.nrm[1], curparams.nrm[2], |
472 |
< |
curparams.vup[0], curparams.vup[1], curparams.vup[2]); |
472 |
> |
curparams.vup[0], curparams.vup[1], curparams.vup[2], |
473 |
> |
curparams.sign); |
474 |
|
params = savqstr(sbuf); |
475 |
|
binv = "rbin"; |
476 |
|
nbins = "Nrbins"; |
498 |
|
progname, curparams.hemis); |
499 |
|
exit(1); |
500 |
|
} |
501 |
+ |
if (tolower(curparams.hemis[0]) == 'k') { |
502 |
+ |
sprintf(sbuf, "RHS=%c1", curparams.sign); |
503 |
+ |
params = savqstr(sbuf); |
504 |
+ |
} |
505 |
|
if (!uniform & (curparams.slist->styp == ST_SOURCE)) { |
506 |
|
SURF *sp; |
507 |
|
for (sp = curparams.slist; sp != NULL; sp = sp->next) |
549 |
|
{ |
550 |
|
int i; |
551 |
|
|
552 |
< |
uva[1][0] = 0.5 - frandom(); |
512 |
< |
uva[1][1] = 0.5 - frandom(); |
513 |
< |
uva[1][2] = 0.5 - frandom(); |
514 |
< |
for (i = 3; i--; ) |
515 |
< |
if ((-0.6 < nrm[i]) & (nrm[i] < 0.6)) |
516 |
< |
break; |
517 |
< |
if (i < 0) { |
552 |
> |
if (!getperpendicular(uva[0], nrm, 1)) { |
553 |
|
fputs(progname, stderr); |
554 |
|
fputs(": bad surface normal in make_axes!\n", stderr); |
555 |
|
exit(1); |
556 |
|
} |
557 |
< |
uva[1][i] = 1.0; |
523 |
< |
VCROSS(uva[0], uva[1], nrm); |
524 |
< |
normalize(uva[0]); |
525 |
< |
VCROSS(uva[1], nrm, uva[0]); |
557 |
> |
fcross(uva[1], nrm, uva[0]); |
558 |
|
} |
559 |
|
|
560 |
|
/* Illegal sender surfaces end up here */ |
693 |
|
/* special case for lone surface */ |
694 |
|
if (p->nsurfs == 1) { |
695 |
|
sp = p->slist; |
696 |
< |
if (DOT(sp->snrm, rdir) >= -FTINY) { |
696 |
> |
if (DOT(sp->snrm, rdir) >= FTINY) { |
697 |
|
fprintf(stderr, |
698 |
|
"%s: internal - sample behind sender '%s'\n", |
699 |
|
progname, sp->sname); |
816 |
|
alt = (row+samp3[1])*RAH; |
817 |
|
azi = (2.*PI)*(col+samp3[2]-.5)/rnaz(row); |
818 |
|
duvw[2] = cos(alt); /* measured from horizon */ |
819 |
< |
duvw[0] = tcos(azi)*duvw[2]; |
820 |
< |
duvw[1] = tsin(azi)*duvw[2]; |
819 |
> |
duvw[0] = tsin(azi)*duvw[2]; |
820 |
> |
duvw[1] = tcos(azi)*duvw[2]; |
821 |
|
duvw[2] = sqrt(1. - duvw[2]*duvw[2]); |
822 |
|
for (i = 3; i--; ) |
823 |
|
orig_dir[1][i] = -duvw[0]*p->udir[i] - |
868 |
|
|
869 |
|
while (n--) { /* stratified sampling */ |
870 |
|
SDmultiSamp(samp2, 2, (n+frandom())/sampcnt); |
871 |
< |
if (!bo_getvec(duvw, b+samp2[1], kbasis[bi])) |
871 |
> |
if (!fo_getvec(duvw, b+samp2[1], kbasis[bi])) |
872 |
|
return(0); |
873 |
|
for (i = 3; i--; ) |
874 |
< |
orig_dir[1][i] = duvw[0]*p->udir[i] + |
875 |
< |
duvw[1]*p->vdir[i] + |
874 |
> |
orig_dir[1][i] = -duvw[0]*p->udir[i] - |
875 |
> |
duvw[1]*p->vdir[i] - |
876 |
|
duvw[2]*p->nrm[i] ; |
877 |
|
if (!sample_origin(p, orig_dir[0], orig_dir[1], samp2[0])) |
878 |
|
return(0); |
891 |
|
fputs(": no sender surface!\n", stderr); |
892 |
|
return(-1); |
893 |
|
} |
894 |
< |
if (curparams.outfn != NULL) /* misplaced output file spec. */ |
894 |
> |
/* misplaced output file spec. */ |
895 |
> |
if ((curparams.outfn != NULL) & (verbose >= 0)) |
896 |
|
fprintf(stderr, "%s: warning - ignoring output file in sender ('%s')\n", |
897 |
|
progname, curparams.outfn); |
898 |
|
/* check/set basis hemisphere */ |
912 |
|
else |
913 |
|
curparams.vup[1] = 1; |
914 |
|
} |
915 |
< |
VCROSS(curparams.udir, curparams.vup, curparams.nrm); |
915 |
> |
fcross(curparams.udir, curparams.vup, curparams.nrm); |
916 |
|
if (normalize(curparams.udir) == 0) { |
917 |
|
fputs(progname, stderr); |
918 |
|
fputs(": up vector coincides with sender normal\n", stderr); |
919 |
|
return(-1); |
920 |
|
} |
921 |
< |
VCROSS(curparams.vdir, curparams.nrm, curparams.udir); |
921 |
> |
fcross(curparams.vdir, curparams.nrm, curparams.udir); |
922 |
> |
if (curparams.sign == '-') { /* left-handed coordinate system? */ |
923 |
> |
curparams.udir[0] *= -1.; |
924 |
> |
curparams.udir[1] *= -1.; |
925 |
> |
curparams.udir[2] *= -1.; |
926 |
> |
} |
927 |
|
if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1') |
928 |
|
curparams.sample_basis = sample_uniform; |
929 |
|
else if (tolower(curparams.hemis[0]) == 's' && |
1048 |
|
snew->area *= PI*snew->area; |
1049 |
|
break; |
1050 |
|
} |
1051 |
< |
if (snew->area <= FTINY) { |
1051 |
> |
if ((snew->area <= FTINY) & (verbose >= 0)) { |
1052 |
|
fprintf(stderr, "%s: warning - zero area for surface '%s'\n", |
1053 |
|
progname, oname); |
1054 |
|
free(snew); |
1118 |
|
add_send_object(FILE *fp) |
1119 |
|
{ |
1120 |
|
int st; |
1121 |
< |
char otype[32], oname[128]; |
1121 |
> |
char thismod[128], otype[32], oname[128]; |
1122 |
|
int n; |
1123 |
|
|
1124 |
< |
if (fscanf(fp, "%*s %s %s", otype, oname) != 2) |
1124 |
> |
if (fscanf(fp, "%s %s %s", thismod, otype, oname) != 3) |
1125 |
|
return(0); /* must have hit EOF! */ |
1126 |
|
if (!strcmp(otype, "alias")) { |
1127 |
|
fscanf(fp, "%*s"); /* skip alias */ |
1134 |
|
fputs(": cannot use source as a sender!\n", stderr); |
1135 |
|
return(-1); |
1136 |
|
} |
1137 |
+ |
if (strcmp(thismod, curmod)) { |
1138 |
+ |
if (curmod[0]) { |
1139 |
+ |
fputs(progname, stderr); |
1140 |
+ |
fputs(": warning - multiple modifiers in sender\n", |
1141 |
+ |
stderr); |
1142 |
+ |
} |
1143 |
+ |
strcpy(curmod, thismod); |
1144 |
+ |
} |
1145 |
|
parse_params(&curparams, newparams); |
1146 |
|
newparams[0] = '\0'; |
1147 |
|
add_surface(st, oname, fp); /* read & store surface */ |
1220 |
|
{ |
1221 |
|
char fmtopt[6] = "-faa"; /* default output is ASCII */ |
1222 |
|
char *xrs=NULL, *yrs=NULL, *ldopt=NULL; |
1223 |
< |
int wantIrradiance = 0; |
1223 |
> |
char *iropt = NULL; |
1224 |
|
char *sendfn; |
1225 |
|
char sampcntbuf[32], nsbinbuf[32]; |
1226 |
|
FILE *rcfp; |
1228 |
|
int a, i; |
1229 |
|
/* screen rcontrib options */ |
1230 |
|
progname = argv[0]; |
1231 |
< |
for (a = 1; a < argc-2 && argv[a][0] == '-'; a++) { |
1232 |
< |
int na = 1; /* !! Keep consistent !! */ |
1233 |
< |
switch (argv[a][1]) { |
1231 |
> |
for (a = 1; a < argc-2; a++) { |
1232 |
> |
int na; |
1233 |
> |
/* check for argument expansion */ |
1234 |
> |
while ((na = expandarg(&argc, &argv, a)) > 0) |
1235 |
> |
; |
1236 |
> |
if (na < 0) { |
1237 |
> |
fprintf(stderr, "%s: cannot expand '%s'\n", |
1238 |
> |
progname, argv[a]); |
1239 |
> |
return(1); |
1240 |
> |
} |
1241 |
> |
if (argv[a][0] != '-' || !argv[a][1]) |
1242 |
> |
break; |
1243 |
> |
na = 1; |
1244 |
> |
switch (argv[a][1]) { /* !! Keep consistent !! */ |
1245 |
|
case 'v': /* verbose mode */ |
1246 |
< |
verbose = !verbose; |
1246 |
> |
verbose = 1; |
1247 |
|
na = 0; |
1248 |
|
continue; |
1249 |
|
case 'f': /* special case for -fo, -ff, etc. */ |
1280 |
|
na = 0; /* we re-add this later */ |
1281 |
|
continue; |
1282 |
|
case 'I': /* only for pass-through mode */ |
1283 |
< |
wantIrradiance = 1; |
1283 |
> |
case 'i': |
1284 |
> |
iropt = argv[a]; |
1285 |
|
na = 0; |
1286 |
|
continue; |
1287 |
< |
case 'V': /* options without arguments */ |
1288 |
< |
case 'w': |
1287 |
> |
case 'w': /* options without arguments */ |
1288 |
> |
if (argv[a][2] != '+') verbose = -1; |
1289 |
> |
case 'V': |
1290 |
|
case 'u': |
1232 |
– |
case 'i': |
1291 |
|
case 'h': |
1292 |
|
case 'r': |
1293 |
|
break; |
1311 |
|
if (argv[a][2] != 'v') na = 2; |
1312 |
|
break; |
1313 |
|
case 'a': /* special case */ |
1314 |
< |
na = (argv[a][2] == 'v') ? 4 : 2; |
1314 |
> |
if (argv[a][2] == 'p') { |
1315 |
> |
na = 2; /* photon map [+ bandwidth(s)] */ |
1316 |
> |
if (a < argc-3 && atoi(argv[a+1]) > 0) |
1317 |
> |
na += 1 + (a < argc-4 && atoi(argv[a+2]) > 0); |
1318 |
> |
} else |
1319 |
> |
na = (argv[a][2] == 'v') ? 4 : 2; |
1320 |
|
break; |
1321 |
|
case 'm': /* special case */ |
1322 |
|
if (!argv[a][2]) goto userr; |
1323 |
|
na = (argv[a][2] == 'e') | (argv[a][2] == 'a') ? 4 : 2; |
1324 |
|
break; |
1262 |
– |
case '\0': /* pass-through mode */ |
1263 |
– |
goto done_opts; |
1325 |
|
default: /* anything else is verbotten */ |
1326 |
|
goto userr; |
1327 |
|
} |
1331 |
|
while (--na) /* + arguments if any */ |
1332 |
|
rcarg[nrcargs++] = argv[++a]; |
1333 |
|
} |
1273 |
– |
done_opts: |
1334 |
|
if (a > argc-2) |
1335 |
|
goto userr; /* check at end of options */ |
1336 |
|
sendfn = argv[a++]; /* assign sender & receiver inputs */ |
1337 |
|
if (sendfn[0] == '-') { /* user wants pass-through mode? */ |
1338 |
|
if (sendfn[1]) goto userr; |
1339 |
|
sendfn = NULL; |
1340 |
< |
if (wantIrradiance) { |
1340 |
> |
if (iropt) { |
1341 |
|
CHECKARGC(1); |
1342 |
< |
rcarg[nrcargs++] = "-I"; |
1342 |
> |
rcarg[nrcargs++] = iropt; |
1343 |
|
} |
1344 |
|
if (xrs) { |
1345 |
|
CHECKARGC(2); |
1357 |
|
} |
1358 |
|
if (sampcnt <= 0) sampcnt = 1; |
1359 |
|
} else { /* else in sampling mode */ |
1360 |
< |
if (wantIrradiance) { |
1360 |
> |
if (iropt) { |
1361 |
|
fputs(progname, stderr); |
1362 |
< |
fputs(": -I supported for pass-through only\n", stderr); |
1362 |
> |
fputs(": -i, -I supported for pass-through only\n", stderr); |
1363 |
|
return(1); |
1364 |
|
} |
1365 |
|
fmtopt[2] = (sizeof(RREAL)==sizeof(double)) ? 'd' : 'f'; |
1381 |
|
return(my_exec(rcarg)); /* rcontrib does everything */ |
1382 |
|
} |
1383 |
|
clear_params(&curparams, 0); /* else load sender surface & params */ |
1384 |
+ |
curmod[0] = '\0'; |
1385 |
|
if (load_scene(sendfn, add_send_object) < 0) |
1386 |
|
return(1); |
1387 |
|
if ((nsbins = prepare_sampler()) <= 0) |
1399 |
|
#ifdef getc_unlocked |
1400 |
|
flockfile(rcfp); |
1401 |
|
#endif |
1402 |
< |
if (verbose) { |
1402 |
> |
if (verbose > 0) { |
1403 |
|
fprintf(stderr, "%s: sampling %d directions", progname, nsbins); |
1404 |
|
if (curparams.nsurfs > 1) |
1405 |
|
fprintf(stderr, " (%d elements)\n", curparams.nsurfs); |
1409 |
|
for (i = 0; i < nsbins; i++) /* send rcontrib ray samples */ |
1410 |
|
if (!(*curparams.sample_basis)(&curparams, i, rcfp)) |
1411 |
|
return(1); |
1412 |
< |
return(pclose(rcfp) == 0); /* all finished! */ |
1412 |
> |
return(pclose(rcfp) < 0); /* all finished! */ |
1413 |
|
userr: |
1414 |
|
if (a < argc-2) |
1415 |
|
fprintf(stderr, "%s: unsupported option '%s'", progname, argv[a]); |
1416 |
< |
fprintf(stderr, "Usage: %s [-v][rcontrib options] sender.rad receiver.rad [system.rad ..]\n", |
1416 |
> |
fprintf(stderr, "Usage: %s [-v][rcontrib options] sender.rad receiver.rad [-i system.oct] [system.rad ..]\n", |
1417 |
|
progname); |
1418 |
|
return(1); |
1419 |
|
} |