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

Comparing ray/src/rt/dielectric.c (file contents):
Revision 2.15 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.20 by greg, Tue Apr 19 01:15:06 2005 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  dielectric.c - shading function for transparent materials.
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 < */
8 > #include "copyright.h"
9  
10   #include  "ray.h"
66 –
11   #include  "otypes.h"
12 + #include  "rtotypes.h"
13  
14   #ifdef  DISPERSE
15   #include  "source.h"
16 < static  disperse();
17 < static int  lambda();
16 > static int disperse(OBJREC *m,RAY *r,FVECT vt,double tr,COLOR cet,COLOR abt);
17 > static int lambda(OBJREC  *m, FVECT  v2, FVECT  dv, FVECT  lr);
18   #endif
19  
20 + static double mylog(double  x);
21 +
22 +
23   /*
24   *     Explicit calculations for Fresnel's equation are performed,
25   *  but only one square root computation is necessary.
# Line 104 | Line 52 | static int  lambda();
52  
53  
54   static double
55 < mylog(x)                /* special log for extinction coefficients */
56 < double  x;
55 > mylog(          /* special log for extinction coefficients */
56 >        double  x
57 > )
58   {
59          if (x < 1e-40)
60                  return(-100.);
# Line 115 | Line 64 | double  x;
64   }
65  
66  
67 < m_dielectric(m, r)      /* color a ray which hit a dielectric interface */
68 < OBJREC  *m;
69 < register RAY  *r;
67 > extern int
68 > m_dielectric(   /* color a ray which hit a dielectric interface */
69 >        OBJREC  *m,
70 >        register RAY  *r
71 > )
72   {
73          double  cos1, cos2, nratio;
74          COLOR  ctrans;
75          COLOR  talb;
76          int  hastexture;
77 +        double  transdist, transtest=0;
78 +        double  mirdist, mirtest=0;
79 +        int     flatsurface;
80          double  refl, trans;
81          FVECT  dnorm;
82          double  d1, d2;
# Line 134 | Line 88 | register RAY  *r;
88  
89          raytexture(r, m->omod);                 /* get modifiers */
90  
91 <        if (hastexture = DOT(r->pert,r->pert) > FTINY*FTINY)
91 >        if ( (hastexture = DOT(r->pert,r->pert) > FTINY*FTINY) )
92                  cos1 = raynormal(dnorm, r);     /* perturb normal */
93          else {
94                  VCOPY(dnorm, r->ron);
95                  cos1 = r->rod;
96          }
97 +        flatsurface = !hastexture && r->ro != NULL && isflat(r->ro->otype);
98 +
99                                                  /* index of refraction */
100          if (m->otype == MAT_DIELECTRIC)
101                  nratio = m->oargs.farg[3] + m->oargs.farg[4]/MLAMBDA;
# Line 208 | Line 164 | register RAY  *r;
164  
165                  trans *= nratio*nratio;         /* solid angle ratio */
166  
167 <                if (rayorigin(&p, r, REFRACTED, trans) == 0) {
167 >                setcolor(p.rcoef, trans, trans, trans);
168  
169 +                if (rayorigin(&p, REFRACTED, r, p.rcoef) == 0) {
170 +
171                                                  /* compute refracted ray */
172                          d1 = nratio*cos1 - cos2;
173                          for (i = 0; i < 3; i++)
# Line 236 | Line 194 | register RAY  *r;
194                                  copycolor(p.cext, ctrans);
195                                  copycolor(p.albedo, talb);
196                                  rayvalue(&p);
197 <                                scalecolor(p.rcol, trans);
197 >                                multcolor(p.rcol, p.rcoef);
198                                  addcolor(r->rcol, p.rcol);
199 <                                if (nratio >= 1.0-FTINY && nratio <= 1.0+FTINY)
200 <                                        r->rt = r->rot + p.rt;
199 >                                                /* virtual distance */
200 >                                if (flatsurface ||
201 >                                        (1.-FTINY <= nratio &&
202 >                                                nratio <= 1.+FTINY)) {
203 >                                        transtest = 2*bright(p.rcol);
204 >                                        transdist = r->rot + p.rt;
205 >                                }
206                          }
207                  }
208          }
209 <                
209 >        setcolor(p.rcoef, refl, refl, refl);
210 >
211          if (!(r->crtype & SHADOW) &&
212 <                        rayorigin(&p, r, REFLECTED, refl) == 0) {
212 >                        rayorigin(&p, REFLECTED, r, p.rcoef) == 0) {
213  
214                                          /* compute reflected ray */
215                  for (i = 0; i < 3; i++)
# Line 257 | Line 221 | register RAY  *r;
221  
222                  rayvalue(&p);                   /* reflected ray value */
223  
224 <                scalecolor(p.rcol, refl);       /* color contribution */
224 >                multcolor(p.rcol, p.rcoef);     /* color contribution */
225                  addcolor(r->rcol, p.rcol);
226 +                                                /* virtual distance */
227 +                if (flatsurface) {
228 +                        mirtest = 2*bright(p.rcol);
229 +                        mirdist = r->rot + p.rt;
230 +                }
231          }
232 +                                /* check distance to return */
233 +        d1 = bright(r->rcol);
234 +        if (transtest > d1)
235 +                r->rt = transdist;
236 +        else if (mirtest > d1)
237 +                r->rt = mirdist;
238                                  /* rayvalue() computes absorption */
239          return(1);
240   }
# Line 267 | Line 242 | register RAY  *r;
242  
243   #ifdef  DISPERSE
244  
245 < static
246 < disperse(m, r, vt, tr, cet, abt)  /* check light sources for dispersion */
247 < OBJREC  *m;
248 < RAY  *r;
249 < FVECT  vt;
250 < double  tr;
251 < COLOR  cet, abt;
245 > static int
246 > disperse(  /* check light sources for dispersion */
247 >        OBJREC  *m,
248 >        RAY  *r,
249 >        FVECT  vt,
250 >        double  tr,
251 >        COLOR  cet,
252 >        COLOR  abt
253 > )
254   {
255 <        RAY  sray, *entray;
255 >        RAY  sray;
256 >        const RAY  *entray;
257          FVECT  v1, v2, n1, n2;
258          FVECT  dv, v2Xdv;
259          double  v2Xdvv2Xdv;
# Line 404 | Line 382 | COLOR  cet, abt;
382  
383  
384   static int
385 < lambda(m, v2, dv, lr)                   /* compute lambda for material */
386 < register OBJREC  *m;
387 < FVECT  v2, dv, lr;
385 > lambda(                 /* compute lambda for material */
386 >        register OBJREC  *m,
387 >        FVECT  v2,
388 >        FVECT  dv,
389 >        FVECT  lr
390 > )
391   {
392          FVECT  lrXdv, v2Xlr;
393          double  dtmp, denom;

Diff Legend

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