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

Comparing ray/src/rt/srcsamp.c (file contents):
Revision 1.7 by greg, Mon Oct 28 08:07:44 1991 UTC vs.
Revision 2.7 by greg, Sat Feb 22 02:07:29 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1991 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   * Source sampling routines
6 + *
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 + */
66 +
67   #include  "ray.h"
68  
69   #include  "source.h"
# Line 15 | Line 71 | static char SCCSid[] = "$SunId$ LBL";
71   #include  "random.h"
72  
73  
74 + static int  cyl_partit(), flt_partit();
75 +
76 +
77   double
78   nextssamp(r, si)                /* compute sample for source, rtn. distance */
79   register RAY  *r;               /* origin is read, direction is set */
# Line 24 | Line 83 | register SRCINDEX  *si;                /* source index (modified to
83          FVECT  vpos;
84          double  d;
85          register int  i;
86 <
86 > nextsample:
87          while (++si->sp >= si->np) {    /* get next sample */
88                  if (++si->sn >= nsources)
89                          return(0.0);    /* no more */
# Line 76 | Line 135 | register SRCINDEX  *si;                /* source index (modified to
135                          r->rdir[i] -= r->rorg[i];
136                                          /* compute distance */
137          if ((d = normalize(r->rdir)) == 0.0)
138 <                return(nextssamp(r, si));       /* at source! */
138 >                goto nextsample;                /* at source! */
139  
140                                          /* compute sample size */
82 –        si->dom  = source[si->sn].ss2;
141          if (source[si->sn].sflags & SFLAT) {
142 <                si->dom *= sflatform(si->sn, r->rdir);
143 <                si->dom *= (double)(size[SU]*size[SV])/(MAXSPART*MAXSPART);
142 >                si->dom = sflatform(si->sn, r->rdir);
143 >                si->dom *= size[SU]*size[SV]/(MAXSPART*(double)MAXSPART);
144          } else if (source[si->sn].sflags & SCYL) {
145 <                si->dom *= scylform(si->sn, r->rdir);
146 <                si->dom *= (double)size[SU]/MAXSPART;
145 >                si->dom = scylform(si->sn, r->rdir);
146 >                si->dom *= size[SU]/(double)MAXSPART;
147          } else {
148 <                si->dom *= (double)(size[SU]*size[SV]*size[SW]) /
149 <                                (MAXSPART*MAXSPART*MAXSPART) ;
148 >                si->dom = size[SU]*size[SV]*(double)size[SW] /
149 >                                (MAXSPART*MAXSPART*(double)MAXSPART) ;
150          }
151 <        if (source[si->sn].sflags & SDISTANT)
151 >        if (source[si->sn].sflags & SDISTANT) {
152 >                si->dom *= source[si->sn].ss2;
153                  return(FHUGE);
154 <        si->dom /= d*d;
154 >        }
155 >        if (si->dom <= 1e-4)
156 >                goto nextsample;                /* behind source? */
157 >        si->dom *= source[si->sn].ss2/(d*d);
158          return(d);              /* sample OK, return distance */
159   }
160  
161  
162 + int
163   skipparts(ct, sz, pp, pt)               /* skip to requested partition */
164   int  ct[3], sz[3];              /* center and size of partition (returned) */
165   register int  pp[2];            /* current index, number to skip (modified) */
# Line 128 | Line 191 | unsigned char  *pt;            /* partition array */
191   }
192  
193  
194 + void
195   nopart(si, r)                   /* single source partition */
196   register SRCINDEX  *si;
197   RAY  *r;
# Line 138 | Line 202 | RAY  *r;
202   }
203  
204  
205 + void
206   cylpart(si, r)                  /* partition a cylinder */
207   SRCINDEX  *si;
208   register RAY  *r;
# Line 214 | Line 279 | double  d2;
279   }
280  
281  
282 + void
283   flatpart(si, r)                         /* partition a flat source */
284   register SRCINDEX  *si;
285   register RAY  *r;

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)