ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/common/bsdf.c
(Generate patch)

Comparing ray/src/common/bsdf.c (file contents):
Revision 2.25 by greg, Sun Apr 24 20:16:52 2011 UTC vs.
Revision 2.31 by greg, Fri Jun 10 01:11:26 2011 UTC

# Line 10 | Line 10 | static const char RCSid[] = "$Id$";
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 "ezxml.h"
19   #include "hilbert.h"
# Line 169 | Line 171 | SDloadFile(SDData *sd, const char *fname)
171                                  /* try loading variable resolution data */
172          lastErr = SDloadTre(sd, wtl);
173                                  /* check our result */
174 <        switch (lastErr) {
173 <        case SDEformat:
174 <        case SDEdata:
175 <        case SDEsupport:        /* possibly we just tried the wrong format */
174 >        if (lastErr == SDEsupport)      /* try matrix BSDF if not tree data */
175                  lastErr = SDloadMtx(sd, wtl);
176 <                break;
178 <        default:                /* variable res. OK else serious error */
179 <                break;
180 <        }
176 >                
177                                  /* done with XML file */
178          ezxml_free(fl);
179          
# Line 496 | Line 492 | SDsizeBSDF(double *projSA, const FVECT v1, const RREAL
492          SDError         ec;
493          int             i;
494                                          /* check arguments */
495 <        if ((projSA == NULL) | (v1 == NULL))
495 >        if ((projSA == NULL) | (v1 == NULL) | (sd == NULL))
496                  return SDEargument;
497                                          /* initialize extrema */
498          switch (qflags) {
# Line 516 | Line 512 | SDsizeBSDF(double *projSA, const FVECT v1, const RREAL
512                  rdf = sd->rf;
513          else
514                  rdf = sd->rb;
515 <        tdf = NULL;                     /* transmitted component? */
516 <        if (v2 != NULL && v1[2] > 0 ^ v2[2] > 0) {
517 <                rdf = NULL;
518 <                tdf = sd->tf;
519 <        }
515 >        tdf = sd->tf;
516 >        if (v2 != NULL)                 /* bidirectional? */
517 >                if (v1[2] > 0 ^ v2[2] > 0)
518 >                        rdf = NULL;
519 >                else
520 >                        tdf = NULL;
521          ec = SDEdata;                   /* run through components */
522          for (i = (rdf==NULL) ? 0 : rdf->ncomp; i--; ) {
523                  ec = (*rdf->comp[i].func->queryProjSA)(projSA, v1, v2,

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)