--- ray/src/rt/m_brdf.c 1994/01/12 16:46:35 2.10 +++ ray/src/rt/m_brdf.c 2003/02/22 02:07:28 2.15 @@ -1,13 +1,67 @@ -/* Copyright (c) 1991 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: m_brdf.c,v 2.15 2003/02/22 02:07:28 greg Exp $"; #endif - /* * Shading for materials with arbitrary BRDF's */ +/* ==================================================================== + * The Radiance Software License, Version 1.0 + * + * Copyright (c) 1990 - 2002 The Regents of the University of California, + * through Lawrence Berkeley National Laboratory. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes Radiance software + * (http://radsite.lbl.gov/) + * developed by the Lawrence Berkeley National Laboratory + * (http://www.lbl.gov/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Radiance," "Lawrence Berkeley National Laboratory" + * and "The Regents of the University of California" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact radiance@radsite.lbl.gov. + * + * 5. Products derived from this software may not be called "Radiance", + * nor may "Radiance" appear in their name, without prior written + * permission of Lawrence Berkeley National Laboratory. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of Lawrence Berkeley National Laboratory. For more + * information on Lawrence Berkeley National Laboratory, please see + * . + */ + #include "ray.h" #include "data.h" @@ -78,6 +132,7 @@ typedef struct { } BRDFDAT; /* BRDF material data */ +static void dirbrdf(cval, np, ldir, omega) /* compute source contribution */ COLOR cval; /* returned coefficient */ register BRDFDAT *np; /* material data */ @@ -88,10 +143,10 @@ double omega; /* light source size */ double dtmp; COLOR ctmp; FVECT ldx; - double lddx[3], pt[MAXDIM]; - double vldx[4]; + static double vldx[5], pt[MAXDIM]; register char **sa; register int i; +#define lddx (vldx+1) setcolor(cval, 0.0, 0.0, 0.0); @@ -132,32 +187,32 @@ double omega; /* light source size */ multv3(ldx, ldir, funcxf.xfm); for (i = 0; i < 3; i++) lddx[i] = ldx[i]/funcxf.sca; + lddx[3] = omega; /* compute BRTDF */ if (np->mp->otype == MAT_BRTDF) { if (sa[6][0] == '0') /* special case */ colval(ctmp,RED) = 0.0; else - colval(ctmp,RED) = funvalue(sa[6], 3, lddx); + colval(ctmp,RED) = funvalue(sa[6], 4, lddx); if (!strcmp(sa[7],sa[6])) colval(ctmp,GRN) = colval(ctmp,RED); else - colval(ctmp,GRN) = funvalue(sa[7], 3, lddx); + colval(ctmp,GRN) = funvalue(sa[7], 4, lddx); if (!strcmp(sa[8],sa[6])) colval(ctmp,BLU) = colval(ctmp,RED); else if (!strcmp(sa[8],sa[7])) colval(ctmp,BLU) = colval(ctmp,GRN); else - colval(ctmp,BLU) = funvalue(sa[8], 3, lddx); + colval(ctmp,BLU) = funvalue(sa[8], 4, lddx); dtmp = bright(ctmp); } else if (np->dp == NULL) { - dtmp = funvalue(sa[0], 3, lddx); + dtmp = funvalue(sa[0], 4, lddx); setcolor(ctmp, dtmp, dtmp, dtmp); } else { for (i = 0; i < np->dp->nd; i++) - pt[i] = funvalue(sa[3+i], 3, lddx); + pt[i] = funvalue(sa[3+i], 4, lddx); vldx[0] = datavalue(np->dp, pt); - vldx[1] = lddx[0]; vldx[2] = lddx[1]; vldx[3] = lddx[2]; - dtmp = funvalue(sa[0], 4, vldx); + dtmp = funvalue(sa[0], 5, vldx); setcolor(ctmp, dtmp, dtmp, dtmp); } if (errno) { @@ -185,18 +240,22 @@ double omega; /* light source size */ scalecolor(ctmp, dtmp); addcolor(cval, ctmp); } +#undef lddx } -m_brdf(m, r) /* color a ray which hit a BRDTF material */ +int +m_brdf(m, r) /* color a ray that hit a BRDTfunc material */ register OBJREC *m; register RAY *r; { + int hitfront = 1; BRDFDAT nd; RAY sr; double transtest, transdist; int hasrefl, hastrans; COLOR ctmp; + FVECT vtmp; register MFUNC *mf; register int i; /* check arguments */ @@ -229,6 +288,7 @@ register RAY *r; nd.pnorm[i] = -nd.pnorm[i]; r->pert[i] = -r->pert[i]; } + hitfront = 0; } copycolor(nd.mcolor, r->pcol); /* get pattern color */ multcolor(nd.rdiff, nd.mcolor); /* modify diffuse values */ @@ -286,21 +346,24 @@ register RAY *r; } /* compute ambient */ if (hasrefl) { - if (nd.pdot < 0.0) + if (!hitfront) flipsurface(r); - ambient(ctmp, r); + ambient(ctmp, r, nd.pnorm); multcolor(ctmp, nd.rdiff); addcolor(r->rcol, ctmp); /* add to returned color */ - if (nd.pdot < 0.0) + if (!hitfront) flipsurface(r); } if (hastrans) { /* from other side */ - if (nd.pdot > 0.0) + if (hitfront) flipsurface(r); - ambient(ctmp, r); + vtmp[0] = -nd.pnorm[0]; + vtmp[1] = -nd.pnorm[1]; + vtmp[2] = -nd.pnorm[2]; + ambient(ctmp, r, vtmp); multcolor(ctmp, nd.tdiff); addcolor(r->rcol, ctmp); - if (nd.pdot > 0.0) + if (hitfront) flipsurface(r); } if (hasrefl | hastrans || m->oargs.sarg[6][0] != '0') @@ -314,12 +377,14 @@ register RAY *r; -m_brdf2(m, r) /* color a ray which hit a BRDF material */ +int +m_brdf2(m, r) /* color a ray that hit a BRDF material */ register OBJREC *m; register RAY *r; { BRDFDAT nd; COLOR ctmp; + FVECT vtmp; double dtmp; /* always a shadow */ if (r->crtype & SHADOW) @@ -349,9 +414,15 @@ register RAY *r; /* compute reflectance */ dtmp = 1.0 - nd.trans - nd.rspec; setcolor(nd.rdiff, dtmp, dtmp, dtmp); - /* fix orientation */ - if (r->rod < 0.0) - flipsurface(r); + /* check for back side */ + if (r->rod < 0.0) { + if (!backvis && m->otype != MAT_TFUNC + && m->otype != MAT_TDATA) { + raytrans(r); + return(1); + } + flipsurface(r); /* reorient if backvis */ + } /* get modifiers */ raytexture(r, m->omod); nd.pdot = raynormal(nd.pnorm, r); /* perturb normal */ @@ -368,14 +439,17 @@ register RAY *r; } /* compute ambient */ if (nd.trans < 1.0-FTINY) { - ambient(ctmp, r); + ambient(ctmp, r, nd.pnorm); scalecolor(ctmp, 1.0-nd.trans); multcolor(ctmp, nd.mcolor); /* modified by material color */ addcolor(r->rcol, ctmp); /* add to returned color */ } if (nd.trans > FTINY) { /* from other side */ flipsurface(r); - ambient(ctmp, r); + vtmp[0] = -nd.pnorm[0]; + vtmp[1] = -nd.pnorm[1]; + vtmp[2] = -nd.pnorm[2]; + ambient(ctmp, r, vtmp); scalecolor(ctmp, nd.trans); multcolor(ctmp, nd.mcolor); addcolor(r->rcol, ctmp); @@ -388,6 +462,7 @@ register RAY *r; } +int setbrdfunc(np) /* set up brdf function and variables */ register BRDFDAT *np; {