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.14 by greg, Wed Nov 22 09:27:53 1995 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 16 | Line 70 | static char SCCSid[] = "$SunId$ LBL";
70  
71   #include  "func.h"
72  
19 – extern int  backvis;                    /* back faces visible? */
20 –
73   /*
74   *      Arguments to this material include the color and specularity.
75   *  String arguments include the reflection function and files.
# Line 80 | 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 191 | Line 244 | double  omega;                 /* light source size */
244   }
245  
246  
247 < m_brdf(m, r)                    /* color a ray which hit a BRDTfunc 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;
# Line 233 | 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 290 | 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 <                        vtmp[0] = -nd.pnorm[0];
296 <                        vtmp[1] = -nd.pnorm[1];
297 <                        vtmp[2] = -nd.pnorm[2];
298 <                } else
299 <                        VCOPY(vtmp, nd.pnorm);
300 <                ambient(ctmp, r, vtmp);
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 <                        vtmp[0] = -nd.pnorm[0];
361 <                        vtmp[1] = -nd.pnorm[1];
362 <                        vtmp[2] = -nd.pnorm[2];
312 <                } else
313 <                        VCOPY(vtmp, nd.pnorm);
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 328 | Line 377 | register RAY  *r;
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   {
# Line 412 | Line 462 | register RAY  *r;
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