9 |
|
|
10 |
|
#include <ctype.h> |
11 |
|
#include "standard.h" |
12 |
+ |
#include "cmatrix.h" |
13 |
|
#include "platform.h" |
13 |
– |
#include "paths.h" |
14 |
– |
#include "color.h" |
14 |
|
#include "resolu.h" |
16 |
– |
#include "bsdf.h" |
17 |
– |
#include "bsdf_m.h" |
15 |
|
|
16 |
|
char *progname; /* global argv[0] */ |
17 |
|
|
21 |
– |
/* Data types for file loading */ |
22 |
– |
enum {DTfromHeader, DTascii, DTfloat, DTdouble, DTrgbe, DTxyze}; |
23 |
– |
|
24 |
– |
/* A color coefficient matrix -- vectors have ncols==1 */ |
25 |
– |
typedef struct { |
26 |
– |
int nrows, ncols; |
27 |
– |
COLORV cmem[3]; /* extends struct */ |
28 |
– |
} CMATRIX; |
29 |
– |
|
30 |
– |
#define COLSPEC (sizeof(COLORV)==sizeof(float) ? "%f %f %f" : "%lf %lf %lf") |
31 |
– |
|
32 |
– |
#define cm_lval(cm,r,c) ((cm)->cmem + 3*((r)*(cm)->ncols + (c))) |
33 |
– |
|
34 |
– |
#define cv_lval(cm,i) ((cm)->cmem + 3*(i)) |
35 |
– |
|
36 |
– |
/* Allocate a color coefficient matrix */ |
37 |
– |
static CMATRIX * |
38 |
– |
cm_alloc(int nrows, int ncols) |
39 |
– |
{ |
40 |
– |
CMATRIX *cm; |
41 |
– |
|
42 |
– |
if ((nrows <= 0) | (ncols <= 0)) |
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) |
47 |
– |
error(SYSTEM, "out of memory in cm_alloc()"); |
48 |
– |
cm->nrows = nrows; |
49 |
– |
cm->ncols = ncols; |
50 |
– |
return(cm); |
51 |
– |
} |
52 |
– |
|
53 |
– |
#define cm_free(cm) free(cm) |
54 |
– |
|
55 |
– |
/* Resize color coefficient matrix */ |
56 |
– |
static CMATRIX * |
57 |
– |
cm_resize(CMATRIX *cm, int nrows) |
58 |
– |
{ |
59 |
– |
if (nrows == cm->nrows) |
60 |
– |
return(cm); |
61 |
– |
if (nrows <= 0) { |
62 |
– |
cm_free(cm); |
63 |
– |
return(NULL); |
64 |
– |
} |
65 |
– |
cm = (CMATRIX *)realloc(cm, sizeof(CMATRIX) + |
66 |
– |
3*sizeof(COLORV)*(nrows*cm->ncols - 1)); |
67 |
– |
if (cm == NULL) |
68 |
– |
error(SYSTEM, "out of memory in cm_resize()"); |
69 |
– |
cm->nrows = nrows; |
70 |
– |
return(cm); |
71 |
– |
} |
72 |
– |
|
73 |
– |
/* Load header to obtain data type */ |
74 |
– |
static int |
75 |
– |
getDT(char *s, void *p) |
76 |
– |
{ |
77 |
– |
char fmt[32]; |
78 |
– |
|
79 |
– |
if (formatval(fmt, s)) { |
80 |
– |
if (!strcmp(fmt, "ascii")) |
81 |
– |
*((int *)p) = DTascii; |
82 |
– |
else if (!strcmp(fmt, "float")) |
83 |
– |
*((int *)p) = DTfloat; |
84 |
– |
else if (!strcmp(fmt, "double")) |
85 |
– |
*((int *)p) = DTdouble; |
86 |
– |
else if (!strcmp(fmt, COLRFMT)) |
87 |
– |
*((int *)p) = DTrgbe; |
88 |
– |
else if (!strcmp(fmt, CIEFMT)) |
89 |
– |
*((int *)p) = DTxyze; |
90 |
– |
} |
91 |
– |
return(0); |
92 |
– |
} |
93 |
– |
|
94 |
– |
static int |
95 |
– |
getDTfromHeader(FILE *fp) |
96 |
– |
{ |
97 |
– |
int dt = DTfromHeader; |
98 |
– |
|
99 |
– |
if (getheader(fp, getDT, &dt) < 0) |
100 |
– |
error(SYSTEM, "header read error"); |
101 |
– |
if (dt == DTfromHeader) |
102 |
– |
error(USER, "missing data format in header"); |
103 |
– |
return(dt); |
104 |
– |
} |
105 |
– |
|
106 |
– |
/* Allocate and load a matrix from the given file (or stdin if NULL) */ |
107 |
– |
static CMATRIX * |
108 |
– |
cm_load(const char *fname, int nrows, int ncols, int dtype) |
109 |
– |
{ |
110 |
– |
FILE *fp = stdin; |
111 |
– |
CMATRIX *cm; |
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) { |
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); |
126 |
– |
if (dtype == DTfromHeader) |
127 |
– |
dtype = getDTfromHeader(fp); |
128 |
– |
switch (dtype) { |
129 |
– |
case DTascii: |
130 |
– |
case DTfloat: |
131 |
– |
case DTdouble: |
132 |
– |
break; |
133 |
– |
default: |
134 |
– |
error(USER, "unexpected data type in cm_load()"); |
135 |
– |
} |
136 |
– |
if (nrows <= 0) { /* don't know length? */ |
137 |
– |
int guessrows = 147; /* usually big enough */ |
138 |
– |
if ((dtype != DTascii) & (fp != stdin)) { |
139 |
– |
long startpos = ftell(fp); |
140 |
– |
if (fseek(fp, 0L, SEEK_END) == 0) { |
141 |
– |
long endpos = ftell(fp); |
142 |
– |
long elemsiz = 3*(dtype==DTfloat ? |
143 |
– |
sizeof(float) : sizeof(double)); |
144 |
– |
|
145 |
– |
if ((endpos - startpos) % (ncols*elemsiz)) { |
146 |
– |
sprintf(errmsg, |
147 |
– |
"improper length for binary file '%s'", |
148 |
– |
fname); |
149 |
– |
error(USER, errmsg); |
150 |
– |
} |
151 |
– |
guessrows = (endpos - startpos)/(ncols*elemsiz); |
152 |
– |
if (fseek(fp, startpos, SEEK_SET) < 0) { |
153 |
– |
sprintf(errmsg, |
154 |
– |
"fseek() error on file '%s'", |
155 |
– |
fname); |
156 |
– |
error(SYSTEM, errmsg); |
157 |
– |
} |
158 |
– |
nrows = guessrows; /* we're confident */ |
159 |
– |
} |
160 |
– |
} |
161 |
– |
cm = cm_alloc(guessrows, ncols); |
162 |
– |
} else |
163 |
– |
cm = cm_alloc(nrows, ncols); |
164 |
– |
if (cm == NULL) /* XXX never happens */ |
165 |
– |
return(NULL); |
166 |
– |
if (dtype == DTascii) { /* read text file */ |
167 |
– |
int maxrow = (nrows > 0 ? nrows : 32000); |
168 |
– |
int r, c; |
169 |
– |
for (r = 0; r < maxrow; r++) { |
170 |
– |
if (r >= cm->nrows) /* need more space? */ |
171 |
– |
cm = cm_resize(cm, 2*cm->nrows); |
172 |
– |
for (c = 0; c < ncols; c++) { |
173 |
– |
COLORV *cv = cm_lval(cm,r,c); |
174 |
– |
if (fscanf(fp, COLSPEC, cv, cv+1, cv+2) != 3) |
175 |
– |
if ((nrows <= 0) & (r > 0) & !c) { |
176 |
– |
cm = cm_resize(cm, maxrow=r); |
177 |
– |
break; |
178 |
– |
} else |
179 |
– |
goto EOFerror; |
180 |
– |
} |
181 |
– |
} |
182 |
– |
while ((c = getc(fp)) != EOF) |
183 |
– |
if (!isspace(c)) { |
184 |
– |
sprintf(errmsg, |
185 |
– |
"unexpected data at end of ascii file %s", |
186 |
– |
fname); |
187 |
– |
error(WARNING, errmsg); |
188 |
– |
break; |
189 |
– |
} |
190 |
– |
} else { /* read binary file */ |
191 |
– |
if (sizeof(COLORV) == (dtype==DTfloat ? sizeof(float) : |
192 |
– |
sizeof(double))) { |
193 |
– |
int nread = 0; |
194 |
– |
do { /* read all we can */ |
195 |
– |
nread += fread(cm->cmem + 3*nread, |
196 |
– |
3*sizeof(COLORV), |
197 |
– |
cm->nrows*cm->ncols - nread, |
198 |
– |
fp); |
199 |
– |
if (nrows <= 0) { /* unknown length */ |
200 |
– |
if (nread == cm->nrows*cm->ncols) |
201 |
– |
/* need more space? */ |
202 |
– |
cm = cm_resize(cm, 2*cm->nrows); |
203 |
– |
else if (nread && !(nread % cm->ncols)) |
204 |
– |
/* seem to be done */ |
205 |
– |
cm = cm_resize(cm, nread/cm->ncols); |
206 |
– |
else /* ended mid-row */ |
207 |
– |
goto EOFerror; |
208 |
– |
} else if (nread < cm->nrows*cm->ncols) |
209 |
– |
goto EOFerror; |
210 |
– |
} while (nread < cm->nrows*cm->ncols); |
211 |
– |
|
212 |
– |
} else if (dtype == DTdouble) { |
213 |
– |
double dc[3]; /* load from double */ |
214 |
– |
COLORV *cvp = cm->cmem; |
215 |
– |
int n = nrows*ncols; |
216 |
– |
|
217 |
– |
if (n <= 0) |
218 |
– |
goto not_handled; |
219 |
– |
while (n--) { |
220 |
– |
if (fread(dc, sizeof(double), 3, fp) != 3) |
221 |
– |
goto EOFerror; |
222 |
– |
copycolor(cvp, dc); |
223 |
– |
cvp += 3; |
224 |
– |
} |
225 |
– |
} else /* dtype == DTfloat */ { |
226 |
– |
float fc[3]; /* load from float */ |
227 |
– |
COLORV *cvp = cm->cmem; |
228 |
– |
int n = nrows*ncols; |
229 |
– |
|
230 |
– |
if (n <= 0) |
231 |
– |
goto not_handled; |
232 |
– |
while (n--) { |
233 |
– |
if (fread(fc, sizeof(float), 3, fp) != 3) |
234 |
– |
goto EOFerror; |
235 |
– |
copycolor(cvp, fc); |
236 |
– |
cvp += 3; |
237 |
– |
} |
238 |
– |
} |
239 |
– |
if (fgetc(fp) != EOF) { |
240 |
– |
sprintf(errmsg, |
241 |
– |
"unexpected data at end of binary file %s", |
242 |
– |
fname); |
243 |
– |
error(WARNING, errmsg); |
244 |
– |
} |
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", 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 |
– |
return(NULL); |
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) |
286 |
– |
{ |
287 |
– |
CMATRIX *cmr; |
288 |
– |
int dr, dc; |
289 |
– |
|
290 |
– |
cmr = cm_alloc(cm1->nrows, cm1->ncols); |
291 |
– |
if (cmr == NULL) |
292 |
– |
return(NULL); |
293 |
– |
for (dr = 0; dr < cmr->nrows; dr++) |
294 |
– |
for (dc = 0; dc < cmr->ncols; dc++) { |
295 |
– |
const COLORV *sp = cm_lval(cm1,dr,dc); |
296 |
– |
COLORV *dp = cm_lval(cmr,dr,dc); |
297 |
– |
dp[0] = sp[0] * sca[0]; |
298 |
– |
dp[1] = sp[1] * sca[1]; |
299 |
– |
dp[2] = sp[2] * sca[2]; |
300 |
– |
} |
301 |
– |
return(cmr); |
302 |
– |
} |
303 |
– |
|
304 |
– |
/* Multiply two matrices (or a matrix and a vector) and allocate the result */ |
305 |
– |
static CMATRIX * |
306 |
– |
cm_multiply(const CMATRIX *cm1, const CMATRIX *cm2) |
307 |
– |
{ |
308 |
– |
CMATRIX *cmr; |
309 |
– |
int dr, dc, i; |
310 |
– |
|
311 |
– |
if ((cm1->ncols <= 0) | (cm1->ncols != cm2->nrows)) |
312 |
– |
error(INTERNAL, "matrix dimension mismatch in cm_multiply()"); |
313 |
– |
cmr = cm_alloc(cm1->nrows, cm2->ncols); |
314 |
– |
if (cmr == NULL) |
315 |
– |
return(NULL); |
316 |
– |
for (dr = 0; dr < cmr->nrows; dr++) |
317 |
– |
for (dc = 0; dc < cmr->ncols; dc++) { |
318 |
– |
COLORV *dp = cm_lval(cmr,dr,dc); |
319 |
– |
dp[0] = dp[1] = dp[2] = 0; |
320 |
– |
for (i = 0; i < cm1->ncols; i++) { |
321 |
– |
const COLORV *cp1 = cm_lval(cm1,dr,i); |
322 |
– |
const COLORV *cp2 = cm_lval(cm2,i,dc); |
323 |
– |
dp[0] += cp1[0] * cp2[0]; |
324 |
– |
dp[1] += cp1[1] * cp2[1]; |
325 |
– |
dp[2] += cp1[2] * cp2[2]; |
326 |
– |
} |
327 |
– |
} |
328 |
– |
return(cmr); |
329 |
– |
} |
330 |
– |
|
331 |
– |
/* print out matrix as ASCII text -- no header */ |
332 |
– |
static void |
333 |
– |
cm_print(const CMATRIX *cm, FILE *fp) |
334 |
– |
{ |
335 |
– |
int r, c; |
336 |
– |
const COLORV *mp = cm->cmem; |
337 |
– |
|
338 |
– |
for (r = 0; r < cm->nrows; r++) { |
339 |
– |
for (c = 0; c < cm->ncols; c++, mp += 3) |
340 |
– |
fprintf(fp, "\t%.6e %.6e %.6e", mp[0], mp[1], mp[2]); |
341 |
– |
fputc('\n', fp); |
342 |
– |
} |
343 |
– |
} |
344 |
– |
|
345 |
– |
/* Convert a BSDF to our matrix representation */ |
346 |
– |
static CMATRIX * |
347 |
– |
cm_bsdf(const COLOR bsdfLamb, const COLOR specCol, const SDMat *bsdf) |
348 |
– |
{ |
349 |
– |
CMATRIX *cm = cm_alloc(bsdf->nout, bsdf->ninc); |
350 |
– |
int nbadohm = 0; |
351 |
– |
int nneg = 0; |
352 |
– |
int r, c; |
353 |
– |
/* loop over incident angles */ |
354 |
– |
for (c = 0; c < cm->ncols; c++) { |
355 |
– |
const double dom = mBSDF_incohm(bsdf,c); |
356 |
– |
/* projected solid angle */ |
357 |
– |
nbadohm += (dom <= 0); |
358 |
– |
|
359 |
– |
for (r = 0; r < cm->nrows; r++) { |
360 |
– |
float f = mBSDF_value(bsdf,c,r); |
361 |
– |
COLORV *mp = cm_lval(cm,r,c); |
362 |
– |
/* check BSDF value */ |
363 |
– |
if ((f <= 0) | (dom <= 0)) { |
364 |
– |
nneg += (f < -FTINY); |
365 |
– |
f = .0f; |
366 |
– |
} |
367 |
– |
copycolor(mp, specCol); |
368 |
– |
scalecolor(mp, f); |
369 |
– |
addcolor(mp, bsdfLamb); |
370 |
– |
scalecolor(mp, dom); |
371 |
– |
} |
372 |
– |
} |
373 |
– |
if (nneg | nbadohm) { |
374 |
– |
sprintf(errmsg, |
375 |
– |
"BTDF has %d negatives and %d bad incoming solid angles", |
376 |
– |
nneg, nbadohm); |
377 |
– |
error(WARNING, errmsg); |
378 |
– |
} |
379 |
– |
return(cm); |
380 |
– |
} |
381 |
– |
|
382 |
– |
/* Convert between input and output indices for reciprocity */ |
383 |
– |
static int |
384 |
– |
recip_out_from_in(const SDMat *bsdf, int in_recip) |
385 |
– |
{ |
386 |
– |
FVECT v; |
387 |
– |
|
388 |
– |
if (!mBSDF_incvec(v, bsdf, in_recip+.5)) |
389 |
– |
return(in_recip); /* XXX should be error! */ |
390 |
– |
v[2] = -v[2]; |
391 |
– |
return(mBSDF_outndx(bsdf, v)); |
392 |
– |
} |
393 |
– |
|
394 |
– |
/* Convert between output and input indices for reciprocity */ |
395 |
– |
static int |
396 |
– |
recip_in_from_out(const SDMat *bsdf, int out_recip) |
397 |
– |
{ |
398 |
– |
FVECT v; |
399 |
– |
|
400 |
– |
if (!mBSDF_outvec(v, bsdf, out_recip+.5)) |
401 |
– |
return(out_recip); /* XXX should be error! */ |
402 |
– |
v[2] = -v[2]; |
403 |
– |
return(mBSDF_incndx(bsdf, v)); |
404 |
– |
} |
405 |
– |
|
406 |
– |
/* Convert a BSDF to our matrix representation, applying reciprocity */ |
407 |
– |
static CMATRIX * |
408 |
– |
cm_bsdf_recip(const COLOR bsdfLamb, const COLOR specCol, const SDMat *bsdf) |
409 |
– |
{ |
410 |
– |
CMATRIX *cm = cm_alloc(bsdf->ninc, bsdf->nout); |
411 |
– |
int nbadohm = 0; |
412 |
– |
int nneg = 0; |
413 |
– |
int r, c; |
414 |
– |
/* loop over incident angles */ |
415 |
– |
for (c = 0; c < cm->ncols; c++) { |
416 |
– |
const int ro = recip_out_from_in(bsdf,c); |
417 |
– |
const double dom = mBSDF_outohm(bsdf,ro); |
418 |
– |
/* projected solid angle */ |
419 |
– |
nbadohm += (dom <= 0); |
420 |
– |
|
421 |
– |
for (r = 0; r < cm->nrows; r++) { |
422 |
– |
const int ri = recip_in_from_out(bsdf,r); |
423 |
– |
float f = mBSDF_value(bsdf,ri,ro); |
424 |
– |
COLORV *mp = cm_lval(cm,r,c); |
425 |
– |
/* check BSDF value */ |
426 |
– |
if ((f <= 0) | (dom <= 0)) { |
427 |
– |
nneg += (f < -FTINY); |
428 |
– |
f = .0f; |
429 |
– |
} |
430 |
– |
copycolor(mp, specCol); |
431 |
– |
scalecolor(mp, f); |
432 |
– |
addcolor(mp, bsdfLamb); |
433 |
– |
scalecolor(mp, dom); |
434 |
– |
} |
435 |
– |
} |
436 |
– |
if (nneg | nbadohm) { |
437 |
– |
sprintf(errmsg, |
438 |
– |
"BTDF has %d negatives and %d bad incoming solid angles", |
439 |
– |
nneg, nbadohm); |
440 |
– |
error(WARNING, errmsg); |
441 |
– |
} |
442 |
– |
return(cm); |
443 |
– |
} |
444 |
– |
|
445 |
– |
/* Load and convert a matrix BSDF from the given XML file */ |
446 |
– |
static CMATRIX * |
447 |
– |
cm_loadBSDF(char *fname, COLOR cLamb) |
448 |
– |
{ |
449 |
– |
CMATRIX *Tmat; |
450 |
– |
char *fpath; |
451 |
– |
int recip; |
452 |
– |
SDError ec; |
453 |
– |
SDData myBSDF; |
454 |
– |
SDSpectralDF *tdf; |
455 |
– |
COLOR bsdfLamb, specCol; |
456 |
– |
/* find path to BSDF file */ |
457 |
– |
fpath = getpath(fname, getrlibpath(), R_OK); |
458 |
– |
if (fpath == NULL) { |
459 |
– |
sprintf(errmsg, "cannot find BSDF file '%s'", fname); |
460 |
– |
error(USER, errmsg); |
461 |
– |
} |
462 |
– |
SDclearBSDF(&myBSDF, fname); /* load XML and check type */ |
463 |
– |
ec = SDloadFile(&myBSDF, fpath); |
464 |
– |
if (ec) |
465 |
– |
error(USER, transSDError(ec)); |
466 |
– |
ccy2rgb(&myBSDF.tLamb.spec, myBSDF.tLamb.cieY/PI, bsdfLamb); |
467 |
– |
recip = (myBSDF.tb == NULL); |
468 |
– |
tdf = recip ? myBSDF.tf : myBSDF.tb; |
469 |
– |
if (tdf == NULL) { /* no non-Lambertian transmission? */ |
470 |
– |
if (cLamb != NULL) |
471 |
– |
copycolor(cLamb, bsdfLamb); |
472 |
– |
SDfreeBSDF(&myBSDF); |
473 |
– |
return(NULL); |
474 |
– |
} |
475 |
– |
if (tdf->ncomp != 1 || tdf->comp[0].func != &SDhandleMtx) { |
476 |
– |
sprintf(errmsg, "unsupported BSDF '%s'", fpath); |
477 |
– |
error(USER, errmsg); |
478 |
– |
} |
479 |
– |
/* convert BTDF to matrix */ |
480 |
– |
ccy2rgb(&tdf->comp[0].cspec[0], 1., specCol); |
481 |
– |
Tmat = recip ? cm_bsdf_recip(bsdfLamb, specCol, (SDMat *)tdf->comp[0].dist) |
482 |
– |
: cm_bsdf(bsdfLamb, specCol, (SDMat *)tdf->comp[0].dist); |
483 |
– |
if (cLamb != NULL) /* Lambertian is included */ |
484 |
– |
setcolor(cLamb, .0, .0, .0); |
485 |
– |
/* free BSDF and return */ |
486 |
– |
SDfreeBSDF(&myBSDF); |
487 |
– |
return(Tmat); |
488 |
– |
} |
489 |
– |
|
18 |
|
/* Sum together a set of images and write result to fout */ |
19 |
|
static int |
20 |
|
sum_images(const char *fspec, const CMATRIX *cv, FILE *fout) |
164 |
|
|
165 |
|
if (argc-a > 2) { /* VTDs expression */ |
166 |
|
CMATRIX *smtx, *Dmat, *Tmat, *imtx; |
639 |
– |
COLOR tLamb; |
167 |
|
/* get sky vector/matrix */ |
168 |
|
smtx = cm_load(argv[a+3], 0, nsteps, skyfmt); |
169 |
|
/* load BSDF */ |
170 |
< |
Tmat = cm_loadBSDF(argv[a+1], tLamb); |
170 |
> |
Tmat = cm_loadBTDF(argv[a+1]); |
171 |
|
/* load Daylight matrix */ |
172 |
|
Dmat = cm_load(argv[a+2], Tmat==NULL ? 0 : Tmat->ncols, |
173 |
|
smtx->nrows, DTfromHeader); |
174 |
|
/* multiply vector through */ |
175 |
|
imtx = cm_multiply(Dmat, smtx); |
176 |
|
cm_free(Dmat); cm_free(smtx); |
177 |
< |
if (Tmat == NULL) { /* diffuse only */ |
178 |
< |
cmtx = cm_scale(imtx, tLamb); |
652 |
< |
} else { /* else apply BTDF matrix */ |
653 |
< |
cmtx = cm_multiply(Tmat, imtx); |
654 |
< |
cm_free(Tmat); |
655 |
< |
} |
177 |
> |
cmtx = cm_multiply(Tmat, imtx); |
178 |
> |
cm_free(Tmat); |
179 |
|
cm_free(imtx); |
180 |
|
} else { /* sky vector/matrix only */ |
181 |
|
cmtx = cm_load(argv[a+1], 0, nsteps, skyfmt); |