ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/m_bsdf.c
(Generate patch)

Comparing ray/src/rt/m_bsdf.c (file contents):
Revision 2.16 by greg, Wed Aug 24 04:31:13 2011 UTC vs.
Revision 2.19 by greg, Tue Apr 24 15:36:40 2012 UTC

# Line 157 | Line 157 | direct_bsdf_OK(COLOR cval, FVECT ldir, double omega, B
157          return(ok);
158   baderror:
159          objerror(ndp->mp, USER, transSDError(ec));
160 +        return(0);                      /* gratis return */
161   }
162  
163   /* Compute source contribution for BSDF (reflected & transmitted) */
# Line 511 | Line 512 | m_bsdf(OBJREC *m, RAY *r)
512                  nd.vray[1] = -r->rdir[1];
513                  nd.vray[2] = -r->rdir[2];
514                  ec = SDmapDir(nd.vray, nd.toloc, nd.vray);
515 +        }
516 +        if (ec) {
517 +                objerror(m, WARNING, "Illegal orientation vector");
518 +                return(1);
519          }
520 <        if (!ec)
516 <                ec = SDinvXform(nd.fromloc, nd.toloc);
520 >        ec = SDinvXform(nd.fromloc, nd.toloc);
521                                                  /* determine BSDF resolution */
522          if (!ec)
523                  ec = SDsizeBSDF(nd.sr_vpsa, nd.vray, NULL,
# Line 556 | Line 560 | m_bsdf(OBJREC *m, RAY *r)
560                  bnorm[2] = -nd.pnorm[2];
561                  if (nd.thick != 0) {            /* proxy with offset? */
562                          VCOPY(vtmp, r->rop);
563 <                        VSUM(r->rop, vtmp, r->ron, -nd.thick);
563 >                        VSUM(r->rop, vtmp, r->ron, nd.thick);
564                          multambient(ctmp, r, bnorm);
565                          VCOPY(r->rop, vtmp);
566                  } else

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines