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

Comparing ray/src/rt/m_mist.c (file contents):
Revision 2.1 by greg, Fri Dec 8 21:27:10 1995 UTC vs.
Revision 2.10 by greg, Sat Feb 22 02:07:28 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1995 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   * Mist volumetric material.
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 + */
64 +
65   #include  "ray.h"
66  
67   #include  "source.h"
# Line 33 | Line 87 | static char SCCSid[] = "$SunId$ LBL";
87   *
88   *  Up to five real arguments may be given for MAT_MIST:
89   *
90 < *      [ext_r  ext_g  ext_b  [albedo [gecc]]]
90 > *      [ext_r  ext_g  ext_b  [albedo_r albedo_g albedo_b [gecc]]]
91   *
92   *  The primaries indicate medium extinction per unit length (absorption
93 < *  plus scattering).  The albedo is the ratio of scattering to extinction,
93 > *  plus scattering), which is added to the global extinction coefficient, set
94 > *  by the -me option.  The albedo is the ratio of scattering to extinction,
95   *  and is set globally by the -ma option (salbedo) and overridden here.
96   *  The Heyney-Greenstein eccentricity parameter (-mg seccg) indicates how much
97   *  scattering favors the forward direction.  A value of 0 means isotropic
98   *  scattering.  A value approaching 1 indicates strong forward scattering.
99   */
100  
101 < #define MAXSLIST        32              /* maximum sources to check */
101 > #ifndef  MAXSLIST
102 > #define  MAXSLIST       32      /* maximum sources to check */
103 > #endif
104 >
105   #define RELAYDELIM      '>'             /* relay delimiter character */
106  
49 – extern COLOR  cextinction;              /* global coefficient of extinction */
50 – extern double  salbedo;                 /* global scattering albedo */
51 – extern double  seccg;                   /* global scattering eccentricity */
107  
53 –
108   static int
109   inslist(sl, n)          /* return index of source n if it's in list sl */
110   register int  *sl;
# Line 66 | Line 120 | register int  n;
120  
121  
122   static int
123 < srcmatch(sn, id)        /* check for an id match on a light source */
124 < register int  sn;
125 < char  *id;
123 > srcmatch(sp, id)        /* check for an id match on a light source */
124 > register SRCREC  *sp;
125 > register char  *id;
126   {
127          extern char  *index();
128          register char  *cp;
129 < again:
130 <        if (source[sn].so == NULL)              /* just in case */
131 <                return(0);
78 <        if ((cp = index(id, RELAYDELIM)) != NULL) {     /* relay source */
79 <                if (!(source[sn].sflags & SVIRTUAL))
129 >                                                /* check for relay sources */
130 >        while ((cp = index(id, RELAYDELIM)) != NULL) {
131 >                if (!(sp->sflags & SVIRTUAL) || sp->so == NULL)
132                          return(0);
133 <                *cp = '\0';
82 <                if (strcmp(id, source[sn].so->oname)) {
83 <                        *cp = RELAYDELIM;
133 >                if (strncmp(id, sp->so->oname, cp-id) || sp->so->oname[cp-id])
134                          return(0);
135 <                }
136 <                *cp = RELAYDELIM;
87 <                id = cp + 1;                            /* recurse */
88 <                sn = source[sn].sa.sv.sn;
89 <                goto again;
135 >                id = cp + 1;                            /* relay to next */
136 >                sp = source + sp->sa.sv.sn;
137          }
138 <        if (source[sn].sflags & SVIRTUAL)
138 >        if (sp->sflags & SVIRTUAL || sp->so == NULL)
139                  return(0);
140 <        return(!strcmp(id, source[sn].so->oname));
140 >        return(!strcmp(id, sp->so->oname));
141   }
142  
143  
144 + static void
145 + add2slist(r, sl)        /* add source list to ray's */
146 + register RAY  *r;
147 + register int  *sl;
148 + {
149 +        static int  slspare[MAXSLIST+1];        /* in case of emergence */
150 +        register int  i;
151 +
152 +        if (sl == NULL || sl[0] == 0)           /* nothing to add */
153 +                return;
154 +        if (r->slights == NULL)
155 +                (r->slights = slspare)[0] = 0;  /* just once per ray path */
156 +        for (i = sl[0]; i > 0; i--)
157 +                if (!inslist(r->slights, sl[i])) {
158 +                        if (r->slights[0] >= MAXSLIST)
159 +                                error(INTERNAL,
160 +                                        "scattering source list overflow");
161 +                        r->slights[++r->slights[0]] = sl[i];
162 +                }
163 + }
164 +
165 +
166 + int
167   m_mist(m, r)            /* process a ray entering or leaving some mist */
168   OBJREC  *m;
169   register RAY  *r;
# Line 105 | Line 175 | register RAY  *r;
175          double  re, ge, be;
176          register int  i, j;
177                                          /* check arguments */
178 <        if (m->oargs.nfargs > 5)
178 >        if (m->oargs.nfargs > 7)
179                  objerror(m, USER, "bad arguments");
110 –        if (m->oargs.nsargs > MAXSLIST)
111 –                objerror(m, USER, "too many sources in list");
180                                          /* get source indices */
181          if (m->oargs.nsargs > 0 && (myslist = (int *)m->os) == NULL) {
182 +                if (m->oargs.nsargs > MAXSLIST)
183 +                        objerror(m, INTERNAL, "too many sources in list");
184                  myslist = (int *)malloc((m->oargs.nsargs+1)*sizeof(int));
185                  if (myslist == NULL)
186                          goto memerr;
187 <                myslist[0] = m->oargs.nsargs;   /* size is first in set */
188 <                for (j = myslist[0]; j > 0; j--) {
187 >                myslist[0] = 0;                 /* size is first in list */
188 >                for (j = 0; j < m->oargs.nsargs; j++) {
189                          i = nsources;           /* look up each source id */
190                          while (i--)
191 <                                if (srcmatch(i, m->oargs.sarg[j-1]))
191 >                                if (srcmatch(source+i, m->oargs.sarg[j]))
192                                          break;
193                          if (i < 0) {
194                                  sprintf(errmsg, "unknown source \"%s\"",
195 <                                                m->oargs.sarg[j-1]);
195 >                                                m->oargs.sarg[j]);
196                                  objerror(m, WARNING, errmsg);
197 +                        } else if (inslist(myslist, i)) {
198 +                                sprintf(errmsg, "duplicate source \"%s\"",
199 +                                                m->oargs.sarg[j]);
200 +                                objerror(m, WARNING, errmsg);
201                          } else
202 <                                myslist[j] = i;
202 >                                myslist[++myslist[0]] = i;
203                  }
204                  m->os = (char *)myslist;
205          }
# Line 141 | Line 215 | register RAY  *r;
215                  return(1);
216          VCOPY(p.rdir, r->rdir);
217          p.slights = newslist;
218 <        if (r->slights != NULL)
218 >        if (r->slights != NULL)                 /* copy old list if one */
219                  for (j = r->slights[0]; j >= 0; j--)
220                          p.slights[j] = r->slights[j];
221          else
222                  p.slights[0] = 0;
223          if (r->rod > 0.) {                      /* entering ray */
224                  addcolor(p.cext, mext);
225 <                if (m->oargs.nfargs > 3)
226 <                        p.albedo = m->oargs.farg[3];
227 <                if (m->oargs.nfargs > 4)
228 <                        p.gecc = m->oargs.farg[4];
229 <                if (myslist != NULL)                    /* add to list */
230 <                        for (j = myslist[0]; j > 0; j--)
157 <                                if (!inslist(p.slights, myslist[j])) {
158 <                                        if (p.slights[0] >= MAXSLIST)
159 <                                                error(USER,
160 <                                        "scattering source list overflow");
161 <                                        p.slights[++p.slights[0]] = myslist[j];
162 <                                }
225 >                if (m->oargs.nfargs > 5)
226 >                        setcolor(p.albedo, m->oargs.farg[3],
227 >                                        m->oargs.farg[4], m->oargs.farg[5]);
228 >                if (m->oargs.nfargs > 6)
229 >                        p.gecc = m->oargs.farg[6];
230 >                add2slist(&p, myslist);                 /* add to list */
231          } else {                                /* leaving ray */
164 –                re = colval(r->cext,RED) - colval(mext,RED);
165 –                ge = colval(r->cext,GRN) - colval(mext,GRN);
166 –                be = colval(r->cext,BLU) - colval(mext,BLU);
167 –                setcolor(p.cext, re<0. ? 0. : re,
168 –                                ge<0. ? 0. : ge,
169 –                                be<0. ? 0. : be);
170 –                if (m->oargs.nfargs > 3)
171 –                        p.albedo = salbedo;
172 –                if (m->oargs.nfargs > 4)
173 –                        p.gecc = seccg;
232                  if (myslist != NULL) {                  /* delete from list */
233                          for (j = myslist[0]; j > 0; j--)
234                                  if (i = inslist(p.slights, myslist[j]))
# Line 178 | Line 236 | register RAY  *r;
236                          for (i = 0, j = 1; j <= p.slights[0]; j++)
237                                  if (p.slights[j] != -1)
238                                          p.slights[++i] = p.slights[j];
239 +                        if (p.slights[0] - i < myslist[0]) {    /* fix old */
240 +                                addcolor(r->cext, mext);
241 +                                if (m->oargs.nfargs > 5)
242 +                                        setcolor(r->albedo, m->oargs.farg[3],
243 +                                        m->oargs.farg[4], m->oargs.farg[5]);
244 +                                if (m->oargs.nfargs > 6)
245 +                                        r->gecc = m->oargs.farg[6];
246 +                                add2slist(r, myslist);
247 +                        }
248                          p.slights[0] = i;
249                  }
250 +                if ((re = colval(r->cext,RED) - colval(mext,RED)) <
251 +                                colval(cextinction,RED))
252 +                        re = colval(cextinction,RED);
253 +                if ((ge = colval(r->cext,GRN) - colval(mext,GRN)) <
254 +                                colval(cextinction,GRN))
255 +                        ge = colval(cextinction,GRN);
256 +                if ((be = colval(r->cext,BLU) - colval(mext,BLU)) <
257 +                                colval(cextinction,BLU))
258 +                        be = colval(cextinction,BLU);
259 +                setcolor(p.cext, re, ge, be);
260 +                if (m->oargs.nfargs > 5)
261 +                        copycolor(p.albedo, salbedo);
262 +                if (m->oargs.nfargs > 6)
263 +                        p.gecc = seccg;
264          }
265          rayvalue(&p);                           /* calls rayparticipate() */
266          copycolor(r->rcol, p.rcol);             /* return value */

Diff Legend

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