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 2.7 by greg, Thu Jan 13 09:45:10 1994 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 transmissivity (tn) from transmittance (Tn) use:
# Line 51 | Line 105 | register RAY  *r;
105          FVECT  pnorm;
106          double  rindex, cos2;
107          COLOR  trans, refl;
108 +        int  hastexture;
109          double  d, r1e, r1m;
110          double  transtest, transdist;
111 +        double  mirtest, mirdist;
112          RAY  p;
113          register int  i;
114                                                  /* check arguments */
# Line 67 | Line 123 | register RAY  *r;
123  
124          if (r->rod < 0.0)                       /* reorient if necessary */
125                  flipsurface(r);
126 <        transtest = 0;
127 <        transdist = r->rot;
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) );
# Line 92 | Line 153 | register RAY  *r;
153          }
154                                                  /* transmitted ray */
155          if (rayorigin(&p, r, TRANS, bright(trans)) == 0) {
156 <                if (!(r->crtype & SHADOW) &&
96 <                                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] +
159                                                  2.*(1.-rindex)*r->pert[i];
# Line 113 | Line 173 | register RAY  *r;
173                  transdist = r->rot + p.rt;
174          }
175  
176 <        if (r->crtype & SHADOW)                 /* skip reflected ray */
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);
# Line 129 | 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