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

Comparing ray/src/rt/normal.c (file contents):
Revision 2.38 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.46 by greg, Thu Aug 28 03:22:16 2003 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   *  normal.c - shading function for normal materials.
# Line 11 | Line 11 | static const char      RCSid[] = "$Id$";
11   *     Later changes described in delta comments.
12   */
13  
14 < /* ====================================================================
15 < * The Radiance Software License, Version 1.0
16 < *
17 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
18 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
19 < *
20 < * Redistribution and use in source and binary forms, with or without
21 < * modification, are permitted provided that the following conditions
22 < * are met:
23 < *
24 < * 1. Redistributions of source code must retain the above copyright
25 < *         notice, this list of conditions and the following disclaimer.
26 < *
27 < * 2. Redistributions in binary form must reproduce the above copyright
28 < *       notice, this list of conditions and the following disclaimer in
29 < *       the documentation and/or other materials provided with the
30 < *       distribution.
31 < *
32 < * 3. The end-user documentation included with the redistribution,
33 < *           if any, must include the following acknowledgment:
34 < *             "This product includes Radiance software
35 < *                 (http://radsite.lbl.gov/)
36 < *                 developed by the Lawrence Berkeley National Laboratory
37 < *               (http://www.lbl.gov/)."
38 < *       Alternately, this acknowledgment may appear in the software itself,
39 < *       if and wherever such third-party acknowledgments normally appear.
40 < *
41 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
42 < *       and "The Regents of the University of California" must
43 < *       not be used to endorse or promote products derived from this
44 < *       software without prior written permission. For written
45 < *       permission, please contact [email protected].
46 < *
47 < * 5. Products derived from this software may not be called "Radiance",
48 < *       nor may "Radiance" appear in their name, without prior written
49 < *       permission of Lawrence Berkeley National Laboratory.
50 < *
51 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
52 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
53 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
54 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
55 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
56 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
57 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
58 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
59 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
60 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
61 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
62 < * SUCH DAMAGE.
63 < * ====================================================================
64 < *
65 < * This software consists of voluntary contributions made by many
66 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
67 < * information on Lawrence Berkeley National Laboratory, please see
68 < * <http://www.lbl.gov/>.
69 < */
14 > #include "copyright.h"
15  
16   #include  "ray.h"
17  
18 + #include  "ambient.h"
19 +
20   #include  "otypes.h"
21  
22   #include  "random.h"
# Line 78 | Line 25 | static const char      RCSid[] = "$Id$";
25   #define  MAXITER        10              /* maximum # specular ray attempts */
26   #endif
27                                          /* estimate of Fresnel function */
28 < #define  FRESNE(ci)     (exp(-6.0*(ci)) - 0.00247875217)
28 > #define  FRESNE(ci)     (exp(-5.85*(ci)) - 0.00287989916)
29  
30   static void  gaussamp();
31  
# Line 142 | Line 89 | double  omega;                 /* light source size */
89  
90                                  /* Fresnel estimate */
91          ldiff = np->rdiff;
92 <        if (np->specfl & SP_PURE && (np->rspec > FTINY & ldiff > FTINY))
92 >        if (np->specfl & SP_PURE && (np->rspec > FTINY) & (ldiff > FTINY))
93                  ldiff *= 1. - FRESNE(fabs(ldot));
94  
95          if (ldot > FTINY && ldiff > FTINY) {
# Line 237 | Line 184 | register RAY  *r;
184                          raytrans(r);
185                          return(1);
186                  }
187 +                raytexture(r, m->omod);
188                  flipsurface(r);                 /* reorient if backvis */
189 <        }
189 >        } else
190 >                raytexture(r, m->omod);
191          nd.mp = m;
192          nd.rp = r;
193                                                  /* get material color */
# Line 250 | Line 199 | register RAY  *r;
199          nd.alpha2 = m->oargs.farg[4];
200          if ((nd.alpha2 *= nd.alpha2) <= FTINY)
201                  nd.specfl |= SP_PURE;
202 <        if (r->ro != NULL && isflat(r->ro->otype))
203 <                nd.specfl |= SP_FLAT;
255 <                                                /* get modifiers */
256 <        raytexture(r, m->omod);
257 <        if (hastexture = DOT(r->pert,r->pert) > FTINY*FTINY)
202 >
203 >        if ( (hastexture = (DOT(r->pert,r->pert) > FTINY*FTINY)) ) {
204                  nd.pdot = raynormal(nd.pnorm, r);       /* perturb normal */
205 <        else {
205 >        } else {
206                  VCOPY(nd.pnorm, r->ron);
207                  nd.pdot = r->rod;
208          }
209 +        if (r->ro != NULL && isflat(r->ro->otype))
210 +                nd.specfl |= SP_FLAT;
211          if (nd.pdot < .001)
212                  nd.pdot = .001;                 /* non-zero for dirnorm() */
213          multcolor(nd.mcolor, r->pcol);          /* modify material color */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines