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.10 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.16 by greg, Tue Apr 19 01:15:06 2005 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   *  glass.c - simpler shading function for thin glass surfaces.
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   /*
15   *  This definition of glass provides for a quick calculation
# Line 96 | Line 41 | static const char      RCSid[] = "$Id$";
41   #define  RINDEX         1.52            /* refractive index of glass */
42  
43  
44 < m_glass(m, r)           /* color a ray which hit a thin glass surface */
45 < OBJREC  *m;
46 < register RAY  *r;
44 > extern int
45 > m_glass(                /* color a ray which hit a thin glass surface */
46 >        OBJREC  *m,
47 >        register RAY  *r
48 > )
49   {
50          COLOR  mcolor;
51          double  pdot;
# Line 121 | Line 68 | register RAY  *r;
68  
69          setcolor(mcolor, m->oargs.farg[0], m->oargs.farg[1], m->oargs.farg[2]);
70  
71 +                                                /* get modifiers */
72 +        raytexture(r, m->omod);
73          if (r->rod < 0.0)                       /* reorient if necessary */
74                  flipsurface(r);
75          mirtest = transtest = 0;
76          mirdist = transdist = r->rot;
77 <                                                /* get modifiers */
78 <        raytexture(r, m->omod);
130 <        if (hastexture = DOT(r->pert,r->pert) > FTINY*FTINY)
77 >                                                /* perturb normal */
78 >        if ( (hastexture = (DOT(r->pert,r->pert) > FTINY*FTINY)) ) {
79                  pdot = raynormal(pnorm, r);
80 <        else {
80 >        } else {
81                  VCOPY(pnorm, r->ron);
82                  pdot = r->rod;
83          }
# Line 151 | Line 99 | register RAY  *r;
99                  colval(trans,i) = .5*(1.0-r1e)*(1.0-r1e)*d/(1.0-r1e*r1e*d*d);
100                  colval(trans,i) += .5*(1.0-r1m)*(1.0-r1m)*d/(1.0-r1m*r1m*d*d);
101          }
102 +        multcolor(trans, r->pcol);              /* modify by pattern */
103                                                  /* transmitted ray */
104 <        if (rayorigin(&p, r, TRANS, bright(trans)) == 0) {
104 >        if (rayorigin(&p, TRANS, r, trans) == 0) {
105                  if (!(r->crtype & SHADOW) && hastexture) {
106                          for (i = 0; i < 3; i++)         /* perturb direction */
107                                  p.rdir[i] = r->rdir[i] +
# Line 166 | Line 115 | register RAY  *r;
115                          transtest = 2;
116                  }
117                  rayvalue(&p);
118 <                multcolor(p.rcol, r->pcol);     /* modify */
170 <                multcolor(p.rcol, trans);
118 >                multcolor(p.rcol, p.rcoef);
119                  addcolor(r->rcol, p.rcol);
120                  transtest *= bright(p.rcol);
121                  transdist = r->rot + p.rt;
# Line 185 | Line 133 | register RAY  *r;
133                  colval(refl,i) += .5*r1m*(1.0+(1.0-2.0*r1m)*d)/(1.0-r1m*r1m*d);
134          }
135                                                  /* reflected ray */
136 <        if (rayorigin(&p, r, REFLECTED, bright(refl)) == 0) {
136 >        if (rayorigin(&p, REFLECTED, r, refl) == 0) {
137                  for (i = 0; i < 3; i++)
138                          p.rdir[i] = r->rdir[i] + 2.0*pdot*pnorm[i];
139                  rayvalue(&p);
140 <                multcolor(p.rcol, refl);
140 >                multcolor(p.rcol, p.rcoef);
141                  addcolor(r->rcol, p.rcol);
142                  if (!hastexture && r->ro != NULL && isflat(r->ro->otype)) {
143                          mirtest = 2.0*bright(p.rcol);

Diff Legend

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