| 169 |
|
/* try loading variable resolution data */ |
| 170 |
|
lastErr = SDloadTre(sd, wtl); |
| 171 |
|
/* check our result */ |
| 172 |
< |
switch (lastErr) { |
| 173 |
< |
case SDEformat: |
| 174 |
< |
case SDEdata: |
| 175 |
< |
case SDEsupport: /* possibly we just tried the wrong format */ |
| 172 |
> |
if (lastErr == SDEsupport) /* try matrix BSDF if not tree data */ |
| 173 |
|
lastErr = SDloadMtx(sd, wtl); |
| 174 |
< |
break; |
| 178 |
< |
default: /* variable res. OK else serious error */ |
| 179 |
< |
break; |
| 180 |
< |
} |
| 174 |
> |
|
| 175 |
|
/* done with XML file */ |
| 176 |
|
ezxml_free(fl); |
| 177 |
|
|
| 490 |
|
SDError ec; |
| 491 |
|
int i; |
| 492 |
|
/* check arguments */ |
| 493 |
< |
if ((projSA == NULL) | (v1 == NULL)) |
| 493 |
> |
if ((projSA == NULL) | (v1 == NULL) | (sd == NULL)) |
| 494 |
|
return SDEargument; |
| 495 |
|
/* initialize extrema */ |
| 496 |
|
switch (qflags) { |
| 510 |
|
rdf = sd->rf; |
| 511 |
|
else |
| 512 |
|
rdf = sd->rb; |
| 513 |
< |
tdf = NULL; /* transmitted component? */ |
| 514 |
< |
if (v2 != NULL && v1[2] > 0 ^ v2[2] > 0) { |
| 515 |
< |
rdf = NULL; |
| 516 |
< |
tdf = sd->tf; |
| 517 |
< |
} |
| 513 |
> |
tdf = sd->tf; |
| 514 |
> |
if (v2 != NULL) /* bidirectional? */ |
| 515 |
> |
if (v1[2] > 0 ^ v2[2] > 0) |
| 516 |
> |
rdf = NULL; |
| 517 |
> |
else |
| 518 |
> |
tdf = NULL; |
| 519 |
|
ec = SDEdata; /* run through components */ |
| 520 |
|
for (i = (rdf==NULL) ? 0 : rdf->ncomp; i--; ) { |
| 521 |
|
ec = (*rdf->comp[i].func->queryProjSA)(projSA, v1, v2, |
