107 |
|
static CMATRIX * |
108 |
|
cm_load(const char *fname, int nrows, int ncols, int dtype) |
109 |
|
{ |
110 |
– |
CMATRIX *cm; |
110 |
|
FILE *fp = stdin; |
111 |
+ |
CMATRIX *cm; |
112 |
|
|
113 |
|
if (ncols <= 0) |
114 |
|
error(USER, "Non-positive number of columns"); |
118 |
|
sprintf(errmsg, "cannot open file '%s'", fname); |
119 |
|
error(SYSTEM, errmsg); |
120 |
|
} |
121 |
+ |
#ifdef getc_unlocked |
122 |
+ |
flockfile(fp); |
123 |
+ |
#endif |
124 |
|
if (dtype != DTascii) |
125 |
< |
SET_FILE_BINARY(fp); |
125 |
> |
SET_FILE_BINARY(fp); /* doesn't really work */ |
126 |
|
if (dtype == DTfromHeader) |
127 |
|
dtype = getDTfromHeader(fp); |
128 |
|
switch (dtype) { |
161 |
|
cm = cm_alloc(guessrows, ncols); |
162 |
|
} else |
163 |
|
cm = cm_alloc(nrows, ncols); |
164 |
< |
if (cm == NULL) |
164 |
> |
if (cm == NULL) /* XXX never happens */ |
165 |
|
return(NULL); |
166 |
|
if (dtype == DTascii) { /* read text file */ |
167 |
|
int maxrow = (nrows > 0 ? nrows : 32000); |
236 |
|
cvp += 3; |
237 |
|
} |
238 |
|
} |
239 |
< |
if (getc(fp) != EOF) { |
239 |
> |
if (fgetc(fp) != EOF) { |
240 |
|
sprintf(errmsg, |
241 |
|
"unexpected data at end of binary file %s", |
242 |
|
fname); |
245 |
|
} |
246 |
|
if (fp != stdin) |
247 |
|
fclose(fp); |
248 |
+ |
#ifdef getc_unlocked |
249 |
+ |
else |
250 |
+ |
funlockfile(fp); |
251 |
+ |
#endif |
252 |
|
return(cm); |
253 |
|
EOFerror: |
254 |
< |
sprintf(errmsg, "unexpected EOF reading %s", |
248 |
< |
fname); |
254 |
> |
sprintf(errmsg, "unexpected EOF reading %s", fname); |
255 |
|
error(USER, errmsg); |
256 |
|
not_handled: |
257 |
|
error(INTERNAL, "unhandled data size or length in cm_load()"); |
258 |
|
return(NULL); /* gratis return */ |
259 |
|
} |
260 |
|
|
261 |
+ |
/* Extract a column vector from a matrix */ |
262 |
+ |
static CMATRIX * |
263 |
+ |
cm_column(const CMATRIX *cm, int c) |
264 |
+ |
{ |
265 |
+ |
CMATRIX *cvr; |
266 |
+ |
int dr; |
267 |
+ |
|
268 |
+ |
if ((c < 0) | (c >= cm->ncols)) |
269 |
+ |
error(INTERNAL, "column requested outside matrix"); |
270 |
+ |
cvr = cm_alloc(cm->nrows, 1); |
271 |
+ |
if (cvr == NULL) |
272 |
+ |
return(NULL); |
273 |
+ |
for (dr = 0; dr < cm->nrows; dr++) { |
274 |
+ |
const COLORV *sp = cm_lval(cm,dr,c); |
275 |
+ |
COLORV *dp = cv_lval(cvr,dr); |
276 |
+ |
dp[0] = sp[0]; |
277 |
+ |
dp[1] = sp[1]; |
278 |
+ |
dp[2] = sp[2]; |
279 |
+ |
} |
280 |
+ |
return(cvr); |
281 |
+ |
} |
282 |
+ |
|
283 |
|
/* Scale a matrix by a single value */ |
284 |
|
static CMATRIX * |
285 |
|
cm_scale(const CMATRIX *cm1, const COLOR sca) |
305 |
|
static CMATRIX * |
306 |
|
cm_multiply(const CMATRIX *cm1, const CMATRIX *cm2) |
307 |
|
{ |
308 |
+ |
char *rowcheck=NULL, *colcheck=NULL; |
309 |
|
CMATRIX *cmr; |
310 |
|
int dr, dc, i; |
311 |
|
|
314 |
|
cmr = cm_alloc(cm1->nrows, cm2->ncols); |
315 |
|
if (cmr == NULL) |
316 |
|
return(NULL); |
317 |
+ |
/* optimization: check for zero rows & cols */ |
318 |
+ |
if (((cm1->nrows > 5) | (cm2->ncols > 5)) & (cm1->ncols > 5)) { |
319 |
+ |
static const COLOR czero; |
320 |
+ |
rowcheck = (char *)calloc(cmr->nrows, 1); |
321 |
+ |
for (dr = cm1->nrows*(rowcheck != NULL); dr--; ) |
322 |
+ |
for (dc = cm1->ncols; dc--; ) |
323 |
+ |
if (memcmp(cm_lval(cm1,dr,dc), czero, sizeof(COLOR))) { |
324 |
+ |
rowcheck[dr] = 1; |
325 |
+ |
break; |
326 |
+ |
} |
327 |
+ |
colcheck = (char *)calloc(cmr->ncols, 1); |
328 |
+ |
for (dc = cm2->ncols*(colcheck != NULL); dc--; ) |
329 |
+ |
for (dr = cm2->nrows; dr--; ) |
330 |
+ |
if (memcmp(cm_lval(cm2,dr,dc), czero, sizeof(COLOR))) { |
331 |
+ |
colcheck[dc] = 1; |
332 |
+ |
break; |
333 |
+ |
} |
334 |
+ |
} |
335 |
|
for (dr = 0; dr < cmr->nrows; dr++) |
336 |
|
for (dc = 0; dc < cmr->ncols; dc++) { |
337 |
|
COLORV *dp = cm_lval(cmr,dr,dc); |
338 |
|
dp[0] = dp[1] = dp[2] = 0; |
339 |
+ |
if (rowcheck != NULL && !rowcheck[dr]) |
340 |
+ |
continue; |
341 |
+ |
if (colcheck != NULL && !colcheck[dc]) |
342 |
+ |
continue; |
343 |
|
for (i = 0; i < cm1->ncols; i++) { |
344 |
|
const COLORV *cp1 = cm_lval(cm1,dr,i); |
345 |
|
const COLORV *cp2 = cm_lval(cm2,i,dc); |
348 |
|
dp[2] += cp1[2] * cp2[2]; |
349 |
|
} |
350 |
|
} |
351 |
+ |
if (rowcheck != NULL) free(rowcheck); |
352 |
+ |
if (colcheck != NULL) free(colcheck); |
353 |
|
return(cmr); |
354 |
|
} |
355 |
|
|
489 |
|
if (ec) |
490 |
|
error(USER, transSDError(ec)); |
491 |
|
ccy2rgb(&myBSDF.tLamb.spec, myBSDF.tLamb.cieY/PI, bsdfLamb); |
492 |
< |
recip = (myBSDF.tf == NULL); |
493 |
< |
tdf = recip ? myBSDF.tb : myBSDF.tf; |
492 |
> |
recip = (myBSDF.tb == NULL); |
493 |
> |
tdf = recip ? myBSDF.tf : myBSDF.tb; |
494 |
|
if (tdf == NULL) { /* no non-Lambertian transmission? */ |
495 |
|
if (cLamb != NULL) |
496 |
|
copycolor(cLamb, bsdfLamb); |
512 |
|
return(Tmat); |
513 |
|
} |
514 |
|
|
515 |
< |
/* Sum together a set of images and write result to stdout */ |
515 |
> |
/* Sum together a set of images and write result to fout */ |
516 |
|
static int |
517 |
|
sum_images(const char *fspec, const CMATRIX *cv, FILE *fout) |
518 |
|
{ |
519 |
|
int myDT = DTfromHeader; |
520 |
< |
CMATRIX *pmat; |
521 |
< |
COLOR *scanline; |
522 |
< |
int myXR, myYR; |
520 |
> |
COLOR *scanline = NULL; |
521 |
> |
CMATRIX *pmat = NULL; |
522 |
> |
int myXR=0, myYR=0; |
523 |
|
int i, y; |
524 |
|
|
525 |
|
if (cv->ncols != 1) |
594 |
|
static int |
595 |
|
hasNumberFormat(const char *s) |
596 |
|
{ |
597 |
+ |
if (s == NULL) |
598 |
+ |
return(0); |
599 |
+ |
|
600 |
|
while (*s) { |
601 |
|
while (*s != '%') |
602 |
|
if (!*s++) |
618 |
|
int |
619 |
|
main(int argc, char *argv[]) |
620 |
|
{ |
621 |
< |
CMATRIX *cvec; /* component vector result */ |
621 |
> |
int skyfmt = DTascii; |
622 |
> |
int nsteps = 1; |
623 |
> |
char *ofspec = NULL; |
624 |
> |
FILE *ofp = stdout; |
625 |
> |
CMATRIX *cmtx; /* component vector/matrix result */ |
626 |
> |
char fnbuf[256]; |
627 |
> |
int a, i; |
628 |
|
|
629 |
|
progname = argv[0]; |
630 |
+ |
/* get options */ |
631 |
+ |
for (a = 1; a < argc && argv[a][0] == '-'; a++) |
632 |
+ |
switch (argv[a][1]) { |
633 |
+ |
case 'n': |
634 |
+ |
nsteps = atoi(argv[++a]); |
635 |
+ |
if (nsteps <= 0) |
636 |
+ |
goto userr; |
637 |
+ |
break; |
638 |
+ |
case 'o': |
639 |
+ |
ofspec = argv[++a]; |
640 |
+ |
break; |
641 |
+ |
case 'i': |
642 |
+ |
switch (argv[a][2]) { |
643 |
+ |
case 'f': |
644 |
+ |
skyfmt = DTfloat; |
645 |
+ |
break; |
646 |
+ |
case 'd': |
647 |
+ |
skyfmt = DTdouble; |
648 |
+ |
break; |
649 |
+ |
case 'a': |
650 |
+ |
skyfmt = DTascii; |
651 |
+ |
break; |
652 |
+ |
default: |
653 |
+ |
goto userr; |
654 |
+ |
} |
655 |
+ |
break; |
656 |
+ |
default: |
657 |
+ |
goto userr; |
658 |
+ |
} |
659 |
+ |
if ((argc-a < 1) | (argc-a > 4)) |
660 |
+ |
goto userr; |
661 |
|
|
662 |
< |
if ((argc < 2) | (argc > 5)) { |
663 |
< |
fprintf(stderr, "Usage: %s DCspec [tregvec]\n", progname); |
571 |
< |
fprintf(stderr, " or: %s Vspec Tbsdf.xml Dmat.dat [tregvec]\n", |
572 |
< |
progname); |
573 |
< |
return(1); |
574 |
< |
} |
575 |
< |
|
576 |
< |
if (argc > 3) { /* VTDs expression */ |
577 |
< |
CMATRIX *svec, *Dmat, *Tmat, *ivec; |
662 |
> |
if (argc-a > 2) { /* VTDs expression */ |
663 |
> |
CMATRIX *smtx, *Dmat, *Tmat, *imtx; |
664 |
|
COLOR tLamb; |
665 |
< |
/* get sky vector */ |
666 |
< |
svec = cm_load(argv[4], 0, 1, DTascii); |
665 |
> |
/* get sky vector/matrix */ |
666 |
> |
smtx = cm_load(argv[a+3], 0, nsteps, skyfmt); |
667 |
|
/* load BSDF */ |
668 |
< |
Tmat = cm_loadBSDF(argv[2], tLamb); |
668 |
> |
Tmat = cm_loadBSDF(argv[a+1], tLamb); |
669 |
|
/* load Daylight matrix */ |
670 |
< |
Dmat = cm_load(argv[3], Tmat==NULL ? 0 : Tmat->ncols, |
671 |
< |
svec->nrows, DTfromHeader); |
670 |
> |
Dmat = cm_load(argv[a+2], Tmat==NULL ? 0 : Tmat->ncols, |
671 |
> |
smtx->nrows, DTfromHeader); |
672 |
|
/* multiply vector through */ |
673 |
< |
ivec = cm_multiply(Dmat, svec); |
674 |
< |
cm_free(Dmat); cm_free(svec); |
673 |
> |
imtx = cm_multiply(Dmat, smtx); |
674 |
> |
cm_free(Dmat); cm_free(smtx); |
675 |
|
if (Tmat == NULL) { /* diffuse only */ |
676 |
< |
cvec = cm_scale(ivec, tLamb); |
676 |
> |
cmtx = cm_scale(imtx, tLamb); |
677 |
|
} else { /* else apply BTDF matrix */ |
678 |
< |
cvec = cm_multiply(Tmat, ivec); |
678 |
> |
cmtx = cm_multiply(Tmat, imtx); |
679 |
|
cm_free(Tmat); |
680 |
|
} |
681 |
< |
cm_free(ivec); |
682 |
< |
} else { /* else just use sky vector */ |
683 |
< |
cvec = cm_load(argv[2], 0, 1, DTascii); |
681 |
> |
cm_free(imtx); |
682 |
> |
} else { /* sky vector/matrix only */ |
683 |
> |
cmtx = cm_load(argv[a+1], 0, nsteps, skyfmt); |
684 |
|
} |
685 |
< |
|
686 |
< |
if (hasNumberFormat(argv[1])) { /* generating image */ |
687 |
< |
SET_FILE_BINARY(stdout); |
688 |
< |
newheader("RADIANCE", stdout); |
689 |
< |
printargs(argc, argv, stdout); |
690 |
< |
fputnow(stdout); |
691 |
< |
if (!sum_images(argv[1], cvec, stdout)) |
685 |
> |
/* prepare output stream */ |
686 |
> |
if ((ofspec != NULL) & (nsteps == 1) && hasNumberFormat(ofspec)) { |
687 |
> |
sprintf(fnbuf, ofspec, 1); |
688 |
> |
ofspec = fnbuf; |
689 |
> |
} |
690 |
> |
if (ofspec != NULL && !hasNumberFormat(ofspec)) { |
691 |
> |
if ((ofp = fopen(ofspec, "w")) == NULL) { |
692 |
> |
fprintf(stderr, "%s: cannot open '%s' for output\n", |
693 |
> |
progname, ofspec); |
694 |
|
return(1); |
695 |
< |
} else { /* generating vector */ |
696 |
< |
CMATRIX *Vmat = cm_load(argv[1], 0, cvec->nrows, DTfromHeader); |
697 |
< |
CMATRIX *rvec = cm_multiply(Vmat, cvec); |
695 |
> |
} |
696 |
> |
ofspec = NULL; /* only need to open once */ |
697 |
> |
} |
698 |
> |
if (hasNumberFormat(argv[a])) { /* generating image(s) */ |
699 |
> |
if (ofspec == NULL) { |
700 |
> |
SET_FILE_BINARY(ofp); |
701 |
> |
newheader("RADIANCE", ofp); |
702 |
> |
printargs(argc, argv, ofp); |
703 |
> |
fputnow(ofp); |
704 |
> |
} |
705 |
> |
if (nsteps > 1) /* multiple output frames? */ |
706 |
> |
for (i = 0; i < nsteps; i++) { |
707 |
> |
CMATRIX *cvec = cm_column(cmtx, i); |
708 |
> |
if (ofspec != NULL) { |
709 |
> |
sprintf(fnbuf, ofspec, i+1); |
710 |
> |
if ((ofp = fopen(fnbuf, "wb")) == NULL) { |
711 |
> |
fprintf(stderr, |
712 |
> |
"%s: cannot open '%s' for output\n", |
713 |
> |
progname, fnbuf); |
714 |
> |
return(1); |
715 |
> |
} |
716 |
> |
newheader("RADIANCE", ofp); |
717 |
> |
printargs(argc, argv, ofp); |
718 |
> |
fputnow(ofp); |
719 |
> |
} |
720 |
> |
fprintf(ofp, "FRAME=%d\n", i+1); |
721 |
> |
if (!sum_images(argv[a], cvec, ofp)) |
722 |
> |
return(1); |
723 |
> |
if (ofspec != NULL) { |
724 |
> |
if (fclose(ofp) == EOF) { |
725 |
> |
fprintf(stderr, |
726 |
> |
"%s: error writing to '%s'\n", |
727 |
> |
progname, fnbuf); |
728 |
> |
return(1); |
729 |
> |
} |
730 |
> |
ofp = stdout; |
731 |
> |
} |
732 |
> |
cm_free(cvec); |
733 |
> |
} |
734 |
> |
else if (!sum_images(argv[a], cmtx, ofp)) |
735 |
> |
return(1); |
736 |
> |
} else { /* generating vector/matrix */ |
737 |
> |
CMATRIX *Vmat = cm_load(argv[a], 0, cmtx->nrows, DTfromHeader); |
738 |
> |
CMATRIX *rmtx = cm_multiply(Vmat, cmtx); |
739 |
|
cm_free(Vmat); |
740 |
< |
cm_print(rvec, stdout); |
741 |
< |
cm_free(rvec); |
740 |
> |
if (ofspec != NULL) /* multiple vector files? */ |
741 |
> |
for (i = 0; i < nsteps; i++) { |
742 |
> |
CMATRIX *rvec = cm_column(rmtx, i); |
743 |
> |
sprintf(fnbuf, ofspec, i+1); |
744 |
> |
if ((ofp = fopen(fnbuf, "w")) == NULL) { |
745 |
> |
fprintf(stderr, |
746 |
> |
"%s: cannot open '%s' for output\n", |
747 |
> |
progname, fnbuf); |
748 |
> |
return(1); |
749 |
> |
} |
750 |
> |
cm_print(rvec, ofp); |
751 |
> |
if (fclose(ofp) == EOF) { |
752 |
> |
fprintf(stderr, |
753 |
> |
"%s: error writing to '%s'\n", |
754 |
> |
progname, fnbuf); |
755 |
> |
return(1); |
756 |
> |
} |
757 |
> |
ofp = stdout; |
758 |
> |
cm_free(rvec); |
759 |
> |
} |
760 |
> |
else |
761 |
> |
cm_print(rmtx, ofp); |
762 |
> |
cm_free(rmtx); |
763 |
|
} |
764 |
< |
cm_free(cvec); /* final clean-up */ |
764 |
> |
if (fflush(ofp) == EOF) { /* final clean-up */ |
765 |
> |
fprintf(stderr, "%s: write error on output\n", progname); |
766 |
> |
return(1); |
767 |
> |
} |
768 |
> |
cm_free(cmtx); |
769 |
|
return(0); |
770 |
+ |
userr: |
771 |
+ |
fprintf(stderr, "Usage: %s [-n nsteps][-o ospec][-i{f|d}] DCspec [skyf]\n", |
772 |
+ |
progname); |
773 |
+ |
fprintf(stderr, " or: %s [-n nsteps][-o ospec][-i{f|d}] Vspec Tbsdf.xml Dmat.dat [skyf]\n", |
774 |
+ |
progname); |
775 |
+ |
return(1); |
776 |
|
} |