160 |
|
int maxrow = (nrows > 0 ? nrows : 32000); |
161 |
|
int r, c; |
162 |
|
for (r = 0; r < maxrow; r++) { |
163 |
< |
if (r >= cm->nrows) /* need more space? */ |
163 |
> |
if (r >= cm->nrows) /* need more space? */ |
164 |
|
cm = cm_resize(cm, 2*cm->nrows); |
165 |
|
for (c = 0; c < ncols; c++) { |
166 |
|
COLORV *cv = cm_lval(cm,r,c); |
167 |
|
if (fscanf(fp, COLSPEC, cv, cv+1, cv+2) != 3) |
168 |
< |
if ((nrows <= 0) & (r > 0) & (c == 0)) { |
168 |
> |
if ((nrows <= 0) & (r > 0) & !c) { |
169 |
|
cm = cm_resize(cm, maxrow=r); |
170 |
|
break; |
171 |
|
} else |
193 |
|
if (nread == cm->nrows*cm->ncols) |
194 |
|
/* need more space? */ |
195 |
|
cm = cm_resize(cm, 2*cm->nrows); |
196 |
< |
else if (nread % cm->ncols == 0) |
196 |
> |
else if (nread && !(nread % cm->ncols)) |
197 |
|
/* seem to be done */ |
198 |
|
cm = cm_resize(cm, nread/cm->ncols); |
199 |
|
else /* ended mid-row */ |
299 |
|
int nneg = 0; |
300 |
|
int r, c; |
301 |
|
|
302 |
< |
for (r = 0; r < cm->nrows; r++) |
303 |
< |
for (c = 0; c < cm->ncols; c++, mp += 3) { |
302 |
> |
for (c = 0; c < cm->ncols; c++, mp += 3) { |
303 |
> |
float dom = getBSDF_incohm(bsdf,c); |
304 |
> |
FVECT v; |
305 |
> |
|
306 |
> |
if (dom <= .0) { |
307 |
> |
nbadohm++; |
308 |
> |
continue; |
309 |
> |
} |
310 |
> |
if (!getBSDF_incvec(v,bsdf,c) || v[2] > FTINY) |
311 |
> |
error(USER, "illegal incoming BTDF direction"); |
312 |
> |
dom *= -v[2]; |
313 |
> |
|
314 |
> |
for (r = 0; r < cm->nrows; r++) { |
315 |
|
float f = BSDF_value(bsdf,c,r); |
316 |
< |
float dom = getBSDF_incohm(bsdf,c); |
306 |
< |
FVECT v; |
307 |
< |
|
316 |
> |
|
317 |
|
if (f <= .0) { |
318 |
|
nneg += (f < -FTINY); |
319 |
|
continue; |
320 |
|
} |
321 |
< |
if (dom <= .0) { |
313 |
< |
nbadohm++; |
314 |
< |
continue; |
315 |
< |
} |
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]; |
321 |
> |
mp[0] = mp[1] = mp[2] = f * dom; |
322 |
|
} |
323 |
+ |
} |
324 |
|
if (nneg || nbadohm) { |
325 |
|
sprintf(errmsg, |
326 |
|
"BTDF has %d negatives and %d bad incoming solid angles", |