10 |
|
#include <ctype.h> |
11 |
|
#include "standard.h" |
12 |
|
#include "platform.h" |
13 |
+ |
#include "paths.h" |
14 |
|
#include "color.h" |
15 |
|
#include "resolu.h" |
16 |
|
#include "bsdf.h" |
17 |
+ |
#include "bsdf_m.h" |
18 |
|
|
19 |
|
char *progname; /* global argv[0] */ |
20 |
|
|
40 |
|
CMATRIX *cm; |
41 |
|
|
42 |
|
if ((nrows <= 0) | (ncols <= 0)) |
43 |
< |
return(NULL); |
43 |
> |
error(USER, "attempt to create empty matrix"); |
44 |
|
cm = (CMATRIX *)malloc(sizeof(CMATRIX) + |
45 |
|
3*sizeof(COLORV)*(nrows*ncols - 1)); |
46 |
|
if (cm == NULL) |
110 |
|
CMATRIX *cm; |
111 |
|
FILE *fp = stdin; |
112 |
|
|
113 |
+ |
if (ncols <= 0) |
114 |
+ |
error(USER, "Non-positive number of columns"); |
115 |
|
if (fname == NULL) |
116 |
|
fname = "<stdin>"; |
117 |
|
else if ((fp = fopen(fname, "r")) == NULL) { |
164 |
|
int maxrow = (nrows > 0 ? nrows : 32000); |
165 |
|
int r, c; |
166 |
|
for (r = 0; r < maxrow; r++) { |
167 |
< |
if (r >= cm->nrows) /* need more space? */ |
167 |
> |
if (r >= cm->nrows) /* need more space? */ |
168 |
|
cm = cm_resize(cm, 2*cm->nrows); |
169 |
|
for (c = 0; c < ncols; c++) { |
170 |
|
COLORV *cv = cm_lval(cm,r,c); |
171 |
|
if (fscanf(fp, COLSPEC, cv, cv+1, cv+2) != 3) |
172 |
< |
if ((nrows <= 0) & (r > 0) & (c == 0)) { |
172 |
> |
if ((nrows <= 0) & (r > 0) & !c) { |
173 |
|
cm = cm_resize(cm, maxrow=r); |
174 |
|
break; |
175 |
|
} else |
197 |
|
if (nread == cm->nrows*cm->ncols) |
198 |
|
/* need more space? */ |
199 |
|
cm = cm_resize(cm, 2*cm->nrows); |
200 |
< |
else if (nread % cm->ncols == 0) |
200 |
> |
else if (nread && !(nread % cm->ncols)) |
201 |
|
/* seem to be done */ |
202 |
|
cm = cm_resize(cm, nread/cm->ncols); |
203 |
|
else /* ended mid-row */ |
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; |
314 |
|
} |
315 |
|
} |
316 |
|
|
317 |
< |
/* convert a BSDF to our matrix representation */ |
317 |
> |
/* Convert a BSDF to our matrix representation */ |
318 |
|
static CMATRIX * |
319 |
< |
cm_bsdf(const struct BSDF_data *bsdf) |
319 |
> |
cm_bsdf(const COLOR bsdfLamb, const COLOR specCol, const SDMat *bsdf) |
320 |
|
{ |
321 |
|
CMATRIX *cm = cm_alloc(bsdf->nout, bsdf->ninc); |
297 |
– |
COLORV *mp = cm->cmem; |
322 |
|
int nbadohm = 0; |
323 |
|
int nneg = 0; |
324 |
|
int r, c; |
325 |
< |
|
326 |
< |
for (r = 0; r < cm->nrows; r++) |
327 |
< |
for (c = 0; c < cm->ncols; c++, mp += 3) { |
328 |
< |
float f = BSDF_value(bsdf,c,r); |
329 |
< |
float dom = getBSDF_incohm(bsdf,c); |
330 |
< |
FVECT v; |
331 |
< |
|
332 |
< |
if (f <= .0) { |
325 |
> |
/* reciprocity is "transparent" */ |
326 |
> |
for (c = 0; c < cm->ncols; c++) { |
327 |
> |
const double dom = mBSDF_incohm(bsdf,c); |
328 |
> |
/* projected solid angle */ |
329 |
> |
nbadohm += (dom <= 0); |
330 |
> |
|
331 |
> |
for (r = 0; r < cm->nrows; r++) { |
332 |
> |
float f = mBSDF_value(bsdf,c,r); |
333 |
> |
COLORV *mp = cm_lval(cm,r,c); |
334 |
> |
/* check BSDF value */ |
335 |
> |
if ((f <= 0) | (dom <= 0)) { |
336 |
|
nneg += (f < -FTINY); |
337 |
< |
continue; |
337 |
> |
f = .0f; |
338 |
|
} |
339 |
< |
if (dom <= .0) { |
340 |
< |
nbadohm++; |
341 |
< |
continue; |
342 |
< |
} |
316 |
< |
if (!getBSDF_incvec(v,bsdf,c) || v[2] > FTINY) |
317 |
< |
error(USER, "illegal incoming BTDF direction"); |
318 |
< |
|
319 |
< |
mp[0] = mp[1] = mp[2] = f * dom * -v[2]; |
339 |
> |
copycolor(mp, specCol); |
340 |
> |
scalecolor(mp, f); |
341 |
> |
addcolor(mp, bsdfLamb); |
342 |
> |
scalecolor(mp, dom); |
343 |
|
} |
344 |
< |
if (nbadohm | nneg) { |
344 |
> |
} |
345 |
> |
if (nneg | nbadohm) { |
346 |
|
sprintf(errmsg, |
347 |
< |
"BTDF has %d negatives and %d bad incoming solid angles"); |
347 |
> |
"BTDF has %d negatives and %d bad incoming solid angles", |
348 |
> |
nneg, nbadohm); |
349 |
|
error(WARNING, errmsg); |
350 |
|
} |
351 |
|
return(cm); |
352 |
|
} |
353 |
|
|
354 |
+ |
/* Load and convert a matrix BSDF from the given XML file */ |
355 |
+ |
static CMATRIX * |
356 |
+ |
cm_loadBSDF(char *fname, COLOR cLamb) |
357 |
+ |
{ |
358 |
+ |
CMATRIX *Tmat; |
359 |
+ |
char *fpath; |
360 |
+ |
SDError ec; |
361 |
+ |
SDData myBSDF; |
362 |
+ |
COLOR bsdfLamb, specCol; |
363 |
+ |
/* find path to BSDF file */ |
364 |
+ |
fpath = getpath(fname, getrlibpath(), R_OK); |
365 |
+ |
if (fpath == NULL) { |
366 |
+ |
sprintf(errmsg, "cannot find BSDF file '%s'", fname); |
367 |
+ |
error(USER, errmsg); |
368 |
+ |
} |
369 |
+ |
SDclearBSDF(&myBSDF, fname); /* load XML and check type */ |
370 |
+ |
ec = SDloadFile(&myBSDF, fpath); |
371 |
+ |
if (ec) |
372 |
+ |
error(USER, transSDError(ec)); |
373 |
+ |
ccy2rgb(&myBSDF.tLamb.spec, myBSDF.tLamb.cieY/PI, bsdfLamb); |
374 |
+ |
if (myBSDF.tf == NULL) { /* no non-Lambertian transmission? */ |
375 |
+ |
if (cLamb != NULL) |
376 |
+ |
copycolor(cLamb, bsdfLamb); |
377 |
+ |
SDfreeBSDF(&myBSDF); |
378 |
+ |
return(NULL); |
379 |
+ |
} |
380 |
+ |
if (myBSDF.tf->ncomp != 1 || myBSDF.tf->comp[0].func != &SDhandleMtx) { |
381 |
+ |
sprintf(errmsg, "unsupported BSDF '%s'", fpath); |
382 |
+ |
error(USER, errmsg); |
383 |
+ |
} |
384 |
+ |
/* convert BTDF to matrix */ |
385 |
+ |
ccy2rgb(&myBSDF.tf->comp[0].cspec[0], 1., specCol); |
386 |
+ |
Tmat = cm_bsdf(bsdfLamb, specCol, (SDMat *)myBSDF.tf->comp[0].dist); |
387 |
+ |
if (cLamb != NULL) /* Lambertian is included */ |
388 |
+ |
setcolor(cLamb, .0, .0, .0); |
389 |
+ |
/* free BSDF and return */ |
390 |
+ |
SDfreeBSDF(&myBSDF); |
391 |
+ |
return(Tmat); |
392 |
+ |
} |
393 |
+ |
|
394 |
|
/* Sum together a set of images and write result to stdout */ |
395 |
|
static int |
396 |
< |
sum_images(const char *fspec, const CMATRIX *cv) |
396 |
> |
sum_images(const char *fspec, const CMATRIX *cv, FILE *fout) |
397 |
|
{ |
398 |
|
int myDT = DTfromHeader; |
399 |
|
CMATRIX *pmat; |
409 |
|
FILE *fp; |
410 |
|
int dt, xr, yr; |
411 |
|
COLORV *psp; |
412 |
+ |
/* check for zero */ |
413 |
+ |
if ((scv[RED] == 0) & (scv[GRN] == 0) & (scv[BLU] == 0) && |
414 |
+ |
(myDT != DTfromHeader) | (i < cv->nrows-1)) |
415 |
+ |
continue; |
416 |
|
/* open next picture */ |
417 |
|
sprintf(fname, fspec, i); |
418 |
|
if ((fp = fopen(fname, "r")) == NULL) { |
435 |
|
pmat = cm_alloc(myYR, myXR); |
436 |
|
memset(pmat->cmem, 0, sizeof(COLOR)*myXR*myYR); |
437 |
|
/* finish header */ |
438 |
< |
fputformat(myDT==DTrgbe ? COLRFMT : CIEFMT, stdout); |
439 |
< |
fputc('\n', stdout); |
440 |
< |
fprtresolu(myXR, myYR, stdout); |
441 |
< |
fflush(stdout); |
438 |
> |
fputformat(myDT==DTrgbe ? COLRFMT : CIEFMT, fout); |
439 |
> |
fputc('\n', fout); |
440 |
> |
fprtresolu(myXR, myYR, fout); |
441 |
> |
fflush(fout); |
442 |
|
} else if ((dt != myDT) | (xr != myXR) | (yr != myYR)) { |
443 |
|
sprintf(errmsg, "picture '%s' format/size mismatch", |
444 |
|
fname); |
463 |
|
free(scanline); |
464 |
|
/* write scanlines */ |
465 |
|
for (y = 0; y < myYR; y++) |
466 |
< |
if (fwritescan((COLOR *)cm_lval(pmat, y, 0), myXR, stdout) < 0) |
466 |
> |
if (fwritescan((COLOR *)cm_lval(pmat, y, 0), myXR, fout) < 0) |
467 |
|
return(0); |
468 |
|
cm_free(pmat); /* all done */ |
469 |
< |
return(fflush(stdout) == 0); |
469 |
> |
return(fflush(fout) == 0); |
470 |
|
} |
471 |
|
|
472 |
< |
/* check to see if a string contains a %d specification */ |
473 |
< |
int |
474 |
< |
hasDecimalSpec(const char *s) |
472 |
> |
/* check to see if a string contains a %d or %o specification */ |
473 |
> |
static int |
474 |
> |
hasNumberFormat(const char *s) |
475 |
|
{ |
476 |
< |
while (*s && *s != '%') |
477 |
< |
s++; |
478 |
< |
if (!*s) |
479 |
< |
return(0); |
480 |
< |
do |
481 |
< |
++s; |
482 |
< |
while (isdigit(*s)); |
483 |
< |
|
484 |
< |
return(*s == 'd'); |
476 |
> |
while (*s) { |
477 |
> |
while (*s != '%') |
478 |
> |
if (!*s++) |
479 |
> |
return(0); |
480 |
> |
if (*++s == '%') { /* ignore "%%" */ |
481 |
> |
++s; |
482 |
> |
continue; |
483 |
> |
} |
484 |
> |
while (isdigit(*s)) /* field length */ |
485 |
> |
++s; |
486 |
> |
/* field we'll use? */ |
487 |
> |
if ((*s == 'd') | (*s == 'i') | (*s == 'o') | |
488 |
> |
(*s == 'x') | (*s == 'X')) |
489 |
> |
return(1); |
490 |
> |
} |
491 |
> |
return(0); /* didn't find one */ |
492 |
|
} |
493 |
|
|
494 |
|
int |
495 |
|
main(int argc, char *argv[]) |
496 |
|
{ |
497 |
< |
CMATRIX *tvec, *Dmat, *Tmat, *ivec, *cvec; |
422 |
< |
struct BSDF_data *btdf; |
497 |
> |
CMATRIX *cvec; /* component vector result */ |
498 |
|
|
499 |
|
progname = argv[0]; |
500 |
|
|
501 |
< |
if ((argc < 4) | (argc > 5)) { |
502 |
< |
fprintf(stderr, "Usage: %s Vspec Tbsdf.xml Dmat.dat [tregvec]\n", |
503 |
< |
progname); |
501 |
> |
if ((argc < 2) | (argc > 5)) { |
502 |
> |
fprintf(stderr, "Usage: %s DCspec [tregvec]\n", progname); |
503 |
> |
fprintf(stderr, " or: %s Vspec Tbsdf.xml Dmat.dat [tregvec]\n", |
504 |
> |
progname); |
505 |
|
return(1); |
506 |
|
} |
507 |
< |
tvec = cm_load(argv[4], 0, 1, DTascii); /* argv[4]==NULL iff argc==4 */ |
508 |
< |
Dmat = cm_load(argv[3], 0, tvec->nrows, DTfromHeader); |
509 |
< |
btdf = load_BSDF(argv[2]); |
510 |
< |
if (btdf == NULL) |
511 |
< |
return(1); |
512 |
< |
if (btdf->ninc != Dmat->nrows) { |
513 |
< |
sprintf(errmsg, "Incoming BTDF dir (%d) mismatch to D (%d)", |
514 |
< |
btdf->ninc, Dmat->nrows); |
515 |
< |
error(USER, errmsg); |
516 |
< |
} |
507 |
> |
|
508 |
> |
if (argc > 3) { /* VTDs expression */ |
509 |
> |
CMATRIX *svec, *Dmat, *Tmat, *ivec; |
510 |
> |
COLOR tLamb; |
511 |
> |
/* get sky vector */ |
512 |
> |
svec = cm_load(argv[4], 0, 1, DTascii); |
513 |
> |
/* load BSDF */ |
514 |
> |
Tmat = cm_loadBSDF(argv[2], tLamb); |
515 |
> |
/* load Daylight matrix */ |
516 |
> |
Dmat = cm_load(argv[3], Tmat==NULL ? 0 : Tmat->ncols, |
517 |
> |
svec->nrows, DTfromHeader); |
518 |
|
/* multiply vector through */ |
519 |
< |
ivec = cm_multiply(Dmat, tvec); |
520 |
< |
cm_free(Dmat); cm_free(tvec); |
521 |
< |
Tmat = cm_bsdf(btdf); /* convert BTDF to matrix */ |
522 |
< |
free_BSDF(btdf); |
523 |
< |
cvec = cm_multiply(Tmat, ivec); /* cvec = component vector */ |
524 |
< |
cm_free(Tmat); cm_free(ivec); |
525 |
< |
if (hasDecimalSpec(argv[1])) { /* generating image */ |
519 |
> |
ivec = cm_multiply(Dmat, svec); |
520 |
> |
cm_free(Dmat); cm_free(svec); |
521 |
> |
if (Tmat == NULL) { /* diffuse only */ |
522 |
> |
cvec = cm_scale(ivec, tLamb); |
523 |
> |
} else { /* else apply BTDF matrix */ |
524 |
> |
cvec = cm_multiply(Tmat, ivec); |
525 |
> |
cm_free(Tmat); |
526 |
> |
} |
527 |
> |
cm_free(ivec); |
528 |
> |
} else { /* else just use sky vector */ |
529 |
> |
cvec = cm_load(argv[2], 0, 1, DTascii); |
530 |
> |
} |
531 |
> |
|
532 |
> |
if (hasNumberFormat(argv[1])) { /* generating image */ |
533 |
|
SET_FILE_BINARY(stdout); |
534 |
|
newheader("RADIANCE", stdout); |
535 |
|
printargs(argc, argv, stdout); |
536 |
|
fputnow(stdout); |
537 |
< |
if (!sum_images(argv[1], cvec)) |
537 |
> |
if (!sum_images(argv[1], cvec, stdout)) |
538 |
|
return(1); |
539 |
|
} else { /* generating vector */ |
540 |
|
CMATRIX *Vmat = cm_load(argv[1], 0, cvec->nrows, DTfromHeader); |