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

Comparing ray/src/rt/m_mirror.c (file contents):
Revision 2.7 by gwlarson, Mon Aug 10 18:37:05 1998 UTC vs.
Revision 2.11 by greg, Tue Apr 19 01:15:06 2005 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   * Routines for mirror material supporting virtual light sources
6   */
7  
8 < #include  "ray.h"
8 > #include "copyright.h"
9  
10 + #include  "ray.h"
11   #include  "otypes.h"
12 <
12 > #include  "rtotypes.h"
13   #include  "source.h"
14  
15   /*
# Line 25 | Line 23 | static char SCCSid[] = "$SunId$ SGI";
23   * part of the direct calculation.
24   */
25  
26 + static int mir_proj(MAT4  pm, OBJREC  *o, SRCREC  *s, int  n);
27 + static void mirrorproj(MAT4  m, FVECT  nv, double  offs);
28  
29 – int  mir_proj();
29   VSMATERIAL  mirror_vs = {mir_proj, 1};
30  
31  
32 < m_mirror(m, r)                  /* shade mirrored ray */
33 < register OBJREC  *m;
34 < register RAY  *r;
32 > extern int
33 > m_mirror(                       /* shade mirrored ray */
34 >        register OBJREC  *m,
35 >        register RAY  *r
36 > )
37   {
38          COLOR  mcolor;
39          RAY  nr;
# Line 65 | Line 66 | register RAY  *r;
66          multcolor(mcolor, r->pcol);
67                                          /* compute reflected ray */
68          if (r->rsrc >= 0) {                     /* relayed light source */
69 <                rayorigin(&nr, r, REFLECTED, 1.);
69 >                rayorigin(&nr, REFLECTED, r, mcolor);
70                                          /* ignore textures */
71                  for (i = 0; i < 3; i++)
72                          nr.rdir[i] = r->rdir[i] + 2.*r->rod*r->ron[i];
# Line 75 | Line 76 | register RAY  *r;
76                  FVECT  pnorm;
77                  double  pdot;
78  
79 <                if (rayorigin(&nr, r, REFLECTED, bright(mcolor)) < 0)
79 >                if (rayorigin(&nr, REFLECTED, r, mcolor) < 0)
80                          return(1);
81                  if (DOT(r->pert,r->pert) > FTINY*FTINY) {
82                          pdot = raynormal(pnorm, r);     /* use textures */
# Line 89 | Line 90 | register RAY  *r;
90                                  nr.rdir[i] = r->rdir[i] + 2.*r->rod*r->ron[i];
91          }
92          rayvalue(&nr);
93 <        multcolor(nr.rcol, mcolor);
93 >        multcolor(nr.rcol, nr.rcoef);
94          addcolor(r->rcol, nr.rcol);
95          if (rpure && r->ro != NULL && isflat(r->ro->otype))
96                  r->rt = r->rot + nr.rt;
# Line 97 | Line 98 | register RAY  *r;
98   }
99  
100  
101 < mir_proj(pm, o, s, n)           /* compute a mirror's projection */
102 < MAT4  pm;
103 < register OBJREC  *o;
104 < SRCREC  *s;
105 < int  n;
101 > static int
102 > mir_proj(               /* compute a mirror's projection */
103 >        MAT4  pm,
104 >        register OBJREC  *o,
105 >        SRCREC  *s,
106 >        int  n
107 > )
108   {
109          FVECT  nv, sc;
110          double  od;
# Line 125 | Line 128 | int  n;
128   }
129  
130  
131 < mirrorproj(m, nv, offs)         /* get mirror projection for surface */
132 < register MAT4  m;
133 < FVECT  nv;
134 < double  offs;
131 > static void
132 > mirrorproj(             /* get mirror projection for surface */
133 >        register MAT4  m,
134 >        FVECT  nv,
135 >        double  offs
136 > )
137   {
138          register int  i, j;
139                                          /* assign matrix */

Diff Legend

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