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.10 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.15 by schorsch, Tue Mar 30 16:13:01 2004 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id";
3   #endif
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 < */
8 > #include "copyright.h"
9  
10 < #include  "ray.h"
10 > #include <string.h>
11  
12 + #include  "ray.h"
13   #include  "source.h"
14 + #include  "rtotypes.h"
15  
16   /*
17   *  A mist volume is used to specify a region in the scene where a certain
# Line 104 | Line 51 | static const char      RCSid[] = "$Id$";
51  
52   #define RELAYDELIM      '>'             /* relay delimiter character */
53  
54 + static int inslist(int  *sl, int  n);
55 + static int srcmatch(SRCREC  *sp, char  *id);
56 + static void add2slist(RAY  *r, int  *sl);
57  
58 +
59   static int
60 < inslist(sl, n)          /* return index of source n if it's in list sl */
61 < register int  *sl;
62 < register int  n;
60 > inslist(                /* return index of source n if it's in list sl */
61 >        register int  *sl,
62 >        register int  n
63 > )
64   {
65          register int  i;
66  
# Line 120 | Line 72 | register int  n;
72  
73  
74   static int
75 < srcmatch(sp, id)        /* check for an id match on a light source */
76 < register SRCREC  *sp;
77 < register char  *id;
75 > srcmatch(       /* check for an id match on a light source */
76 >        register SRCREC  *sp,
77 >        register char  *id
78 > )
79   {
127 –        extern char  *index();
80          register char  *cp;
81                                                  /* check for relay sources */
82 <        while ((cp = index(id, RELAYDELIM)) != NULL) {
82 >        while ((cp = strchr(id, RELAYDELIM)) != NULL) {
83                  if (!(sp->sflags & SVIRTUAL) || sp->so == NULL)
84                          return(0);
85                  if (strncmp(id, sp->so->oname, cp-id) || sp->so->oname[cp-id])
# Line 142 | Line 94 | register char  *id;
94  
95  
96   static void
97 < add2slist(r, sl)        /* add source list to ray's */
98 < register RAY  *r;
99 < register int  *sl;
97 > add2slist(      /* add source list to ray's */
98 >        register RAY  *r,
99 >        register int  *sl
100 > )
101   {
102          static int  slspare[MAXSLIST+1];        /* in case of emergence */
103          register int  i;
# Line 163 | Line 116 | register int  *sl;
116   }
117  
118  
119 < int
120 < m_mist(m, r)            /* process a ray entering or leaving some mist */
121 < OBJREC  *m;
122 < register RAY  *r;
119 > extern int
120 > m_mist(         /* process a ray entering or leaving some mist */
121 >        OBJREC  *m,
122 >        register RAY  *r
123 > )
124   {
125          RAY  p;
126          int  *myslist = NULL;
# Line 231 | Line 185 | register RAY  *r;
185          } else {                                /* leaving ray */
186                  if (myslist != NULL) {                  /* delete from list */
187                          for (j = myslist[0]; j > 0; j--)
188 <                                if (i = inslist(p.slights, myslist[j]))
188 >                                if ( (i = inslist(p.slights, myslist[j])) )
189                                          p.slights[i] = -1;
190                          for (i = 0, j = 1; j <= p.slights[0]; j++)
191                                  if (p.slights[j] != -1)
# Line 268 | Line 222 | register RAY  *r;
222          return(1);
223   memerr:
224          error(SYSTEM, "out of memory in m_mist");
225 +        return 0; /* pro forma return */
226   }

Diff Legend

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