401 |
|
fputs(": undefined normal for hemisphere sampling\n", stderr); |
402 |
|
exit(1); |
403 |
|
} |
404 |
< |
if (normalize(curparams.vup) == 0) |
404 |
> |
if (normalize(curparams.vup) == 0) { |
405 |
|
if (fabs(curparams.nrm[2]) < .7) |
406 |
|
curparams.vup[2] = 1; |
407 |
|
else |
408 |
|
curparams.vup[1] = 1; |
409 |
+ |
} |
410 |
|
/* determine sample type/bin */ |
411 |
|
if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1') { |
412 |
|
binv = "0"; /* uniform sampling -- one bin */ |
420 |
|
exit(1); |
421 |
|
} |
422 |
|
calfn = shirchiufn; shirchiufn = NULL; |
423 |
< |
sprintf(sbuf, "SCdim=%d,Nx=%g,Ny=%g,Nz=%g,Ux=%g,Uy=%g,Uz=%g", |
423 |
> |
sprintf(sbuf, "SCdim=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g", |
424 |
|
curparams.hsiz, |
425 |
|
curparams.nrm[0], curparams.nrm[1], curparams.nrm[2], |
426 |
|
curparams.vup[0], curparams.vup[1], curparams.vup[2]); |
430 |
|
} else if ((tolower(curparams.hemis[0]) == 'r') | |
431 |
|
(tolower(curparams.hemis[0]) == 't')) { |
432 |
|
calfn = reinhfn; reinhfn = NULL; |
433 |
< |
sprintf(sbuf, "MF=%d,Nx=%g,Ny=%g,Nz=%g,Ux=%g,Uy=%g,Uz=%g", |
433 |
> |
sprintf(sbuf, "MF=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g", |
434 |
|
curparams.hsiz, |
435 |
|
curparams.nrm[0], curparams.nrm[1], curparams.nrm[2], |
436 |
|
curparams.vup[0], curparams.vup[1], curparams.vup[2]); |
873 |
|
fputs(": undefined normal for sender sampling\n", stderr); |
874 |
|
return(-1); |
875 |
|
} |
876 |
< |
if (normalize(curparams.vup) == 0) |
876 |
> |
if (normalize(curparams.vup) == 0) { |
877 |
|
if (fabs(curparams.nrm[2]) < .7) |
878 |
|
curparams.vup[2] = 1; |
879 |
|
else |
880 |
|
curparams.vup[1] = 1; |
881 |
+ |
} |
882 |
|
VCROSS(curparams.udir, curparams.vup, curparams.nrm); |
883 |
|
if (normalize(curparams.udir) == 0) { |
884 |
|
fputs(progname, stderr); |
1002 |
|
case ST_SOURCE: |
1003 |
|
if (snew->nfargs != 4) |
1004 |
|
goto badcount; |
1005 |
< |
VCOPY(snew->snrm, snew->farg); |
1005 |
> |
for (n = 3; n--; ) /* need to reverse "normal" */ |
1006 |
> |
snew->snrm[n] = -snew->farg[n]; |
1007 |
|
if (normalize(snew->snrm) == 0) |
1008 |
|
goto badnorm; |
1009 |
|
snew->area = sin((PI/180./2.)*snew->farg[3]); |
1066 |
|
return(1); |
1067 |
|
} |
1068 |
|
/* else skip arguments */ |
1069 |
< |
if (!fscanf(fp, "%d", &n)) return; |
1069 |
> |
if (!fscanf(fp, "%d", &n)) return(0); |
1070 |
|
while (n-- > 0) fscanf(fp, "%*s"); |
1071 |
< |
if (!fscanf(fp, "%d", &n)) return; |
1071 |
> |
if (!fscanf(fp, "%d", &n)) return(0); |
1072 |
|
while (n-- > 0) fscanf(fp, "%*d"); |
1073 |
< |
if (!fscanf(fp, "%d", &n)) return; |
1073 |
> |
if (!fscanf(fp, "%d", &n)) return(0); |
1074 |
|
while (n-- > 0) fscanf(fp, "%*f"); |
1075 |
|
return(0); |
1076 |
|
} |
1102 |
|
return(0); |
1103 |
|
} |
1104 |
|
/* else skip arguments */ |
1105 |
< |
if (!fscanf(fp, "%d", &n)) return; |
1105 |
> |
if (!fscanf(fp, "%d", &n)) return(0); |
1106 |
|
while (n-- > 0) fscanf(fp, "%*s"); |
1107 |
< |
if (!fscanf(fp, "%d", &n)) return; |
1107 |
> |
if (!fscanf(fp, "%d", &n)) return(0); |
1108 |
|
while (n-- > 0) fscanf(fp, "%*d"); |
1109 |
< |
if (!fscanf(fp, "%d", &n)) return; |
1109 |
> |
if (!fscanf(fp, "%d", &n)) return(0); |
1110 |
|
while (n-- > 0) fscanf(fp, "%*f"); |
1111 |
|
return(0); |
1112 |
|
} |
1149 |
|
strcat(newparams, inpbuf); |
1150 |
|
continue; |
1151 |
|
} |
1152 |
< |
while ((c = getc(fp)) != EOF && c != '\n'); |
1152 |
> |
while ((c = getc(fp)) != EOF && c != '\n') |
1153 |
|
; /* else skipping comment */ |
1154 |
|
continue; |
1155 |
|
} |
1174 |
|
{ |
1175 |
|
char fmtopt[6] = "-faa"; /* default output is ASCII */ |
1176 |
|
char *xrs=NULL, *yrs=NULL, *ldopt=NULL; |
1177 |
+ |
int wantIrradiance = 0; |
1178 |
|
char *sendfn; |
1179 |
|
char sampcntbuf[32], nsbinbuf[32]; |
1180 |
|
FILE *rcfp; |
1222 |
|
goto userr; |
1223 |
|
na = 0; /* we re-add this later */ |
1224 |
|
continue; |
1225 |
+ |
case 'I': /* only for pass-through mode */ |
1226 |
+ |
wantIrradiance = 1; |
1227 |
+ |
na = 0; |
1228 |
+ |
continue; |
1229 |
|
case 'V': /* options without arguments */ |
1230 |
|
case 'w': |
1231 |
|
case 'u': |
1277 |
|
if (sendfn[0] == '-') { /* user wants pass-through mode? */ |
1278 |
|
if (sendfn[1]) goto userr; |
1279 |
|
sendfn = NULL; |
1280 |
+ |
if (wantIrradiance) { |
1281 |
+ |
CHECKARGC(1); |
1282 |
+ |
rcarg[nrcargs++] = "-I"; |
1283 |
+ |
} |
1284 |
|
if (xrs) { |
1285 |
|
CHECKARGC(2); |
1286 |
|
rcarg[nrcargs++] = "-x"; |
1296 |
|
rcarg[nrcargs++] = ldopt; |
1297 |
|
} |
1298 |
|
if (sampcnt <= 0) sampcnt = 1; |
1299 |
< |
} else { /* else FVECT determines input format */ |
1299 |
> |
} else { /* else in sampling mode */ |
1300 |
> |
if (wantIrradiance) { |
1301 |
> |
fputs(progname, stderr); |
1302 |
> |
fputs(": -I supported for pass-through only\n", stderr); |
1303 |
> |
return(1); |
1304 |
> |
} |
1305 |
|
fmtopt[2] = (sizeof(RREAL)==sizeof(double)) ? 'd' : 'f'; |
1306 |
|
if (sampcnt <= 0) sampcnt = 10000; |
1307 |
|
} |