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.12 by greg, Mon Mar 10 17:26:26 2003 UTC vs.
Revision 2.15 by schorsch, Tue Mar 30 16:13:01 2004 UTC

# Line 7 | Line 7 | static const char RCSid[] = "$Id";
7  
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 49 | 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 65 | 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   {
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 86 | 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 107 | 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 175 | 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 212 | 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