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.19 by greg, Tue Jun 17 18:57:41 2014 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          32              /* 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 195 | Line 145 | register OBJREC  *so;
145          src->so = so;
146          if (so->oargs.nfargs != 4)
147                  objerror(so, USER, "bad arguments");
148 <        src->sflags |= SDISTANT;
148 >        src->sflags |= (SDISTANT|SCIR);
149          VCOPY(src->sloc, so->oargs.farg);
150          if (normalize(src->sloc) == 0.0)
151                  objerror(so, USER, "zero direction");
# 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 >        src->sflags |= SCIR;
178          VCOPY(src->sloc, so->oargs.farg);
179          src->srad = so->oargs.farg[3];
180          src->ss2 = PI * src->srad * src->srad;
181          for (i = 0; i < 3; i++)
182                  src->ss[SU][i] = src->ss[SV][i] = src->ss[SW][i] = 0.0;
183          for (i = 0; i < 3; i++)
184 <                src->ss[i][i] = .7236 * so->oargs.farg[3];
184 >                src->ss[i][i] = 0.7236 * so->oargs.farg[3];
185   }
186  
187  
# Line 245 | Line 196 | OBJREC  *so;
196          src->so = so;
197                                                  /* get the ring */
198          co = getcone(so, 0);
199 +        if (CO_R1(co) <= FTINY)
200 +                objerror(so, USER, "illegal source radius");
201          VCOPY(src->sloc, CO_P0(co));
202          if (CO_R0(co) > 0.0)
203 <                objerror(so, USER, "cannot hit center");
204 <        src->sflags |= SFLAT;
203 >                objerror(so, USER, "cannot hit source center");
204 >        src->sflags |= (SFLAT|SCIR);
205          VCOPY(src->snorm, co->ad);
206          src->srad = CO_R1(co);
207          src->ss2 = PI * src->srad * src->srad;
# Line 268 | Line 221 | OBJREC  *so;
221          src->so = so;
222                                                  /* get the cylinder */
223          co = getcone(so, 0);
224 +        if (CO_R0(co) <= FTINY)
225 +                objerror(so, USER, "illegal source radius");
226          if (CO_R0(co) > .2*co->al)              /* heuristic constraint */
227                  objerror(so, WARNING, "source aspect too small");
228          src->sflags |= SCYL;
# Line 301 | Line 256 | register OBJREC  *m;
256                  return(ns);
257          if ((ns = (SPOT *)malloc(sizeof(SPOT))) == NULL)
258                  return(NULL);
259 +        if (m->oargs.farg[3] <= FTINY)
260 +                objerror(m, USER, "zero angle");
261          ns->siz = 2.0*PI * (1.0 - cos(PI/180.0/2.0 * m->oargs.farg[3]));
262          VCOPY(ns->aim, m->oargs.farg+4);
263          if ((ns->flen = normalize(ns->aim)) == 0.0)
# Line 442 | Line 399 | FVECT  dir;
399   {
400          FVECT  cent, c1, c2;
401          double  rad2, d;
445 –        register int  i;
402                                          /* move centers to common plane */
403          d = DOT(sp1->aim, dir);
404 <        for (i = 0; i < 3; i++)
449 <                c1[i] = sp1->aim[i] - d*dir[i];
404 >        VSUM(c1, sp1->aim, dir, -d);
405          d = DOT(sp2->aim, dir);
406 <        for (i = 0; i < 3; i++)
452 <                c2[i] = sp2->aim[i] - d*dir[i];
406 >        VSUM(c2, sp2->aim, dir, -d);
407                                          /* compute overlap */
408          rad2 = intercircle(cent, c1, c2, sp1->siz/PI, sp2->siz/PI);
409          if (rad2 <= FTINY)
# Line 485 | Line 439 | FVECT  pos;
439   {
440          FVECT  onorm;
441          double  offs, d, dist;
488 –        register int  i;
442  
443          offs = getplaneq(onorm, op);
444          d = -DOT(onorm, sp->aim);
# Line 494 | Line 447 | FVECT  pos;
447          dist = (DOT(pos, onorm) - offs)/d;
448          if (dist < 0.)
449                  return(0.);
450 <        for (i = 0; i < 3; i++)
498 <                oc[i] = pos[i] + dist*sp->aim[i];
450 >        VSUM(oc, pos, sp->aim, dist);
451          return(sp->siz*dist*dist/PI/(d*d));
452   }
453  
# Line 509 | Line 461 | FVECT  dir;
461   {
462          FVECT  onorm;
463          double  offs, d, dist;
512 –        register int  i;
464  
465          offs = getplaneq(onorm, op);
466          d = -DOT(onorm, dir);
467          if (d >= -FTINY && d <= FTINY)
468                  return(0.);
469          dist = (DOT(sp->aim, onorm) - offs)/d;
470 <        for (i = 0; i < 3; i++)
520 <                oc[i] = sp->aim[i] + dist*dir[i];
470 >        VSUM(oc, sp->aim, dir, dist);
471          return(sp->siz/PI/(d*d));
472   }
473  
# Line 530 | Line 480 | double  r1s, r2s;              /* radii squared */
480   {
481          double  a2, d2, l;
482          FVECT  disp;
533 –        register int  i;
483  
484 <        for (i = 0; i < 3; i++)
536 <                disp[i] = c2[i] - c1[i];
484 >        VSUB(disp, c2, c1);
485          d2 = DOT(disp,disp);
486                                          /* circle within overlap? */
487          if (r1s < r2s) {
# Line 553 | Line 501 | double  r1s, r2s;              /* radii squared */
501                  return(0.);
502                                          /* overlap, compute center */
503          l = sqrt((r1s - a2)/d2);
504 <        for (i = 0; i < 3; i++)
557 <                cc[i] = c1[i] + l*disp[i];
504 >        VSUM(cc, c1, disp, l);
505          return(a2);
506   }

Diff Legend

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