92 |
|
|
93 |
|
if (wdb == NULL) /* no geometry section? */ |
94 |
|
return SDEnone; |
95 |
+ |
if ((geom = ezxml_child(wdb, "Name")) != NULL) { |
96 |
+ |
strncpy(sd->matn, ezxml_txt(geom), SDnameLn); |
97 |
+ |
if (sd->matn[SDnameLn-1]) |
98 |
+ |
strcpy(sd->matn+(SDnameLn-4), "..."); |
99 |
+ |
} |
100 |
+ |
if ((geom = ezxml_child(wdb, "Manufacturer")) != NULL) { |
101 |
+ |
strncpy(sd->makr, ezxml_txt(geom), SDnameLn); |
102 |
+ |
if (sd->makr[SDnameLn-1]) |
103 |
+ |
strcpy(sd->makr+(SDnameLn-4), "..."); |
104 |
+ |
} |
105 |
|
sd->dim[0] = sd->dim[1] = sd->dim[2] = .0; |
106 |
+ |
SDerrorDetail[0] = '\0'; |
107 |
|
if ((geom = ezxml_child(wdb, "Width")) != NULL) |
108 |
|
sd->dim[0] = atof(ezxml_txt(geom)) * |
109 |
|
to_meters(ezxml_attr(geom, "unit")); |
114 |
|
sd->dim[2] = atof(ezxml_txt(geom)) * |
115 |
|
to_meters(ezxml_attr(geom, "unit")); |
116 |
|
if ((sd->dim[0] < 0) | (sd->dim[1] < 0) | (sd->dim[2] < 0)) { |
117 |
< |
sprintf(SDerrorDetail, "Negative size in \"%s\"", sd->name); |
117 |
> |
if (!SDerrorDetail[0]) |
118 |
> |
sprintf(SDerrorDetail, "Negative dimension in \"%s\"", |
119 |
> |
sd->name); |
120 |
|
return SDEdata; |
121 |
|
} |
122 |
|
if ((geom = ezxml_child(wdb, "Geometry")) == NULL || |
134 |
|
return SDEsupport; |
135 |
|
} |
136 |
|
cfact = to_meters(ezxml_attr(geom, "unit")); |
137 |
+ |
if (cfact <= 0) |
138 |
+ |
return SDEformat; |
139 |
|
sd->mgf = (char *)malloc(strlen(mgfstr)+32); |
140 |
|
if (sd->mgf == NULL) { |
141 |
|
strcpy(SDerrorDetail, "Out of memory in SDloadGeometry"); |
179 |
|
} |
180 |
|
wtl = ezxml_child(ezxml_child(fl, "Optical"), "Layer"); |
181 |
|
if (wtl == NULL) { |
182 |
< |
sprintf(SDerrorDetail, "BSDF \"%s\": no optical layer'", |
182 |
> |
sprintf(SDerrorDetail, "BSDF \"%s\": no optical layers'", |
183 |
|
sd->name); |
184 |
|
ezxml_free(fl); |
185 |
|
return SDEformat; |
186 |
|
} |
187 |
|
/* load geometry if present */ |
188 |
|
lastErr = SDloadGeometry(sd, ezxml_child(wtl, "Material")); |
189 |
< |
if (lastErr) |
189 |
> |
if (lastErr) { |
190 |
> |
ezxml_free(fl); |
191 |
|
return lastErr; |
192 |
+ |
} |
193 |
|
/* try loading variable resolution data */ |
194 |
|
lastErr = SDloadTre(sd, wtl); |
195 |
|
/* check our result */ |
241 |
|
return df; |
242 |
|
} |
243 |
|
|
244 |
+ |
/* Add component(s) to spectral distribution function */ |
245 |
+ |
SDSpectralDF * |
246 |
+ |
SDaddComponent(SDSpectralDF *odf, int nadd) |
247 |
+ |
{ |
248 |
+ |
SDSpectralDF *df; |
249 |
+ |
|
250 |
+ |
if (odf == NULL) |
251 |
+ |
return SDnewSpectralDF(nadd); |
252 |
+ |
if (nadd <= 0) |
253 |
+ |
return odf; |
254 |
+ |
df = (SDSpectralDF *)realloc(odf, sizeof(SDSpectralDF) + |
255 |
+ |
(odf->ncomp+nadd-1)*sizeof(SDComponent)); |
256 |
+ |
if (df == NULL) { |
257 |
+ |
sprintf(SDerrorDetail, |
258 |
+ |
"Cannot add %d component(s) to spectral DF", nadd); |
259 |
+ |
SDfreeSpectralDF(odf); |
260 |
+ |
return NULL; |
261 |
+ |
} |
262 |
+ |
memset(df->comp+df->ncomp, 0, nadd*sizeof(SDComponent)); |
263 |
+ |
df->ncomp += nadd; |
264 |
+ |
return df; |
265 |
+ |
} |
266 |
+ |
|
267 |
|
/* Free cached cumulative distributions for BSDF component */ |
268 |
|
void |
269 |
|
SDfreeCumulativeCache(SDSpectralDF *df) |
500 |
|
unsigned nBits; |
501 |
|
double scale; |
502 |
|
bitmask_t ndx, coord[MS_MAXDIM]; |
503 |
< |
|
503 |
> |
|
504 |
> |
if (n <= 0) /* check corner cases */ |
505 |
> |
return; |
506 |
> |
if (randX < 0) randX = 0; |
507 |
> |
else if (randX >= 1.) randX = 0.999999999999999; |
508 |
> |
if (n == 1) { |
509 |
> |
t[0] = randX; |
510 |
> |
return; |
511 |
> |
} |
512 |
|
while (n > MS_MAXDIM) /* punt for higher dimensions */ |
513 |
|
t[--n] = rand()*(1./(RAND_MAX+.5)); |
514 |
|
nBits = (8*sizeof(bitmask_t) - 1) / n; |
1437 |
|
if (!getBSDF_incvec(v, b, i)) |
1438 |
|
return(0); |
1439 |
|
rad = sqrt(getBSDF_incohm(b, i) / PI); |
1440 |
< |
multisamp(pert, 3, rv); |
1440 |
> |
SDmultiSamp(pert, 3, rv); |
1441 |
|
for (j = 0; j < 3; j++) |
1442 |
|
v[j] += rad*(2.*pert[j] - 1.); |
1443 |
|
if (xm != NULL) |
1462 |
|
if (!getBSDF_outvec(v, b, o)) |
1463 |
|
return(0); |
1464 |
|
rad = sqrt(getBSDF_outohm(b, o) / PI); |
1465 |
< |
multisamp(pert, 3, rv); |
1465 |
> |
SDmultiSamp(pert, 3, rv); |
1466 |
|
for (j = 0; j < 3; j++) |
1467 |
|
v[j] += rad*(2.*pert[j] - 1.); |
1468 |
|
if (xm != NULL) |