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

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   * Routines for mirror material supporting virtual light sources
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 <
12 > #include  "rtotypes.h"
13   #include  "source.h"
14  
15   /*
# Line 79 | Line 23 | static const char      RCSid[] = "$Id$";
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  
83 – static int  mir_proj(), mirrorproj();
84 –
29   VSMATERIAL  mirror_vs = {mir_proj, 1};
30  
31  
32 < int
33 < m_mirror(m, r)                  /* shade mirrored ray */
34 < register OBJREC  *m;
35 < 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 121 | 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 131 | 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 145 | 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 154 | Line 99 | register RAY  *r;
99  
100  
101   static int
102 < mir_proj(pm, o, s, n)           /* compute a mirror's projection */
103 < MAT4  pm;
104 < register OBJREC  *o;
105 < SRCREC  *s;
106 < int  n;
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 182 | Line 128 | int  n;
128   }
129  
130  
131 < static int
132 < mirrorproj(m, nv, offs)         /* get mirror projection for surface */
133 < register MAT4  m;
134 < FVECT  nv;
135 < 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