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.48 by greg, Mon Mar 24 04:00:45 2014 UTC vs.
Revision 2.52 by greg, Sun Aug 23 00:56:00 2015 UTC

# Line 199 | Line 199 | SDloadFile(SDData *sd, const char *fname)
199          }
200          wtl = ezxml_child(ezxml_child(fl, "Optical"), "Layer");
201          if (wtl == NULL) {
202 <                sprintf(SDerrorDetail, "BSDF \"%s\": no optical layers'",
202 >                sprintf(SDerrorDetail, "BSDF \"%s\": no optical layers",
203                                  sd->name);
204                  ezxml_free(fl);
205                  return SDEformat;
# Line 422 | Line 422 | SDcacheFile(const char *fname)
422          if (fname == NULL || !*fname)
423                  return NULL;
424          SDerrorDetail[0] = '\0';
425 +        /* PLACE MUTEX LOCK HERE FOR THREAD-SAFE */
426          if ((sd = SDgetCache(fname)) == NULL) {
427                  SDreportError(SDEmemory, stderr);
428                  return NULL;
# Line 429 | Line 430 | SDcacheFile(const char *fname)
430          if (!SDisLoaded(sd) && (ec = SDloadFile(sd, fname))) {
431                  SDreportError(ec, stderr);
432                  SDfreeCache(sd);
433 <                return NULL;
433 >                sd = NULL;
434          }
435 +        /* END MUTEX LOCK */
436          return sd;
437   }
438  
# Line 595 | Line 597 | SDsizeBSDF(double *projSA, const FVECT v1, const RREAL
597                  rdf = sd->rb;
598                  tdf = (sd->tb != NULL) ? sd->tb : sd->tf;
599          }
600 <        if (v2 != NULL)                 /* bidirectional? */
600 >        if (v2 != NULL) {               /* bidirectional? */
601                  if (v1[2] > 0 ^ v2[2] > 0)
602                          rdf = NULL;
603                  else
604                          tdf = NULL;
605 +        }
606          ec = SDEdata;                   /* run through components */
607          for (i = (rdf==NULL) ? 0 : rdf->ncomp; i--; ) {
608                  ec = (*rdf->comp[i].func->queryProjSA)(projSA, v1, v2,
# Line 763 | Line 766 | SDsampBSDF(SDValue *sv, FVECT ioVec, double randX, int
766                  cdarr[i] = (*rdf->comp[i].func->getCDist)(inVec, &rdf->comp[i]);
767                  if (cdarr[i] == NULL)
768                          cdarr[i] = &SDemptyCD;
769 <                else
767 <                        sv->cieY += cdarr[i]->cTotal;
769 >                sv->cieY += cdarr[i]->cTotal;
770          }
771          if (sv->cieY <= 1e-6) {         /* anything to sample? */
772                  sv->cieY = .0;

Diff Legend

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