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.22 by greg, Mon Oct 25 22:57:45 2010 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 222 | Line 180 | register RAY  *r;
180                                          p.rdir[i] = nratio*r->rdir[i] +
181                                                          d1*r->ron[i];
182                                  normalize(p.rdir);      /* not exact */
183 <                        }
183 >                        } else
184 >                                checknorm(p.rdir);
185   #ifdef  DISPERSE
186                          if (m->otype != MAT_DIELECTRIC
187                                          || r->rod > 0.0
# Line 236 | Line 195 | register RAY  *r;
195                                  copycolor(p.cext, ctrans);
196                                  copycolor(p.albedo, talb);
197                                  rayvalue(&p);
198 <                                scalecolor(p.rcol, trans);
198 >                                multcolor(p.rcol, p.rcoef);
199                                  addcolor(r->rcol, p.rcol);
200 <                                if (nratio >= 1.0-FTINY && nratio <= 1.0+FTINY)
201 <                                        r->rt = r->rot + p.rt;
200 >                                                /* virtual distance */
201 >                                if (flatsurface ||
202 >                                        (1.-FTINY <= nratio &&
203 >                                                nratio <= 1.+FTINY)) {
204 >                                        transtest = 2*bright(p.rcol);
205 >                                        transdist = r->rot + p.rt;
206 >                                }
207                          }
208                  }
209          }
210 <                
210 >        setcolor(p.rcoef, refl, refl, refl);
211 >
212          if (!(r->crtype & SHADOW) &&
213 <                        rayorigin(&p, r, REFLECTED, refl) == 0) {
213 >                        rayorigin(&p, REFLECTED, r, p.rcoef) == 0) {
214  
215                                          /* compute reflected ray */
216 <                for (i = 0; i < 3; i++)
252 <                        p.rdir[i] = r->rdir[i] + 2.0*cos1*dnorm[i];
216 >                VSUM(p.rdir, r->rdir, dnorm, 2.*cos1);
217                                          /* accidental penetration? */
218                  if (hastexture && DOT(p.rdir,r->ron)*hastexture <= FTINY)
219 <                        for (i = 0; i < 3; i++)         /* ignore texture */
220 <                                p.rdir[i] = r->rdir[i] + 2.0*r->rod*r->ron[i];
257 <
219 >                        VSUM(p.rdir, r->rdir, r->ron, 2.*r->rod);
220 >                checknorm(p.rdir);
221                  rayvalue(&p);                   /* reflected ray value */
222  
223 <                scalecolor(p.rcol, refl);       /* color contribution */
223 >                multcolor(p.rcol, p.rcoef);     /* color contribution */
224                  addcolor(r->rcol, p.rcol);
225 +                                                /* virtual distance */
226 +                if (flatsurface) {
227 +                        mirtest = 2*bright(p.rcol);
228 +                        mirdist = r->rot + p.rt;
229 +                }
230          }
231 +                                /* check distance to return */
232 +        d1 = bright(r->rcol);
233 +        if (transtest > d1)
234 +                r->rt = transdist;
235 +        else if (mirtest > d1)
236 +                r->rt = mirdist;
237                                  /* rayvalue() computes absorption */
238          return(1);
239   }
# Line 267 | Line 241 | register RAY  *r;
241  
242   #ifdef  DISPERSE
243  
244 < static
245 < disperse(m, r, vt, tr, cet, abt)  /* check light sources for dispersion */
246 < OBJREC  *m;
247 < RAY  *r;
248 < FVECT  vt;
249 < double  tr;
250 < COLOR  cet, abt;
244 > static int
245 > disperse(  /* check light sources for dispersion */
246 >        OBJREC  *m,
247 >        RAY  *r,
248 >        FVECT  vt,
249 >        double  tr,
250 >        COLOR  cet,
251 >        COLOR  abt
252 > )
253   {
254 <        RAY  sray, *entray;
254 >        RAY  sray;
255 >        const RAY  *entray;
256          FVECT  v1, v2, n1, n2;
257          FVECT  dv, v2Xdv;
258          double  v2Xdvv2Xdv;
# Line 330 | Line 307 | COLOR  cet, abt;
307          VCOPY(n2, r->ron);
308  
309                                          /* first order dispersion approx. */
310 <        dtmp1 = DOT(n1, v1);
311 <        dtmp2 = DOT(n2, v2);
310 >        dtmp1 = 1./DOT(n1, v1);
311 >        dtmp2 = 1./DOT(n2, v2);
312          for (i = 0; i < 3; i++)
313 <                dv[i] = v1[i] + v2[i] - n1[i]/dtmp1 - n2[i]/dtmp2;
313 >                dv[i] = v1[i] + v2[i] - n1[i]*dtmp1 - n2[i]*dtmp2;
314                  
315          if (DOT(dv, dv) <= FTINY)       /* null effect */
316                  return(0);
# Line 376 | Line 353 | COLOR  cet, abt;
353                  dtmp1 = sqrt(si.dom  / v2Xdvv2Xdv / PI);
354  
355                                                          /* compute first ray */
356 <                for (i = 0; i < 3; i++)
380 <                        vtmp2[i] = sray.rdir[i] + dtmp1*vtmp1[i];
356 >                VSUM(vtmp2, sray.rdir, vtmp1, dtmp1);
357  
358                  l1 = lambda(m, v2, dv, vtmp2);          /* first lambda */
359                  if (l1 < 0)
360                          continue;
361                                                          /* compute second ray */
362 <                for (i = 0; i < 3; i++)
387 <                        vtmp2[i] = sray.rdir[i] - dtmp1*vtmp1[i];
362 >                VSUM(vtmp2, sray.rdir, vtmp1, -dtmp1);
363  
364                  l2 = lambda(m, v2, dv, vtmp2);          /* second lambda */
365                  if (l2 < 0)
# Line 404 | Line 379 | COLOR  cet, abt;
379  
380  
381   static int
382 < lambda(m, v2, dv, lr)                   /* compute lambda for material */
383 < register OBJREC  *m;
384 < FVECT  v2, dv, lr;
382 > lambda(                 /* compute lambda for material */
383 >        register OBJREC  *m,
384 >        FVECT  v2,
385 >        FVECT  dv,
386 >        FVECT  lr
387 > )
388   {
389          FVECT  lrXdv, v2Xlr;
390          double  dtmp, denom;
# Line 414 | Line 392 | FVECT  v2, dv, lr;
392  
393          fcross(lrXdv, lr, dv);
394          for (i = 0; i < 3; i++)
395 <                if (lrXdv[i] > FTINY || lrXdv[i] < -FTINY)
395 >                if ((lrXdv[i] > FTINY) | (lrXdv[i] < -FTINY))
396                          break;
397          if (i >= 3)
398                  return(-1);

Diff Legend

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