| 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 |
|
|
| 18 |
< |
/* 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 */ |
| 18 |
> |
/* Sum together a set of images and write result to fout */ |
| 19 |
|
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 |
– |
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) { |
| 118 |
– |
sprintf(errmsg, "cannot open file '%s'", fname); |
| 119 |
– |
error(SYSTEM, errmsg); |
| 120 |
– |
} |
| 121 |
– |
if (dtype != DTascii) |
| 122 |
– |
SET_FILE_BINARY(fp); |
| 123 |
– |
if (dtype == DTfromHeader) |
| 124 |
– |
dtype = getDTfromHeader(fp); |
| 125 |
– |
switch (dtype) { |
| 126 |
– |
case DTascii: |
| 127 |
– |
case DTfloat: |
| 128 |
– |
case DTdouble: |
| 129 |
– |
break; |
| 130 |
– |
default: |
| 131 |
– |
error(USER, "unexpected data type in cm_load()"); |
| 132 |
– |
} |
| 133 |
– |
if (nrows <= 0) { /* don't know length? */ |
| 134 |
– |
int guessrows = 147; /* usually big enough */ |
| 135 |
– |
if ((dtype != DTascii) & (fp != stdin)) { |
| 136 |
– |
long startpos = ftell(fp); |
| 137 |
– |
if (fseek(fp, 0L, SEEK_END) == 0) { |
| 138 |
– |
long endpos = ftell(fp); |
| 139 |
– |
long elemsiz = 3*(dtype==DTfloat ? |
| 140 |
– |
sizeof(float) : sizeof(double)); |
| 141 |
– |
|
| 142 |
– |
if ((endpos - startpos) % (ncols*elemsiz)) { |
| 143 |
– |
sprintf(errmsg, |
| 144 |
– |
"improper length for binary file '%s'", |
| 145 |
– |
fname); |
| 146 |
– |
error(USER, errmsg); |
| 147 |
– |
} |
| 148 |
– |
guessrows = (endpos - startpos)/(ncols*elemsiz); |
| 149 |
– |
if (fseek(fp, startpos, SEEK_SET) < 0) { |
| 150 |
– |
sprintf(errmsg, |
| 151 |
– |
"fseek() error on file '%s'", |
| 152 |
– |
fname); |
| 153 |
– |
error(SYSTEM, errmsg); |
| 154 |
– |
} |
| 155 |
– |
nrows = guessrows; /* we're confident */ |
| 156 |
– |
} |
| 157 |
– |
} |
| 158 |
– |
cm = cm_alloc(guessrows, ncols); |
| 159 |
– |
} else |
| 160 |
– |
cm = cm_alloc(nrows, ncols); |
| 161 |
– |
if (cm == NULL) |
| 162 |
– |
return(NULL); |
| 163 |
– |
if (dtype == DTascii) { /* read text file */ |
| 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? */ |
| 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) { |
| 173 |
– |
cm = cm_resize(cm, maxrow=r); |
| 174 |
– |
break; |
| 175 |
– |
} else |
| 176 |
– |
goto EOFerror; |
| 177 |
– |
} |
| 178 |
– |
} |
| 179 |
– |
while ((c = getc(fp)) != EOF) |
| 180 |
– |
if (!isspace(c)) { |
| 181 |
– |
sprintf(errmsg, |
| 182 |
– |
"unexpected data at end of ascii file %s", |
| 183 |
– |
fname); |
| 184 |
– |
error(WARNING, errmsg); |
| 185 |
– |
break; |
| 186 |
– |
} |
| 187 |
– |
} else { /* read binary file */ |
| 188 |
– |
if (sizeof(COLORV) == (dtype==DTfloat ? sizeof(float) : |
| 189 |
– |
sizeof(double))) { |
| 190 |
– |
int nread = 0; |
| 191 |
– |
do { /* read all we can */ |
| 192 |
– |
nread += fread(cm->cmem + 3*nread, |
| 193 |
– |
3*sizeof(COLORV), |
| 194 |
– |
cm->nrows*cm->ncols - nread, |
| 195 |
– |
fp); |
| 196 |
– |
if (nrows <= 0) { /* unknown length */ |
| 197 |
– |
if (nread == cm->nrows*cm->ncols) |
| 198 |
– |
/* need more space? */ |
| 199 |
– |
cm = cm_resize(cm, 2*cm->nrows); |
| 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 */ |
| 204 |
– |
goto EOFerror; |
| 205 |
– |
} else if (nread < cm->nrows*cm->ncols) |
| 206 |
– |
goto EOFerror; |
| 207 |
– |
} while (nread < cm->nrows*cm->ncols); |
| 208 |
– |
|
| 209 |
– |
} else if (dtype == DTdouble) { |
| 210 |
– |
double dc[3]; /* load from double */ |
| 211 |
– |
COLORV *cvp = cm->cmem; |
| 212 |
– |
int n = nrows*ncols; |
| 213 |
– |
|
| 214 |
– |
if (n <= 0) |
| 215 |
– |
goto not_handled; |
| 216 |
– |
while (n--) { |
| 217 |
– |
if (fread(dc, sizeof(double), 3, fp) != 3) |
| 218 |
– |
goto EOFerror; |
| 219 |
– |
copycolor(cvp, dc); |
| 220 |
– |
cvp += 3; |
| 221 |
– |
} |
| 222 |
– |
} else /* dtype == DTfloat */ { |
| 223 |
– |
float fc[3]; /* load from float */ |
| 224 |
– |
COLORV *cvp = cm->cmem; |
| 225 |
– |
int n = nrows*ncols; |
| 226 |
– |
|
| 227 |
– |
if (n <= 0) |
| 228 |
– |
goto not_handled; |
| 229 |
– |
while (n--) { |
| 230 |
– |
if (fread(fc, sizeof(float), 3, fp) != 3) |
| 231 |
– |
goto EOFerror; |
| 232 |
– |
copycolor(cvp, fc); |
| 233 |
– |
cvp += 3; |
| 234 |
– |
} |
| 235 |
– |
} |
| 236 |
– |
if (getc(fp) != EOF) { |
| 237 |
– |
sprintf(errmsg, |
| 238 |
– |
"unexpected data at end of binary file %s", |
| 239 |
– |
fname); |
| 240 |
– |
error(WARNING, errmsg); |
| 241 |
– |
} |
| 242 |
– |
} |
| 243 |
– |
if (fp != stdin) |
| 244 |
– |
fclose(fp); |
| 245 |
– |
return(cm); |
| 246 |
– |
EOFerror: |
| 247 |
– |
sprintf(errmsg, "unexpected EOF reading %s", |
| 248 |
– |
fname); |
| 249 |
– |
error(USER, errmsg); |
| 250 |
– |
not_handled: |
| 251 |
– |
error(INTERNAL, "unhandled data size or length in cm_load()"); |
| 252 |
– |
return(NULL); /* gratis return */ |
| 253 |
– |
} |
| 254 |
– |
|
| 255 |
– |
/* Multiply two matrices (or a matrix and a vector) and allocate the result*/ |
| 256 |
– |
static CMATRIX * |
| 257 |
– |
cm_multiply(const CMATRIX *cm1, const CMATRIX *cm2) |
| 258 |
– |
{ |
| 259 |
– |
CMATRIX *cmr; |
| 260 |
– |
int dr, dc, i; |
| 261 |
– |
|
| 262 |
– |
if ((cm1->ncols <= 0) | (cm1->ncols != cm2->nrows)) |
| 263 |
– |
error(INTERNAL, "matrix dimension mismatch in cm_multiply()"); |
| 264 |
– |
cmr = cm_alloc(cm1->nrows, cm2->ncols); |
| 265 |
– |
if (cmr == NULL) |
| 266 |
– |
return(NULL); |
| 267 |
– |
for (dr = 0; dr < cmr->nrows; dr++) |
| 268 |
– |
for (dc = 0; dc < cmr->ncols; dc++) { |
| 269 |
– |
COLORV *dp = cm_lval(cmr,dr,dc); |
| 270 |
– |
dp[0] = dp[1] = dp[2] = 0; |
| 271 |
– |
for (i = 0; i < cm1->ncols; i++) { |
| 272 |
– |
const COLORV *cp1 = cm_lval(cm1,dr,i); |
| 273 |
– |
const COLORV *cp2 = cm_lval(cm2,i,dc); |
| 274 |
– |
dp[0] += cp1[0] * cp2[0]; |
| 275 |
– |
dp[1] += cp1[1] * cp2[1]; |
| 276 |
– |
dp[2] += cp1[2] * cp2[2]; |
| 277 |
– |
} |
| 278 |
– |
} |
| 279 |
– |
return(cmr); |
| 280 |
– |
} |
| 281 |
– |
|
| 282 |
– |
/* print out matrix as ASCII text -- no header */ |
| 283 |
– |
static void |
| 284 |
– |
cm_print(const CMATRIX *cm, FILE *fp) |
| 285 |
– |
{ |
| 286 |
– |
int r, c; |
| 287 |
– |
const COLORV *mp = cm->cmem; |
| 288 |
– |
|
| 289 |
– |
for (r = 0; r < cm->nrows; r++) { |
| 290 |
– |
for (c = 0; c < cm->ncols; c++, mp += 3) |
| 291 |
– |
fprintf(fp, "\t%.6e %.6e %.6e", mp[0], mp[1], mp[2]); |
| 292 |
– |
fputc('\n', fp); |
| 293 |
– |
} |
| 294 |
– |
} |
| 295 |
– |
|
| 296 |
– |
/* Convert a BSDF to our matrix representation */ |
| 297 |
– |
static CMATRIX * |
| 298 |
– |
cm_bsdf(const COLOR bsdfLamb, const COLOR specCol, const SDMat *bsdf) |
| 299 |
– |
{ |
| 300 |
– |
CMATRIX *cm = cm_alloc(bsdf->nout, bsdf->ninc); |
| 301 |
– |
int nbadohm = 0; |
| 302 |
– |
int nneg = 0; |
| 303 |
– |
int r, c; |
| 304 |
– |
/* reciprocity is "transparent" */ |
| 305 |
– |
for (c = 0; c < cm->ncols; c++) { |
| 306 |
– |
const double dom = mBSDF_incohm(bsdf,c); |
| 307 |
– |
/* projected solid angle */ |
| 308 |
– |
nbadohm += (dom <= 0); |
| 309 |
– |
|
| 310 |
– |
for (r = 0; r < cm->nrows; r++) { |
| 311 |
– |
float f = mBSDF_value(bsdf,c,r); |
| 312 |
– |
COLORV *mp = cm_lval(cm,r,c); |
| 313 |
– |
/* check BSDF value */ |
| 314 |
– |
if ((f <= 0) | (dom <= 0)) { |
| 315 |
– |
nneg += (f < -FTINY); |
| 316 |
– |
f = .0f; |
| 317 |
– |
} |
| 318 |
– |
copycolor(mp, specCol); |
| 319 |
– |
scalecolor(mp, f); |
| 320 |
– |
addcolor(mp, bsdfLamb); |
| 321 |
– |
scalecolor(mp, dom); |
| 322 |
– |
} |
| 323 |
– |
} |
| 324 |
– |
if (nneg | nbadohm) { |
| 325 |
– |
sprintf(errmsg, |
| 326 |
– |
"BTDF has %d negatives and %d bad incoming solid angles", |
| 327 |
– |
nneg, nbadohm); |
| 328 |
– |
error(WARNING, errmsg); |
| 329 |
– |
} |
| 330 |
– |
return(cm); |
| 331 |
– |
} |
| 332 |
– |
|
| 333 |
– |
/* Load and convert a matrix BSDF from the given XML file */ |
| 334 |
– |
static CMATRIX * |
| 335 |
– |
cm_loadBSDF(char *fname) |
| 336 |
– |
{ |
| 337 |
– |
CMATRIX *Tmat; |
| 338 |
– |
char *fpath; |
| 339 |
– |
SDError ec; |
| 340 |
– |
SDData myBSDF; |
| 341 |
– |
COLOR bsdfLamb, specCol; |
| 342 |
– |
/* find path to BSDF file */ |
| 343 |
– |
fpath = getpath(fname, getrlibpath(), R_OK); |
| 344 |
– |
if (fpath == NULL) { |
| 345 |
– |
sprintf(errmsg, "cannot find BSDF file '%s'", fname); |
| 346 |
– |
error(USER, errmsg); |
| 347 |
– |
} |
| 348 |
– |
SDclearBSDF(&myBSDF, fname); /* load XML and check type */ |
| 349 |
– |
ec = SDloadFile(&myBSDF, fpath); |
| 350 |
– |
if (ec) |
| 351 |
– |
error(USER, transSDError(ec)); |
| 352 |
– |
if (myBSDF.tf == NULL || myBSDF.tf->ncomp != 1 || |
| 353 |
– |
myBSDF.tf->comp[0].func != &SDhandleMtx) { |
| 354 |
– |
sprintf(errmsg, "unsupported BSDF '%s'", fpath); |
| 355 |
– |
error(USER, errmsg); |
| 356 |
– |
} |
| 357 |
– |
/* convert BTDF to matrix */ |
| 358 |
– |
ccy2rgb(&myBSDF.tLamb.spec, myBSDF.tLamb.cieY/PI, bsdfLamb); |
| 359 |
– |
ccy2rgb(&myBSDF.tf->comp[0].cspec[0], 1., specCol); |
| 360 |
– |
Tmat = cm_bsdf(bsdfLamb, specCol, (SDMat *)myBSDF.tf->comp[0].dist); |
| 361 |
– |
/* free BSDF and return */ |
| 362 |
– |
SDfreeBSDF(&myBSDF); |
| 363 |
– |
return(Tmat); |
| 364 |
– |
} |
| 365 |
– |
|
| 366 |
– |
/* Sum together a set of images and write result to stdout */ |
| 367 |
– |
static int |
| 20 |
|
sum_images(const char *fspec, const CMATRIX *cv, FILE *fout) |
| 21 |
|
{ |
| 22 |
|
int myDT = DTfromHeader; |
| 23 |
< |
CMATRIX *pmat; |
| 24 |
< |
COLOR *scanline; |
| 25 |
< |
int myXR, myYR; |
| 23 |
> |
COLOR *scanline = NULL; |
| 24 |
> |
CMATRIX *pmat = NULL; |
| 25 |
> |
int myXR=0, myYR=0; |
| 26 |
|
int i, y; |
| 27 |
|
|
| 28 |
|
if (cv->ncols != 1) |
| 34 |
|
int dt, xr, yr; |
| 35 |
|
COLORV *psp; |
| 36 |
|
/* check for zero */ |
| 37 |
< |
if ((scv[RED] == 0) & (scv[GRN] == 0) & (scv[BLU] == 0)) |
| 37 |
> |
if ((scv[RED] == 0) & (scv[GRN] == 0) & (scv[BLU] == 0) && |
| 38 |
> |
(myDT != DTfromHeader) | (i < cv->nrows-1)) |
| 39 |
|
continue; |
| 40 |
|
/* open next picture */ |
| 41 |
|
sprintf(fname, fspec, i); |
| 97 |
|
static int |
| 98 |
|
hasNumberFormat(const char *s) |
| 99 |
|
{ |
| 100 |
+ |
if (s == NULL) |
| 101 |
+ |
return(0); |
| 102 |
+ |
|
| 103 |
|
while (*s) { |
| 104 |
|
while (*s != '%') |
| 105 |
|
if (!*s++) |
| 121 |
|
int |
| 122 |
|
main(int argc, char *argv[]) |
| 123 |
|
{ |
| 124 |
< |
CMATRIX *cvec; |
| 124 |
> |
int skyfmt = DTascii; |
| 125 |
> |
int nsteps = 1; |
| 126 |
> |
char *ofspec = NULL; |
| 127 |
> |
FILE *ofp = stdout; |
| 128 |
> |
CMATRIX *cmtx; /* component vector/matrix result */ |
| 129 |
> |
char fnbuf[256]; |
| 130 |
> |
int a, i; |
| 131 |
|
|
| 132 |
|
progname = argv[0]; |
| 133 |
+ |
/* get options */ |
| 134 |
+ |
for (a = 1; a < argc && argv[a][0] == '-'; a++) |
| 135 |
+ |
switch (argv[a][1]) { |
| 136 |
+ |
case 'n': |
| 137 |
+ |
nsteps = atoi(argv[++a]); |
| 138 |
+ |
if (nsteps <= 0) |
| 139 |
+ |
goto userr; |
| 140 |
+ |
break; |
| 141 |
+ |
case 'o': |
| 142 |
+ |
ofspec = argv[++a]; |
| 143 |
+ |
break; |
| 144 |
+ |
case 'i': |
| 145 |
+ |
switch (argv[a][2]) { |
| 146 |
+ |
case 'f': |
| 147 |
+ |
skyfmt = DTfloat; |
| 148 |
+ |
break; |
| 149 |
+ |
case 'd': |
| 150 |
+ |
skyfmt = DTdouble; |
| 151 |
+ |
break; |
| 152 |
+ |
case 'a': |
| 153 |
+ |
skyfmt = DTascii; |
| 154 |
+ |
break; |
| 155 |
+ |
default: |
| 156 |
+ |
goto userr; |
| 157 |
+ |
} |
| 158 |
+ |
break; |
| 159 |
+ |
default: |
| 160 |
+ |
goto userr; |
| 161 |
+ |
} |
| 162 |
+ |
if ((argc-a < 1) | (argc-a > 4)) |
| 163 |
+ |
goto userr; |
| 164 |
|
|
| 165 |
< |
if ((argc < 2) | (argc > 5)) { |
| 166 |
< |
fprintf(stderr, "Usage: %s DCspec [tregvec]\n", progname); |
| 167 |
< |
fprintf(stderr, " or: %s Vspec Tbsdf.xml Dmat.dat [tregvec]\n", |
| 168 |
< |
progname); |
| 476 |
< |
return(1); |
| 477 |
< |
} |
| 478 |
< |
|
| 479 |
< |
if (argc > 3) { /* VTDs expression */ |
| 480 |
< |
CMATRIX *svec, *Dmat, *Tmat, *ivec; |
| 481 |
< |
/* get sky vector */ |
| 482 |
< |
svec = cm_load(argv[4], 0, 1, DTascii); |
| 165 |
> |
if (argc-a > 2) { /* VTDs expression */ |
| 166 |
> |
CMATRIX *smtx, *Dmat, *Tmat, *imtx; |
| 167 |
> |
/* get sky vector/matrix */ |
| 168 |
> |
smtx = cm_load(argv[a+3], 0, nsteps, skyfmt); |
| 169 |
|
/* load BSDF */ |
| 170 |
< |
Tmat = cm_loadBSDF(argv[2]); |
| 170 |
> |
Tmat = cm_loadBTDF(argv[a+1]); |
| 171 |
|
/* load Daylight matrix */ |
| 172 |
< |
Dmat = cm_load(argv[3], Tmat->ncols, svec->nrows, DTfromHeader); |
| 172 |
> |
Dmat = cm_load(argv[a+2], Tmat==NULL ? 0 : Tmat->ncols, |
| 173 |
> |
smtx->nrows, DTfromHeader); |
| 174 |
|
/* multiply vector through */ |
| 175 |
< |
ivec = cm_multiply(Dmat, svec); |
| 176 |
< |
cm_free(Dmat); cm_free(svec); |
| 177 |
< |
cvec = cm_multiply(Tmat, ivec); /* cvec = component vector */ |
| 178 |
< |
cm_free(Tmat); cm_free(ivec); |
| 179 |
< |
} else { /* else just use sky vector */ |
| 180 |
< |
cvec = cm_load(argv[2], 0, 1, DTascii); |
| 175 |
> |
imtx = cm_multiply(Dmat, smtx); |
| 176 |
> |
cm_free(Dmat); cm_free(smtx); |
| 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); |
| 182 |
|
} |
| 183 |
< |
|
| 184 |
< |
if (hasNumberFormat(argv[1])) { /* generating image */ |
| 185 |
< |
SET_FILE_BINARY(stdout); |
| 186 |
< |
newheader("RADIANCE", stdout); |
| 187 |
< |
printargs(argc, argv, stdout); |
| 188 |
< |
fputnow(stdout); |
| 189 |
< |
if (!sum_images(argv[1], cvec, stdout)) |
| 183 |
> |
/* prepare output stream */ |
| 184 |
> |
if ((ofspec != NULL) & (nsteps == 1) && hasNumberFormat(ofspec)) { |
| 185 |
> |
sprintf(fnbuf, ofspec, 1); |
| 186 |
> |
ofspec = fnbuf; |
| 187 |
> |
} |
| 188 |
> |
if (ofspec != NULL && !hasNumberFormat(ofspec)) { |
| 189 |
> |
if ((ofp = fopen(ofspec, "w")) == NULL) { |
| 190 |
> |
fprintf(stderr, "%s: cannot open '%s' for output\n", |
| 191 |
> |
progname, ofspec); |
| 192 |
|
return(1); |
| 193 |
< |
} else { /* generating vector */ |
| 194 |
< |
CMATRIX *Vmat = cm_load(argv[1], 0, cvec->nrows, DTfromHeader); |
| 195 |
< |
CMATRIX *rvec = cm_multiply(Vmat, cvec); |
| 193 |
> |
} |
| 194 |
> |
ofspec = NULL; /* only need to open once */ |
| 195 |
> |
} |
| 196 |
> |
if (hasNumberFormat(argv[a])) { /* generating image(s) */ |
| 197 |
> |
if (ofspec == NULL) { |
| 198 |
> |
SET_FILE_BINARY(ofp); |
| 199 |
> |
newheader("RADIANCE", ofp); |
| 200 |
> |
printargs(argc, argv, ofp); |
| 201 |
> |
fputnow(ofp); |
| 202 |
> |
} |
| 203 |
> |
if (nsteps > 1) /* multiple output frames? */ |
| 204 |
> |
for (i = 0; i < nsteps; i++) { |
| 205 |
> |
CMATRIX *cvec = cm_column(cmtx, i); |
| 206 |
> |
if (ofspec != NULL) { |
| 207 |
> |
sprintf(fnbuf, ofspec, i+1); |
| 208 |
> |
if ((ofp = fopen(fnbuf, "wb")) == NULL) { |
| 209 |
> |
fprintf(stderr, |
| 210 |
> |
"%s: cannot open '%s' for output\n", |
| 211 |
> |
progname, fnbuf); |
| 212 |
> |
return(1); |
| 213 |
> |
} |
| 214 |
> |
newheader("RADIANCE", ofp); |
| 215 |
> |
printargs(argc, argv, ofp); |
| 216 |
> |
fputnow(ofp); |
| 217 |
> |
} |
| 218 |
> |
fprintf(ofp, "FRAME=%d\n", i+1); |
| 219 |
> |
if (!sum_images(argv[a], cvec, ofp)) |
| 220 |
> |
return(1); |
| 221 |
> |
if (ofspec != NULL) { |
| 222 |
> |
if (fclose(ofp) == EOF) { |
| 223 |
> |
fprintf(stderr, |
| 224 |
> |
"%s: error writing to '%s'\n", |
| 225 |
> |
progname, fnbuf); |
| 226 |
> |
return(1); |
| 227 |
> |
} |
| 228 |
> |
ofp = stdout; |
| 229 |
> |
} |
| 230 |
> |
cm_free(cvec); |
| 231 |
> |
} |
| 232 |
> |
else if (!sum_images(argv[a], cmtx, ofp)) |
| 233 |
> |
return(1); |
| 234 |
> |
} else { /* generating vector/matrix */ |
| 235 |
> |
CMATRIX *Vmat = cm_load(argv[a], 0, cmtx->nrows, DTfromHeader); |
| 236 |
> |
CMATRIX *rmtx = cm_multiply(Vmat, cmtx); |
| 237 |
|
cm_free(Vmat); |
| 238 |
< |
cm_print(rvec, stdout); |
| 239 |
< |
cm_free(rvec); |
| 238 |
> |
if (ofspec != NULL) /* multiple vector files? */ |
| 239 |
> |
for (i = 0; i < nsteps; i++) { |
| 240 |
> |
CMATRIX *rvec = cm_column(rmtx, i); |
| 241 |
> |
sprintf(fnbuf, ofspec, i+1); |
| 242 |
> |
if ((ofp = fopen(fnbuf, "w")) == NULL) { |
| 243 |
> |
fprintf(stderr, |
| 244 |
> |
"%s: cannot open '%s' for output\n", |
| 245 |
> |
progname, fnbuf); |
| 246 |
> |
return(1); |
| 247 |
> |
} |
| 248 |
> |
cm_print(rvec, ofp); |
| 249 |
> |
if (fclose(ofp) == EOF) { |
| 250 |
> |
fprintf(stderr, |
| 251 |
> |
"%s: error writing to '%s'\n", |
| 252 |
> |
progname, fnbuf); |
| 253 |
> |
return(1); |
| 254 |
> |
} |
| 255 |
> |
ofp = stdout; |
| 256 |
> |
cm_free(rvec); |
| 257 |
> |
} |
| 258 |
> |
else |
| 259 |
> |
cm_print(rmtx, ofp); |
| 260 |
> |
cm_free(rmtx); |
| 261 |
|
} |
| 262 |
< |
cm_free(cvec); /* final clean-up */ |
| 262 |
> |
if (fflush(ofp) == EOF) { /* final clean-up */ |
| 263 |
> |
fprintf(stderr, "%s: write error on output\n", progname); |
| 264 |
> |
return(1); |
| 265 |
> |
} |
| 266 |
> |
cm_free(cmtx); |
| 267 |
|
return(0); |
| 268 |
+ |
userr: |
| 269 |
+ |
fprintf(stderr, "Usage: %s [-n nsteps][-o ospec][-i{f|d}] DCspec [skyf]\n", |
| 270 |
+ |
progname); |
| 271 |
+ |
fprintf(stderr, " or: %s [-n nsteps][-o ospec][-i{f|d}] Vspec Tbsdf.xml Dmat.dat [skyf]\n", |
| 272 |
+ |
progname); |
| 273 |
+ |
return(1); |
| 274 |
|
} |
