252 |
|
return(NULL); /* gratis return */ |
253 |
|
} |
254 |
|
|
255 |
+ |
/* Extract a column vector from a matrix */ |
256 |
+ |
static CMATRIX * |
257 |
+ |
cm_column(const CMATRIX *cm, int c) |
258 |
+ |
{ |
259 |
+ |
CMATRIX *cvr; |
260 |
+ |
int dr; |
261 |
+ |
|
262 |
+ |
if ((c < 0) | (c >= cm->ncols)) |
263 |
+ |
return(NULL); |
264 |
+ |
cvr = cm_alloc(cm->nrows, 1); |
265 |
+ |
if (cvr == NULL) |
266 |
+ |
return(NULL); |
267 |
+ |
for (dr = 0; dr < cm->nrows; dr++) { |
268 |
+ |
const COLORV *sp = cm_lval(cm,dr,c); |
269 |
+ |
COLORV *dp = cv_lval(cvr,dr); |
270 |
+ |
dp[0] = sp[0]; |
271 |
+ |
dp[1] = sp[1]; |
272 |
+ |
dp[2] = sp[2]; |
273 |
+ |
} |
274 |
+ |
return(cvr); |
275 |
+ |
} |
276 |
+ |
|
277 |
|
/* Scale a matrix by a single value */ |
278 |
|
static CMATRIX * |
279 |
|
cm_scale(const CMATRIX *cm1, const COLOR sca) |
481 |
|
return(Tmat); |
482 |
|
} |
483 |
|
|
484 |
< |
/* Sum together a set of images and write result to stdout */ |
484 |
> |
/* Sum together a set of images and write result to fout */ |
485 |
|
static int |
486 |
|
sum_images(const char *fspec, const CMATRIX *cv, FILE *fout) |
487 |
|
{ |
488 |
|
int myDT = DTfromHeader; |
489 |
< |
CMATRIX *pmat; |
490 |
< |
COLOR *scanline; |
491 |
< |
int myXR, myYR; |
489 |
> |
COLOR *scanline = NULL; |
490 |
> |
CMATRIX *pmat = NULL; |
491 |
> |
int myXR=0, myYR=0; |
492 |
|
int i, y; |
493 |
|
|
494 |
|
if (cv->ncols != 1) |
563 |
|
static int |
564 |
|
hasNumberFormat(const char *s) |
565 |
|
{ |
566 |
+ |
if (s == NULL) |
567 |
+ |
return(0); |
568 |
+ |
|
569 |
|
while (*s) { |
570 |
|
while (*s != '%') |
571 |
|
if (!*s++) |
587 |
|
int |
588 |
|
main(int argc, char *argv[]) |
589 |
|
{ |
590 |
< |
CMATRIX *cvec; /* component vector result */ |
590 |
> |
int nsteps = 1; |
591 |
> |
char *ofspec = NULL; |
592 |
> |
FILE *ofp = stdout; |
593 |
> |
CMATRIX *cmtx; /* component vector/matrix result */ |
594 |
> |
char fnbuf[256]; |
595 |
> |
int a, i; |
596 |
|
|
597 |
|
progname = argv[0]; |
598 |
+ |
/* get options */ |
599 |
+ |
for (a = 1; a < argc-1 && argv[a][0] == '-'; a++) |
600 |
+ |
switch (argv[0][1]) { |
601 |
+ |
case 'n': |
602 |
+ |
nsteps = atoi(argv[++a]); |
603 |
+ |
if (nsteps <= 0) |
604 |
+ |
goto userr; |
605 |
+ |
break; |
606 |
+ |
case 'o': |
607 |
+ |
ofspec = argv[++a]; |
608 |
+ |
break; |
609 |
+ |
default: |
610 |
+ |
goto userr; |
611 |
+ |
} |
612 |
+ |
if ((argc-a < 1) | (argc-a > 4)) |
613 |
+ |
goto userr; |
614 |
|
|
615 |
< |
if ((argc < 2) | (argc > 5)) { |
616 |
< |
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; |
615 |
> |
if (argc-a > 2) { /* VTDs expression */ |
616 |
> |
CMATRIX *smtx, *Dmat, *Tmat, *imtx; |
617 |
|
COLOR tLamb; |
618 |
< |
/* get sky vector */ |
619 |
< |
svec = cm_load(argv[4], 0, 1, DTascii); |
618 |
> |
/* get sky vector/matrix */ |
619 |
> |
smtx = cm_load(argv[a+3], 0, nsteps, DTascii); |
620 |
|
/* load BSDF */ |
621 |
< |
Tmat = cm_loadBSDF(argv[2], tLamb); |
621 |
> |
Tmat = cm_loadBSDF(argv[a+1], tLamb); |
622 |
|
/* load Daylight matrix */ |
623 |
< |
Dmat = cm_load(argv[3], Tmat==NULL ? 0 : Tmat->ncols, |
624 |
< |
svec->nrows, DTfromHeader); |
623 |
> |
Dmat = cm_load(argv[a+2], Tmat==NULL ? 0 : Tmat->ncols, |
624 |
> |
smtx->nrows, DTfromHeader); |
625 |
|
/* multiply vector through */ |
626 |
< |
ivec = cm_multiply(Dmat, svec); |
627 |
< |
cm_free(Dmat); cm_free(svec); |
626 |
> |
imtx = cm_multiply(Dmat, smtx); |
627 |
> |
cm_free(Dmat); cm_free(smtx); |
628 |
|
if (Tmat == NULL) { /* diffuse only */ |
629 |
< |
cvec = cm_scale(ivec, tLamb); |
629 |
> |
cmtx = cm_scale(imtx, tLamb); |
630 |
|
} else { /* else apply BTDF matrix */ |
631 |
< |
cvec = cm_multiply(Tmat, ivec); |
631 |
> |
cmtx = cm_multiply(Tmat, imtx); |
632 |
|
cm_free(Tmat); |
633 |
|
} |
634 |
< |
cm_free(ivec); |
635 |
< |
} else { /* else just use sky vector */ |
636 |
< |
cvec = cm_load(argv[2], 0, 1, DTascii); |
634 |
> |
cm_free(imtx); |
635 |
> |
} else { /* sky vector/matrix only */ |
636 |
> |
cmtx = cm_load(argv[a+1], 0, nsteps, DTascii); |
637 |
|
} |
638 |
< |
|
639 |
< |
if (hasNumberFormat(argv[1])) { /* generating image */ |
640 |
< |
SET_FILE_BINARY(stdout); |
641 |
< |
newheader("RADIANCE", stdout); |
642 |
< |
printargs(argc, argv, stdout); |
643 |
< |
fputnow(stdout); |
644 |
< |
if (!sum_images(argv[1], cvec, stdout)) |
638 |
> |
/* prepare output stream */ |
639 |
> |
if ((ofspec != NULL) & (nsteps == 1) && hasNumberFormat(ofspec)) { |
640 |
> |
sprintf(fnbuf, ofspec, 1); |
641 |
> |
ofspec = fnbuf; |
642 |
> |
} |
643 |
> |
if (ofspec != NULL && !hasNumberFormat(ofspec)) { |
644 |
> |
if ((ofp = fopen(ofspec, "w")) == NULL) { |
645 |
> |
fprintf(stderr, "%s: cannot open '%s' for output\n", |
646 |
> |
progname, ofspec); |
647 |
|
return(1); |
648 |
< |
} else { /* generating vector */ |
649 |
< |
CMATRIX *Vmat = cm_load(argv[1], 0, cvec->nrows, DTfromHeader); |
650 |
< |
CMATRIX *rvec = cm_multiply(Vmat, cvec); |
648 |
> |
} |
649 |
> |
ofspec = NULL; /* only need to open once */ |
650 |
> |
} |
651 |
> |
if (hasNumberFormat(argv[a])) { /* generating image(s) */ |
652 |
> |
if (ofspec == NULL) { |
653 |
> |
SET_FILE_BINARY(ofp); |
654 |
> |
newheader("RADIANCE", ofp); |
655 |
> |
printargs(argc, argv, ofp); |
656 |
> |
fputnow(ofp); |
657 |
> |
} |
658 |
> |
if (nsteps > 1) /* multiple output frames? */ |
659 |
> |
for (i = 0; i < nsteps; i++) { |
660 |
> |
CMATRIX *cvec = cm_column(cmtx, i); |
661 |
> |
if (ofspec != NULL) { |
662 |
> |
sprintf(fnbuf, ofspec, i+1); |
663 |
> |
if ((ofp = fopen(fnbuf, "wb")) == NULL) { |
664 |
> |
fprintf(stderr, |
665 |
> |
"%s: cannot open '%s' for output\n", |
666 |
> |
progname, fnbuf); |
667 |
> |
return(1); |
668 |
> |
} |
669 |
> |
newheader("RADIANCE", ofp); |
670 |
> |
printargs(argc, argv, ofp); |
671 |
> |
fputnow(ofp); |
672 |
> |
} |
673 |
> |
fprintf(ofp, "FRAME=%d\n", i+1); |
674 |
> |
if (!sum_images(argv[a], cvec, ofp)) |
675 |
> |
return(1); |
676 |
> |
if (ofspec != NULL) { |
677 |
> |
if (fclose(ofp) == EOF) { |
678 |
> |
fprintf(stderr, |
679 |
> |
"%s: error writing to '%s'\n", |
680 |
> |
progname, fnbuf); |
681 |
> |
return(1); |
682 |
> |
} |
683 |
> |
ofp = stdout; |
684 |
> |
} |
685 |
> |
cm_free(cvec); |
686 |
> |
} |
687 |
> |
else if (!sum_images(argv[a], cmtx, ofp)) |
688 |
> |
return(1); |
689 |
> |
} else { /* generating vector/matrix */ |
690 |
> |
CMATRIX *Vmat = cm_load(argv[a], 0, cmtx->nrows, DTfromHeader); |
691 |
> |
CMATRIX *rmtx = cm_multiply(Vmat, cmtx); |
692 |
|
cm_free(Vmat); |
693 |
< |
cm_print(rvec, stdout); |
694 |
< |
cm_free(rvec); |
693 |
> |
if (ofspec != NULL) /* multiple vector files? */ |
694 |
> |
for (i = 0; i < nsteps; i++) { |
695 |
> |
CMATRIX *rvec = cm_column(rmtx, i); |
696 |
> |
sprintf(fnbuf, ofspec, i+1); |
697 |
> |
if ((ofp = fopen(fnbuf, "w")) == NULL) { |
698 |
> |
fprintf(stderr, |
699 |
> |
"%s: cannot open '%s' for output\n", |
700 |
> |
progname, fnbuf); |
701 |
> |
return(1); |
702 |
> |
} |
703 |
> |
cm_print(rvec, ofp); |
704 |
> |
if (fclose(ofp) == EOF) { |
705 |
> |
fprintf(stderr, |
706 |
> |
"%s: error writing to '%s'\n", |
707 |
> |
progname, fnbuf); |
708 |
> |
return(1); |
709 |
> |
} |
710 |
> |
ofp = stdout; |
711 |
> |
cm_free(rvec); |
712 |
> |
} |
713 |
> |
else |
714 |
> |
cm_print(rmtx, ofp); |
715 |
> |
cm_free(rmtx); |
716 |
|
} |
717 |
< |
cm_free(cvec); /* final clean-up */ |
717 |
> |
if (fflush(ofp) == EOF) { /* final clean-up */ |
718 |
> |
fprintf(stderr, "%s: write error on output\n", progname); |
719 |
> |
return(1); |
720 |
> |
} |
721 |
> |
cm_free(cmtx); |
722 |
|
return(0); |
723 |
+ |
userr: |
724 |
+ |
fprintf(stderr, "Usage: %s [-n nsteps][-o ospec] DCspec [skyf]\n", |
725 |
+ |
progname); |
726 |
+ |
fprintf(stderr, " or: %s [-n nsteps][-o ospec] Vspec Tbsdf.xml Dmat.dat [skyf]\n", |
727 |
+ |
progname); |
728 |
+ |
return(1); |
729 |
|
} |