| 252 |
|
return(NULL); /* gratis return */ |
| 253 |
|
} |
| 254 |
|
|
| 255 |
< |
/* Multiply two matrices (or a matrix and a vector) and allocate the result*/ |
| 255 |
> |
/* Scale a matrix by a single value */ |
| 256 |
|
static CMATRIX * |
| 257 |
+ |
cm_scale(const CMATRIX *cm1, const COLOR sca) |
| 258 |
+ |
{ |
| 259 |
+ |
CMATRIX *cmr; |
| 260 |
+ |
int dr, dc; |
| 261 |
+ |
|
| 262 |
+ |
cmr = cm_alloc(cm1->nrows, cm1->ncols); |
| 263 |
+ |
if (cmr == NULL) |
| 264 |
+ |
return(NULL); |
| 265 |
+ |
for (dr = 0; dr < cmr->nrows; dr++) |
| 266 |
+ |
for (dc = 0; dc < cmr->ncols; dc++) { |
| 267 |
+ |
const COLORV *sp = cm_lval(cm1,dr,dc); |
| 268 |
+ |
COLORV *dp = cm_lval(cmr,dr,dc); |
| 269 |
+ |
dp[0] = sp[0] * sca[0]; |
| 270 |
+ |
dp[1] = sp[1] * sca[1]; |
| 271 |
+ |
dp[2] = sp[2] * sca[2]; |
| 272 |
+ |
} |
| 273 |
+ |
return(cmr); |
| 274 |
+ |
} |
| 275 |
+ |
|
| 276 |
+ |
/* Multiply two matrices (or a matrix and a vector) and allocate the result */ |
| 277 |
+ |
static CMATRIX * |
| 278 |
|
cm_multiply(const CMATRIX *cm1, const CMATRIX *cm2) |
| 279 |
|
{ |
| 280 |
|
CMATRIX *cmr; |
| 353 |
|
|
| 354 |
|
/* Load and convert a matrix BSDF from the given XML file */ |
| 355 |
|
static CMATRIX * |
| 356 |
< |
cm_loadBSDF(char *fname) |
| 356 |
> |
cm_loadBSDF(char *fname, COLOR cLamb) |
| 357 |
|
{ |
| 358 |
< |
CMATRIX *Tmat; |
| 359 |
< |
char *fpath; |
| 360 |
< |
SDError ec; |
| 361 |
< |
SDData myBSDF; |
| 362 |
< |
COLOR bsdfLamb, specCol; |
| 358 |
> |
CMATRIX *Tmat; |
| 359 |
> |
char *fpath; |
| 360 |
> |
SDError ec; |
| 361 |
> |
SDData myBSDF; |
| 362 |
> |
SDSpectralDF *tdf; |
| 363 |
> |
COLOR bsdfLamb, specCol; |
| 364 |
|
/* find path to BSDF file */ |
| 365 |
|
fpath = getpath(fname, getrlibpath(), R_OK); |
| 366 |
|
if (fpath == NULL) { |
| 371 |
|
ec = SDloadFile(&myBSDF, fpath); |
| 372 |
|
if (ec) |
| 373 |
|
error(USER, transSDError(ec)); |
| 374 |
< |
if (myBSDF.tf == NULL || myBSDF.tf->ncomp != 1 || |
| 375 |
< |
myBSDF.tf->comp[0].func != &SDhandleMtx) { |
| 374 |
> |
ccy2rgb(&myBSDF.tLamb.spec, myBSDF.tLamb.cieY/PI, bsdfLamb); |
| 375 |
> |
tdf = (myBSDF.tf != NULL) ? myBSDF.tf : myBSDF.tb; |
| 376 |
> |
if (tdf == NULL) { /* no non-Lambertian transmission? */ |
| 377 |
> |
if (cLamb != NULL) |
| 378 |
> |
copycolor(cLamb, bsdfLamb); |
| 379 |
> |
SDfreeBSDF(&myBSDF); |
| 380 |
> |
return(NULL); |
| 381 |
> |
} |
| 382 |
> |
if (tdf->ncomp != 1 || tdf->comp[0].func != &SDhandleMtx) { |
| 383 |
|
sprintf(errmsg, "unsupported BSDF '%s'", fpath); |
| 384 |
|
error(USER, errmsg); |
| 385 |
|
} |
| 386 |
|
/* convert BTDF to matrix */ |
| 387 |
< |
ccy2rgb(&myBSDF.tLamb.spec, myBSDF.tLamb.cieY/PI, bsdfLamb); |
| 388 |
< |
ccy2rgb(&myBSDF.tf->comp[0].cspec[0], 1., specCol); |
| 389 |
< |
Tmat = cm_bsdf(bsdfLamb, specCol, (SDMat *)myBSDF.tf->comp[0].dist); |
| 387 |
> |
ccy2rgb(&tdf->comp[0].cspec[0], 1., specCol); |
| 388 |
> |
Tmat = cm_bsdf(bsdfLamb, specCol, (SDMat *)tdf->comp[0].dist); |
| 389 |
> |
if (cLamb != NULL) /* Lambertian is included */ |
| 390 |
> |
setcolor(cLamb, .0, .0, .0); |
| 391 |
|
/* free BSDF and return */ |
| 392 |
|
SDfreeBSDF(&myBSDF); |
| 393 |
|
return(Tmat); |
| 412 |
|
int dt, xr, yr; |
| 413 |
|
COLORV *psp; |
| 414 |
|
/* check for zero */ |
| 415 |
< |
if ((scv[RED] == 0) & (scv[GRN] == 0) & (scv[BLU] == 0)) |
| 415 |
> |
if ((scv[RED] == 0) & (scv[GRN] == 0) & (scv[BLU] == 0) && |
| 416 |
> |
(myDT != DTfromHeader) | (i < cv->nrows-1)) |
| 417 |
|
continue; |
| 418 |
|
/* open next picture */ |
| 419 |
|
sprintf(fname, fspec, i); |
| 475 |
|
static int |
| 476 |
|
hasNumberFormat(const char *s) |
| 477 |
|
{ |
| 478 |
< |
while (*s && *s != '%') |
| 479 |
< |
s++; |
| 480 |
< |
if (!*s) |
| 481 |
< |
return(0); |
| 482 |
< |
do |
| 483 |
< |
++s; |
| 484 |
< |
while (isdigit(*s)); |
| 485 |
< |
|
| 486 |
< |
return((*s == 'd') | (*s == 'i') | (*s == 'o') | |
| 487 |
< |
(*s == 'x') | (*s == 'X')); |
| 478 |
> |
while (*s) { |
| 479 |
> |
while (*s != '%') |
| 480 |
> |
if (!*s++) |
| 481 |
> |
return(0); |
| 482 |
> |
if (*++s == '%') { /* ignore "%%" */ |
| 483 |
> |
++s; |
| 484 |
> |
continue; |
| 485 |
> |
} |
| 486 |
> |
while (isdigit(*s)) /* field length */ |
| 487 |
> |
++s; |
| 488 |
> |
/* field we'll use? */ |
| 489 |
> |
if ((*s == 'd') | (*s == 'i') | (*s == 'o') | |
| 490 |
> |
(*s == 'x') | (*s == 'X')) |
| 491 |
> |
return(1); |
| 492 |
> |
} |
| 493 |
> |
return(0); /* didn't find one */ |
| 494 |
|
} |
| 495 |
|
|
| 496 |
|
int |
| 497 |
|
main(int argc, char *argv[]) |
| 498 |
|
{ |
| 499 |
< |
CMATRIX *cvec; |
| 499 |
> |
CMATRIX *cvec; /* component vector result */ |
| 500 |
|
|
| 501 |
|
progname = argv[0]; |
| 502 |
|
|
| 509 |
|
|
| 510 |
|
if (argc > 3) { /* VTDs expression */ |
| 511 |
|
CMATRIX *svec, *Dmat, *Tmat, *ivec; |
| 512 |
+ |
COLOR tLamb; |
| 513 |
|
/* get sky vector */ |
| 514 |
|
svec = cm_load(argv[4], 0, 1, DTascii); |
| 515 |
|
/* load BSDF */ |
| 516 |
< |
Tmat = cm_loadBSDF(argv[2]); |
| 516 |
> |
Tmat = cm_loadBSDF(argv[2], tLamb); |
| 517 |
|
/* load Daylight matrix */ |
| 518 |
< |
Dmat = cm_load(argv[3], Tmat->ncols, svec->nrows, DTfromHeader); |
| 518 |
> |
Dmat = cm_load(argv[3], Tmat==NULL ? 0 : Tmat->ncols, |
| 519 |
> |
svec->nrows, DTfromHeader); |
| 520 |
|
/* multiply vector through */ |
| 521 |
|
ivec = cm_multiply(Dmat, svec); |
| 522 |
|
cm_free(Dmat); cm_free(svec); |
| 523 |
< |
cvec = cm_multiply(Tmat, ivec); /* cvec = component vector */ |
| 524 |
< |
cm_free(Tmat); cm_free(ivec); |
| 523 |
> |
if (Tmat == NULL) { /* diffuse only */ |
| 524 |
> |
cvec = cm_scale(ivec, tLamb); |
| 525 |
> |
} else { /* else apply BTDF matrix */ |
| 526 |
> |
cvec = cm_multiply(Tmat, ivec); |
| 527 |
> |
cm_free(Tmat); |
| 528 |
> |
} |
| 529 |
> |
cm_free(ivec); |
| 530 |
|
} else { /* else just use sky vector */ |
| 531 |
|
cvec = cm_load(argv[2], 0, 1, DTascii); |
| 532 |
|
} |
