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

Comparing ray/src/rt/m_brdf.c (file contents):
Revision 2.9 by greg, Thu Nov 18 09:43:04 1993 UTC vs.
Revision 2.15 by greg, Sat Feb 22 02:07:28 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1991 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   *  Shading for materials with arbitrary BRDF's
6   */
7  
8 + /* ====================================================================
9 + * The Radiance Software License, Version 1.0
10 + *
11 + * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 + * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 + *
14 + * Redistribution and use in source and binary forms, with or without
15 + * modification, are permitted provided that the following conditions
16 + * are met:
17 + *
18 + * 1. Redistributions of source code must retain the above copyright
19 + *         notice, this list of conditions and the following disclaimer.
20 + *
21 + * 2. Redistributions in binary form must reproduce the above copyright
22 + *       notice, this list of conditions and the following disclaimer in
23 + *       the documentation and/or other materials provided with the
24 + *       distribution.
25 + *
26 + * 3. The end-user documentation included with the redistribution,
27 + *           if any, must include the following acknowledgment:
28 + *             "This product includes Radiance software
29 + *                 (http://radsite.lbl.gov/)
30 + *                 developed by the Lawrence Berkeley National Laboratory
31 + *               (http://www.lbl.gov/)."
32 + *       Alternately, this acknowledgment may appear in the software itself,
33 + *       if and wherever such third-party acknowledgments normally appear.
34 + *
35 + * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 + *       and "The Regents of the University of California" must
37 + *       not be used to endorse or promote products derived from this
38 + *       software without prior written permission. For written
39 + *       permission, please contact [email protected].
40 + *
41 + * 5. Products derived from this software may not be called "Radiance",
42 + *       nor may "Radiance" appear in their name, without prior written
43 + *       permission of Lawrence Berkeley National Laboratory.
44 + *
45 + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 + * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 + * SUCH DAMAGE.
57 + * ====================================================================
58 + *
59 + * This software consists of voluntary contributions made by many
60 + * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 + * information on Lawrence Berkeley National Laboratory, please see
62 + * <http://www.lbl.gov/>.
63 + */
64 +
65   #include  "ray.h"
66  
67   #include  "data.h"
# Line 78 | Line 132 | typedef struct {
132   }  BRDFDAT;             /* BRDF material data */
133  
134  
135 + static void
136   dirbrdf(cval, np, ldir, omega)          /* compute source contribution */
137   COLOR  cval;                    /* returned coefficient */
138   register BRDFDAT  *np;          /* material data */
# Line 88 | Line 143 | double  omega;                 /* light source size */
143          double  dtmp;
144          COLOR  ctmp;
145          FVECT  ldx;
146 <        double  lddx[3], pt[MAXDIM];
92 <        double  vldx[4];
146 >        static double  vldx[5], pt[MAXDIM];
147          register char   **sa;
148          register int    i;
149 + #define lddx (vldx+1)
150  
151          setcolor(cval, 0.0, 0.0, 0.0);
152          
# Line 132 | Line 187 | double  omega;                 /* light source size */
187          multv3(ldx, ldir, funcxf.xfm);
188          for (i = 0; i < 3; i++)
189                  lddx[i] = ldx[i]/funcxf.sca;
190 +        lddx[3] = omega;
191                                          /* compute BRTDF */
192          if (np->mp->otype == MAT_BRTDF) {
193                  if (sa[6][0] == '0')            /* special case */
194                          colval(ctmp,RED) = 0.0;
195                  else
196 <                        colval(ctmp,RED) = funvalue(sa[6], 3, lddx);
196 >                        colval(ctmp,RED) = funvalue(sa[6], 4, lddx);
197                  if (!strcmp(sa[7],sa[6]))
198                          colval(ctmp,GRN) = colval(ctmp,RED);
199                  else
200 <                        colval(ctmp,GRN) = funvalue(sa[7], 3, lddx);
200 >                        colval(ctmp,GRN) = funvalue(sa[7], 4, lddx);
201                  if (!strcmp(sa[8],sa[6]))
202                          colval(ctmp,BLU) = colval(ctmp,RED);
203                  else if (!strcmp(sa[8],sa[7]))
204                          colval(ctmp,BLU) = colval(ctmp,GRN);
205                  else
206 <                        colval(ctmp,BLU) = funvalue(sa[8], 3, lddx);
206 >                        colval(ctmp,BLU) = funvalue(sa[8], 4, lddx);
207                  dtmp = bright(ctmp);
208          } else if (np->dp == NULL) {
209 <                dtmp = funvalue(sa[0], 3, lddx);
209 >                dtmp = funvalue(sa[0], 4, lddx);
210                  setcolor(ctmp, dtmp, dtmp, dtmp);
211          } else {
212                  for (i = 0; i < np->dp->nd; i++)
213 <                        pt[i] = funvalue(sa[3+i], 3, lddx);
213 >                        pt[i] = funvalue(sa[3+i], 4, lddx);
214                  vldx[0] = datavalue(np->dp, pt);
215 <                vldx[1] = lddx[0]; vldx[2] = lddx[1]; vldx[3] = lddx[2];
160 <                dtmp = funvalue(sa[0], 4, vldx);
215 >                dtmp = funvalue(sa[0], 5, vldx);
216                  setcolor(ctmp, dtmp, dtmp, dtmp);
217          }
218          if (errno) {
# Line 185 | Line 240 | double  omega;                 /* light source size */
240                  scalecolor(ctmp, dtmp);
241                  addcolor(cval, ctmp);
242          }
243 + #undef lddx
244   }
245  
246  
247 < m_brdf(m, r)                    /* color a ray which hit a BRDTF material */
247 > int
248 > m_brdf(m, r)                    /* color a ray that hit a BRDTfunc material */
249   register OBJREC  *m;
250   register RAY  *r;
251   {
252 +        int  hitfront = 1;
253          BRDFDAT  nd;
254          RAY  sr;
255          double  transtest, transdist;
256          int  hasrefl, hastrans;
257          COLOR  ctmp;
258 +        FVECT  vtmp;
259          register MFUNC  *mf;
260          register int  i;
261                                                  /* check arguments */
# Line 229 | Line 288 | register RAY  *r;
288                          nd.pnorm[i] = -nd.pnorm[i];
289                          r->pert[i] = -r->pert[i];
290                  }
291 +                hitfront = 0;
292          }
293          copycolor(nd.mcolor, r->pcol);          /* get pattern color */
294          multcolor(nd.rdiff, nd.mcolor);         /* modify diffuse values */
# Line 268 | Line 328 | register RAY  *r;
328                  transdist = r->rot + sr.rt;
329          }
330          if (r->crtype & SHADOW)                 /* the rest is shadow */
331 <                return;
331 >                return(1);
332                                                  /* compute reflected ray */
333          setbrdfunc(&nd);
334          errno = 0;
# Line 286 | Line 346 | register RAY  *r;
346          }
347                                                  /* compute ambient */
348          if (hasrefl) {
349 <                if (nd.pdot < 0.0)
349 >                if (!hitfront)
350                          flipsurface(r);
351 <                ambient(ctmp, r);
351 >                ambient(ctmp, r, nd.pnorm);
352                  multcolor(ctmp, nd.rdiff);
353                  addcolor(r->rcol, ctmp);        /* add to returned color */
354 <                if (nd.pdot < 0.0)
354 >                if (!hitfront)
355                          flipsurface(r);
356          }
357          if (hastrans) {                         /* from other side */
358 <                if (nd.pdot > 0.0)
358 >                if (hitfront)
359                          flipsurface(r);
360 <                ambient(ctmp, r);
360 >                vtmp[0] = -nd.pnorm[0];
361 >                vtmp[1] = -nd.pnorm[1];
362 >                vtmp[2] = -nd.pnorm[2];
363 >                ambient(ctmp, r, vtmp);
364                  multcolor(ctmp, nd.tdiff);
365                  addcolor(r->rcol, ctmp);
366 <                if (nd.pdot > 0.0)
366 >                if (hitfront)
367                          flipsurface(r);
368          }
369          if (hasrefl | hastrans || m->oargs.sarg[6][0] != '0')
# Line 308 | Line 371 | register RAY  *r;
371                                                  /* check distance */
372          if (transtest > bright(r->rcol))
373                  r->rt = transdist;
374 +
375 +        return(1);
376   }
377  
378  
379  
380 < m_brdf2(m, r)                   /* color a ray which hit a BRDF material */
380 > int
381 > m_brdf2(m, r)                   /* color a ray that hit a BRDF material */
382   register OBJREC  *m;
383   register RAY  *r;
384   {
385          BRDFDAT  nd;
386          COLOR  ctmp;
387 +        FVECT  vtmp;
388          double  dtmp;
389                                                  /* always a shadow */
390          if (r->crtype & SHADOW)
391 <                return;
391 >                return(1);
392                                                  /* check arguments */
393          if (m->oargs.nsargs < (hasdata(m->otype)?4:2) | m->oargs.nfargs <
394                          (m->otype==MAT_TFUNC|m->otype==MAT_TDATA?6:4))
# Line 347 | Line 414 | register RAY  *r;
414                                                  /* compute reflectance */
415          dtmp = 1.0 - nd.trans - nd.rspec;
416          setcolor(nd.rdiff, dtmp, dtmp, dtmp);
417 <                                                /* fix orientation */
418 <        if (r->rod < 0.0)
419 <                flipsurface(r);
417 >                                                /* check for back side */
418 >        if (r->rod < 0.0) {
419 >                if (!backvis && m->otype != MAT_TFUNC
420 >                                && m->otype != MAT_TDATA) {
421 >                        raytrans(r);
422 >                        return(1);
423 >                }
424 >                flipsurface(r);                 /* reorient if backvis */
425 >        }
426                                                  /* get modifiers */
427          raytexture(r, m->omod);
428          nd.pdot = raynormal(nd.pnorm, r);       /* perturb normal */
# Line 366 | Line 439 | register RAY  *r;
439          }
440                                                  /* compute ambient */
441          if (nd.trans < 1.0-FTINY) {
442 <                ambient(ctmp, r);
442 >                ambient(ctmp, r, nd.pnorm);
443                  scalecolor(ctmp, 1.0-nd.trans);
444                  multcolor(ctmp, nd.mcolor);     /* modified by material color */
445                  addcolor(r->rcol, ctmp);        /* add to returned color */
446          }
447          if (nd.trans > FTINY) {         /* from other side */
448                  flipsurface(r);
449 <                ambient(ctmp, r);
449 >                vtmp[0] = -nd.pnorm[0];
450 >                vtmp[1] = -nd.pnorm[1];
451 >                vtmp[2] = -nd.pnorm[2];
452 >                ambient(ctmp, r, vtmp);
453                  scalecolor(ctmp, nd.trans);
454                  multcolor(ctmp, nd.mcolor);
455                  addcolor(r->rcol, ctmp);
# Line 381 | Line 457 | register RAY  *r;
457          }
458                                                  /* add direct component */
459          direct(r, dirbrdf, &nd);
460 +
461 +        return(1);
462   }
463  
464  
465 + int
466   setbrdfunc(np)                  /* set up brdf function and variables */
467   register BRDFDAT  *np;
468   {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines