10 |
|
* |
11 |
|
*/ |
12 |
|
|
13 |
+ |
#define _USE_MATH_DEFINES |
14 |
|
#include <stdio.h> |
15 |
|
#include <stdlib.h> |
16 |
+ |
#include <string.h> |
17 |
|
#include <math.h> |
18 |
+ |
#include <ctype.h> |
19 |
|
#include "ezxml.h" |
20 |
|
#include "hilbert.h" |
21 |
|
#include "bsdf.h" |
109 |
|
if ((geom = ezxml_child(wdb, "Geometry")) == NULL || |
110 |
|
(mgfstr = ezxml_txt(geom)) == NULL) |
111 |
|
return SDEnone; |
112 |
+ |
while (isspace(*mgfstr)) |
113 |
+ |
++mgfstr; |
114 |
+ |
if (!*mgfstr) |
115 |
+ |
return SDEnone; |
116 |
|
if ((fmt = ezxml_attr(geom, "format")) != NULL && |
117 |
|
strcasecmp(fmt, "MGF")) { |
118 |
|
sprintf(SDerrorDetail, |
176 |
|
/* try loading variable resolution data */ |
177 |
|
lastErr = SDloadTre(sd, wtl); |
178 |
|
/* check our result */ |
179 |
< |
switch (lastErr) { |
173 |
< |
case SDEformat: |
174 |
< |
case SDEdata: |
175 |
< |
case SDEsupport: /* possibly we just tried the wrong format */ |
179 |
> |
if (lastErr == SDEsupport) /* try matrix BSDF if not tree data */ |
180 |
|
lastErr = SDloadMtx(sd, wtl); |
181 |
< |
break; |
178 |
< |
default: /* variable res. OK else serious error */ |
179 |
< |
break; |
180 |
< |
} |
181 |
> |
|
182 |
|
/* done with XML file */ |
183 |
|
ezxml_free(fl); |
184 |
|
|
434 |
|
if (ec) |
435 |
|
return ec; |
436 |
|
/* get BSDF color */ |
437 |
< |
n = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc->dist); |
437 |
> |
n = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc); |
438 |
|
if (n <= 0) { |
439 |
|
strcpy(SDerrorDetail, "BSDF sample value error"); |
440 |
|
return SDEinternal; |
497 |
|
SDError ec; |
498 |
|
int i; |
499 |
|
/* check arguments */ |
500 |
< |
if ((projSA == NULL) | (v1 == NULL)) |
500 |
> |
if ((projSA == NULL) | (v1 == NULL) | (sd == NULL)) |
501 |
|
return SDEargument; |
502 |
|
/* initialize extrema */ |
503 |
|
switch (qflags) { |
517 |
|
rdf = sd->rf; |
518 |
|
else |
519 |
|
rdf = sd->rb; |
520 |
< |
tdf = NULL; /* transmitted component? */ |
521 |
< |
if (v2 != NULL && v1[2] > 0 ^ v2[2] > 0) { |
522 |
< |
rdf = NULL; |
523 |
< |
tdf = sd->tf; |
524 |
< |
} |
520 |
> |
tdf = sd->tf; |
521 |
> |
if (v2 != NULL) /* bidirectional? */ |
522 |
> |
if (v1[2] > 0 ^ v2[2] > 0) |
523 |
> |
rdf = NULL; |
524 |
> |
else |
525 |
> |
tdf = NULL; |
526 |
|
ec = SDEdata; /* run through components */ |
527 |
|
for (i = (rdf==NULL) ? 0 : rdf->ncomp; i--; ) { |
528 |
|
ec = (*rdf->comp[i].func->queryProjSA)(projSA, v1, v2, |
529 |
< |
qflags, rdf->comp[i].dist); |
529 |
> |
qflags, &rdf->comp[i]); |
530 |
|
if (ec) |
531 |
|
return ec; |
532 |
|
} |
533 |
|
for (i = (tdf==NULL) ? 0 : tdf->ncomp; i--; ) { |
534 |
|
ec = (*tdf->comp[i].func->queryProjSA)(projSA, v1, v2, |
535 |
< |
qflags, tdf->comp[i].dist); |
535 |
> |
qflags, &tdf->comp[i]); |
536 |
|
if (ec) |
537 |
|
return ec; |
538 |
|
} |
574 |
|
i = (sdf != NULL) ? sdf->ncomp : 0; |
575 |
|
while (i-- > 0) { |
576 |
|
nch = (*sdf->comp[i].func->getBSDFs)(coef, outVec, inVec, |
577 |
< |
sdf->comp[i].dist); |
577 |
> |
&sdf->comp[i]); |
578 |
|
while (nch-- > 0) { |
579 |
|
c_cmix(&sv->spec, sv->cieY, &sv->spec, |
580 |
|
coef[nch], &sdf->comp[i].cspec[nch]); |
717 |
|
if (ec) |
718 |
|
return ec; |
719 |
|
/* compute color */ |
720 |
< |
j = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc->dist); |
720 |
> |
j = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc); |
721 |
|
if (j <= 0) { |
722 |
|
sprintf(SDerrorDetail, "BSDF \"%s\" sampling value error", |
723 |
|
sd->name); |
814 |
|
|
815 |
|
#include "standard.h" |
816 |
|
#include "paths.h" |
815 |
– |
#include <ctype.h> |
817 |
|
|
818 |
|
#define MAXLATS 46 /* maximum number of latitudes */ |
819 |
|
|
933 |
|
{ |
934 |
|
ANGLE_BASIS *ab = (ANGLE_BASIS *)p; |
935 |
|
int li, ndx; |
936 |
< |
double pol, azi, d; |
936 |
> |
double pol, azi; |
937 |
|
|
938 |
|
if ((v[2] < -1.0) | (v[2] > 1.0)) |
939 |
|
return(-1); |
1173 |
|
) |
1174 |
|
{ |
1175 |
|
double *omega_iarr, *omega_oarr; |
1176 |
< |
double dom, contrib, hemi_total, full_total; |
1176 |
> |
double dom, hemi_total, full_total; |
1177 |
|
int nneg; |
1178 |
|
FVECT v; |
1179 |
|
int i, o; |