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.14 by gwlarson, Fri Jun 19 12:01:15 1998 UTC vs.
Revision 2.18 by schorsch, Tue Mar 30 16:13:01 2004 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1998 Silicon Graphics, Inc. */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   *  dielectric.c - shading function for transparent materials.
9 *
10 *     9/6/85
6   */
7  
8 < #include  "ray.h"
8 > #include "copyright.h"
9  
10 + #include  "ray.h"
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 50 | Line 50 | static int  lambda();
50  
51   #define  MINCOS         0.997           /* minimum dot product for dispersion */
52  
53 extern COLOR  cextinction;              /* global coefficient of extinction */
54 extern COLOR  salbedo;                  /* global scattering albedo */
53  
56
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 66 | 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;
# Line 85 | Line 85 | register RAY  *r;
85  
86          raytexture(r, m->omod);                 /* get modifiers */
87  
88 <        if (hastexture = DOT(r->pert,r->pert) > FTINY*FTINY)
88 >        if ( (hastexture = DOT(r->pert,r->pert) > FTINY*FTINY) )
89                  cos1 = raynormal(dnorm, r);     /* perturb normal */
90          else {
91                  VCOPY(dnorm, r->ron);
# Line 157 | Line 157 | register RAY  *r;
157                  refl *= 0.5;
158                  trans = 1.0 - refl;
159  
160 +                trans *= nratio*nratio;         /* solid angle ratio */
161 +
162                  if (rayorigin(&p, r, REFRACTED, trans) == 0) {
163  
164                                                  /* compute refracted ray */
# Line 216 | Line 218 | register RAY  *r;
218  
219   #ifdef  DISPERSE
220  
221 < static
222 < disperse(m, r, vt, tr, cet, abt)  /* check light sources for dispersion */
223 < OBJREC  *m;
224 < RAY  *r;
225 < FVECT  vt;
226 < double  tr;
227 < COLOR  cet, abt;
221 > static int
222 > disperse(  /* check light sources for dispersion */
223 >        OBJREC  *m,
224 >        RAY  *r,
225 >        FVECT  vt,
226 >        double  tr,
227 >        COLOR  cet,
228 >        COLOR  abt
229 > )
230   {
231          RAY  sray, *entray;
232          FVECT  v1, v2, n1, n2;
# Line 353 | Line 357 | COLOR  cet, abt;
357  
358  
359   static int
360 < lambda(m, v2, dv, lr)                   /* compute lambda for material */
361 < register OBJREC  *m;
362 < FVECT  v2, dv, lr;
360 > lambda(                 /* compute lambda for material */
361 >        register OBJREC  *m,
362 >        FVECT  v2,
363 >        FVECT  dv,
364 >        FVECT  lr
365 > )
366   {
367          FVECT  lrXdv, v2Xlr;
368          double  dtmp, denom;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines