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

Comparing ray/src/rt/srcsupp.c (file contents):
Revision 2.9 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.16 by greg, Mon Feb 26 21:16:02 2007 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *  External symbols declared in source.h
8   */
9  
10 < /* ====================================================================
11 < * The Radiance Software License, Version 1.0
12 < *
13 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 < *
16 < * Redistribution and use in source and binary forms, with or without
17 < * modification, are permitted provided that the following conditions
18 < * are met:
19 < *
20 < * 1. Redistributions of source code must retain the above copyright
21 < *         notice, this list of conditions and the following disclaimer.
22 < *
23 < * 2. Redistributions in binary form must reproduce the above copyright
24 < *       notice, this list of conditions and the following disclaimer in
25 < *       the documentation and/or other materials provided with the
26 < *       distribution.
27 < *
28 < * 3. The end-user documentation included with the redistribution,
29 < *           if any, must include the following acknowledgment:
30 < *             "This product includes Radiance software
31 < *                 (http://radsite.lbl.gov/)
32 < *                 developed by the Lawrence Berkeley National Laboratory
33 < *               (http://www.lbl.gov/)."
34 < *       Alternately, this acknowledgment may appear in the software itself,
35 < *       if and wherever such third-party acknowledgments normally appear.
36 < *
37 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 < *       and "The Regents of the University of California" must
39 < *       not be used to endorse or promote products derived from this
40 < *       software without prior written permission. For written
41 < *       permission, please contact [email protected].
42 < *
43 < * 5. Products derived from this software may not be called "Radiance",
44 < *       nor may "Radiance" appear in their name, without prior written
45 < *       permission of Lawrence Berkeley National Laboratory.
46 < *
47 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 < * SUCH DAMAGE.
59 < * ====================================================================
60 < *
61 < * This software consists of voluntary contributions made by many
62 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 < * information on Lawrence Berkeley National Laboratory, please see
64 < * <http://www.lbl.gov/>.
65 < */
10 > #include "copyright.h"
11  
12   #include  "ray.h"
13  
# Line 74 | Line 19 | static const char      RCSid[] = "$Id$";
19  
20   #include  "face.h"
21  
22 < #define SRCINC          4               /* realloc increment for array */
22 > #define SRCINC          8               /* realloc increment for array */
23  
24   SRCREC  *source = NULL;                 /* our list of sources */
25   int  nsources = 0;                      /* the number of sources */
# Line 109 | Line 54 | newsource()                    /* allocate new source in our array */
54          if (nsources == 0)
55                  source = (SRCREC *)malloc(SRCINC*sizeof(SRCREC));
56          else if (nsources%SRCINC == 0)
57 <                source = (SRCREC *)realloc((char *)source,
57 >                source = (SRCREC *)realloc((void *)source,
58                                  (unsigned)(nsources+SRCINC)*sizeof(SRCREC));
59          if (source == NULL)
60                  return(-1);
61          source[nsources].sflags = 0;
62          source[nsources].nhits = 1;
63 <        source[nsources].ntests = 2;    /* initial hit probability = 1/2 */
63 >        source[nsources].ntests = 2;    /* initial hit probability = 50% */
64 > #if SHADCACHE
65 >        source[nsources].obscache = NULL;
66 > #endif
67          return(nsources++);
68   }
69  
# Line 153 | Line 101 | OBJREC  *so;
101          src->so = so;
102                                                  /* get the face */
103          f = getface(so);
104 +        if (f->area == 0.0)
105 +                objerror(so, USER, "zero source area");
106                                                  /* find the center */
107          for (j = 0; j < 3; j++) {
108                  src->sloc[j] = 0.0;
# Line 161 | Line 111 | OBJREC  *so;
111                  src->sloc[j] /= (double)f->nv;
112          }
113          if (!inface(src->sloc, f))
114 <                objerror(so, USER, "cannot hit center");
114 >                objerror(so, USER, "cannot hit source center");
115          src->sflags |= SFLAT;
116          VCOPY(src->snorm, f->norm);
117          src->ss2 = f->area;
# Line 223 | Line 173 | register OBJREC  *so;
173          if (so->oargs.nfargs != 4)
174                  objerror(so, USER, "bad # arguments");
175          if (so->oargs.farg[3] <= FTINY)
176 <                objerror(so, USER, "illegal radius");
176 >                objerror(so, USER, "illegal source radius");
177          VCOPY(src->sloc, so->oargs.farg);
178          src->srad = so->oargs.farg[3];
179          src->ss2 = PI * src->srad * src->srad;
# Line 245 | Line 195 | OBJREC  *so;
195          src->so = so;
196                                                  /* get the ring */
197          co = getcone(so, 0);
198 +        if (CO_R1(co) <= FTINY)
199 +                objerror(so, USER, "illegal source radius");
200          VCOPY(src->sloc, CO_P0(co));
201          if (CO_R0(co) > 0.0)
202 <                objerror(so, USER, "cannot hit center");
202 >                objerror(so, USER, "cannot hit source center");
203          src->sflags |= SFLAT;
204          VCOPY(src->snorm, co->ad);
205          src->srad = CO_R1(co);
# Line 268 | Line 220 | OBJREC  *so;
220          src->so = so;
221                                                  /* get the cylinder */
222          co = getcone(so, 0);
223 +        if (CO_R0(co) <= FTINY)
224 +                objerror(so, USER, "illegal source radius");
225          if (CO_R0(co) > .2*co->al)              /* heuristic constraint */
226                  objerror(so, WARNING, "source aspect too small");
227          src->sflags |= SCYL;
# Line 301 | Line 255 | register OBJREC  *m;
255                  return(ns);
256          if ((ns = (SPOT *)malloc(sizeof(SPOT))) == NULL)
257                  return(NULL);
258 +        if (m->oargs.farg[3] <= FTINY)
259 +                objerror(m, USER, "zero angle");
260          ns->siz = 2.0*PI * (1.0 - cos(PI/180.0/2.0 * m->oargs.farg[3]));
261          VCOPY(ns->aim, m->oargs.farg+4);
262          if ((ns->flen = normalize(ns->aim)) == 0.0)

Diff Legend

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