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

Comparing ray/src/rt/glass.c (file contents):
Revision 1.8 by greg, Fri May 10 08:51:00 1991 UTC vs.
Revision 2.10 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   *  glass.c - simpler shading function for thin glass surfaces.
6 + */
7 +
8 + /* ====================================================================
9 + * The Radiance Software License, Version 1.0
10   *
11 < *     11/14/86
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  "otypes.h"
68 +
69   /*
70   *  This definition of glass provides for a quick calculation
71   *  using a single surface where two closely spaced parallel
# Line 24 | Line 78 | static char SCCSid[] = "$SunId$ LBL";
78   *      modifier glass id
79   *      0
80   *      0
81 < *      3 red grn blu
81 > *      3+ red grn blu [refractive_index]
82   *
83   *  The color is used for the transmission at normal incidence.
84 < *  To compute transmission (tn) from transmissivity (Tn) use:
84 > *  To compute transmissivity (tn) from transmittance (Tn) use:
85   *
86   *      tn = (sqrt(.8402528435+.0072522239*Tn*Tn)-.9166530661)/.0036261119/Tn
87   *
88 < *  The transmission of standard 88% transmissivity glass is 0.96.
88 > *  The transmissivity of standard 88% transmittance glass is 0.96.
89 > *  A refractive index other than the default can be used by giving
90 > *  it as the fourth real argument.  The above formula no longer applies.
91 > *
92   *  If we appear to hit the back side of the surface, then we
93   *  turn the normal around.
94   */
# Line 43 | Line 100 | m_glass(m, r)          /* color a ray which hit a thin glass s
100   OBJREC  *m;
101   register RAY  *r;
102   {
46        double  sqrt(), pow();
103          COLOR  mcolor;
104          double  pdot;
105          FVECT  pnorm;
106 <        double  cos2;
106 >        double  rindex, cos2;
107          COLOR  trans, refl;
108 <        double  d, r1;
108 >        int  hastexture;
109 >        double  d, r1e, r1m;
110          double  transtest, transdist;
111 +        double  mirtest, mirdist;
112          RAY  p;
113          register int  i;
114 <
115 <        if (m->oargs.nfargs != 3)
114 >                                                /* check arguments */
115 >        if (m->oargs.nfargs == 3)
116 >                rindex = RINDEX;                /* default value of n */
117 >        else if (m->oargs.nfargs == 4)
118 >                rindex = m->oargs.farg[3];      /* use their value */
119 >        else
120                  objerror(m, USER, "bad arguments");
121  
122          setcolor(mcolor, m->oargs.farg[0], m->oargs.farg[1], m->oargs.farg[2]);
123  
124          if (r->rod < 0.0)                       /* reorient if necessary */
125                  flipsurface(r);
126 <        r->rt = r->rot;                         /* default ray length */
127 <        transtest = 0;
126 >        mirtest = transtest = 0;
127 >        mirdist = transdist = r->rot;
128                                                  /* get modifiers */
129          raytexture(r, m->omod);
130 <        pdot = raynormal(pnorm, r);
130 >        if (hastexture = DOT(r->pert,r->pert) > FTINY*FTINY)
131 >                pdot = raynormal(pnorm, r);
132 >        else {
133 >                VCOPY(pnorm, r->ron);
134 >                pdot = r->rod;
135 >        }
136                                                  /* angular transmission */
137 <        cos2 = sqrt( (1.0-1.0/RINDEX/RINDEX) +
138 <                     pdot*pdot/(RINDEX*RINDEX) );
137 >        cos2 = sqrt( (1.0-1.0/(rindex*rindex)) +
138 >                     pdot*pdot/(rindex*rindex) );
139          setcolor(mcolor, pow(colval(mcolor,RED), 1.0/cos2),
140                           pow(colval(mcolor,GRN), 1.0/cos2),
141                           pow(colval(mcolor,BLU), 1.0/cos2));
142  
143                                                  /* compute reflection */
144 <        r1 = (pdot - RINDEX*cos2) / (pdot + RINDEX*cos2);
145 <        d = (1.0/pdot - RINDEX/cos2) / (1.0/pdot + RINDEX/cos2);
146 <        r1 = (r1*r1 + d*d) / 2.0;
144 >        r1e = (pdot - rindex*cos2) / (pdot + rindex*cos2);
145 >        r1e *= r1e;
146 >        r1m = (1.0/pdot - rindex/cos2) / (1.0/pdot + rindex/cos2);
147 >        r1m *= r1m;
148                                                  /* compute transmittance */
149          for (i = 0; i < 3; i++) {
150                  d = colval(mcolor, i);
151 <                colval(trans,i) = (1.0-r1)*(1.0-r1)*d / (1.0 - r1*r1*d*d);
151 >                colval(trans,i) = .5*(1.0-r1e)*(1.0-r1e)*d/(1.0-r1e*r1e*d*d);
152 >                colval(trans,i) += .5*(1.0-r1m)*(1.0-r1m)*d/(1.0-r1m*r1m*d*d);
153          }
154                                                  /* transmitted ray */
155          if (rayorigin(&p, r, TRANS, bright(trans)) == 0) {
156 <                if (DOT(r->pert,r->pert) > FTINY*FTINY) {
156 >                if (!(r->crtype & SHADOW) && hastexture) {
157                          for (i = 0; i < 3; i++)         /* perturb direction */
158 <                                p.rdir[i] = r->rdir[i] - r->pert[i]/RINDEX;
159 <                        normalize(p.rdir);
158 >                                p.rdir[i] = r->rdir[i] +
159 >                                                2.*(1.-rindex)*r->pert[i];
160 >                        if (normalize(p.rdir) == 0.0) {
161 >                                objerror(m, WARNING, "bad perturbation");
162 >                                VCOPY(p.rdir, r->rdir);
163 >                        }
164                  } else {
165                          VCOPY(p.rdir, r->rdir);
166                          transtest = 2;
# Line 100 | Line 173 | register RAY  *r;
173                  transdist = r->rot + p.rt;
174          }
175  
176 <        if (r->crtype & SHADOW)                 /* skip reflected ray */
177 <                return;
176 >        if (r->crtype & SHADOW) {               /* skip reflected ray */
177 >                r->rt = transdist;
178 >                return(1);
179 >        }
180                                                  /* compute reflectance */
181          for (i = 0; i < 3; i++) {
182                  d = colval(mcolor, i);
183                  d *= d;
184 <                colval(refl,i) = r1 * (1.0 + (1.0-2.0*r1)*d) / (1.0 - r1*r1*d);
184 >                colval(refl,i) = .5*r1e*(1.0+(1.0-2.0*r1e)*d)/(1.0-r1e*r1e*d);
185 >                colval(refl,i) += .5*r1m*(1.0+(1.0-2.0*r1m)*d)/(1.0-r1m*r1m*d);
186          }
187                                                  /* reflected ray */
188          if (rayorigin(&p, r, REFLECTED, bright(refl)) == 0) {
# Line 115 | Line 191 | register RAY  *r;
191                  rayvalue(&p);
192                  multcolor(p.rcol, refl);
193                  addcolor(r->rcol, p.rcol);
194 +                if (!hastexture && r->ro != NULL && isflat(r->ro->otype)) {
195 +                        mirtest = 2.0*bright(p.rcol);
196 +                        mirdist = r->rot + p.rt;
197 +                }
198          }
199 <        if (transtest > bright(r->rcol))
199 >                                        /* check distance */
200 >        d = bright(r->rcol);
201 >        if (transtest > d)
202                  r->rt = transdist;
203 +        else if (mirtest > d)
204 +                r->rt = mirdist;
205 +        return(1);
206   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines