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

Comparing ray/src/rt/srcsamp.c (file contents):
Revision 2.7 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.14 by greg, Wed Dec 10 07:07:07 2008 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 112 | Line 57 | nextsample:
57                  d = urand(ilhash(dimlist,ndims+2)+samplendx);
58                  if (source[si->sn].sflags & SFLAT) {
59                          multisamp(vpos, 2, d);
60 <                        vpos[2] = 0.5;
60 >                        vpos[SW] = 0.5;
61                  } else
62                          multisamp(vpos, 3, d);
63                  for (i = 0; i < 3; i++)
# Line 123 | Line 68 | nextsample:
68  
69          for (i = 0; i < 3; i++)
70                  vpos[i] += (double)cent[i]/MAXSPART;
71 +                                        /* avoid circular aiming failures */
72 +        if ((source[si->sn].sflags & SCIR) && (si->np > 1 || dstrsrc > 0.7)) {
73 +                FVECT   trim;
74 +                if (source[si->sn].sflags & (SFLAT|SDISTANT)) {
75 +                        d = 1.12837917;         /* correct setflatss() */
76 +                        trim[SU] = d*sqrt(1.0 - 0.5*vpos[SV]*vpos[SV]);
77 +                        trim[SV] = d*sqrt(1.0 - 0.5*vpos[SU]*vpos[SU]);
78 +                        trim[SW] = 0.0;
79 +                } else {
80 +                        trim[SW] = trim[SU] = vpos[SU]*vpos[SU];
81 +                        d = vpos[SV]*vpos[SV];
82 +                        if (d > trim[SW]) trim[SW] = d;
83 +                        trim[SU] += d;
84 +                        d = vpos[SW]*vpos[SW];
85 +                        if (d > trim[SW]) trim[SW] = d;
86 +                        trim[SU] += d;
87 +                        d = 1.0/0.7236;         /* correct sphsetsrc() */
88 +                        trim[SW] = trim[SV] = trim[SU] =
89 +                                        d*sqrt(trim[SW]/trim[SU]);
90 +                }
91 +                for (i = 0; i < 3; i++)
92 +                        vpos[i] *= trim[i];
93 +        }
94                                          /* compute direction */
95          for (i = 0; i < 3; i++)
96                  r->rdir[i] = source[si->sn].sloc[i] +
# Line 169 | Line 137 | unsigned char  *pt;            /* partition array */
137                                          /* check this partition */
138          p = spart(pt, pp[0]);
139          pp[0]++;
140 <        if (p == S0)                    /* leaf partition */
140 >        if (p == S0) {                  /* leaf partition */
141                  if (pp[1]) {
142                          pp[1]--;
143                          return(0);      /* not there yet */
144                  } else
145                          return(1);      /* we've arrived */
146 +        }
147                                  /* else check lower */
148          sz[p] >>= 1;
149          ct[p] -= sz[p];
# Line 284 | Line 253 | flatpart(si, r)                                /* partition a flat source */
253   register SRCINDEX  *si;
254   register RAY  *r;
255   {
256 <        register FLOAT  *vp;
256 >        register RREAL  *vp;
257          FVECT  v;
258          double  du2, dv2;
259          int  pi;
# Line 295 | Line 264 | register RAY  *r;
264          v[1] = r->rorg[1] - vp[1];
265          v[2] = r->rorg[2] - vp[2];
266          vp = source[si->sn].snorm;
267 <        if (DOT(v,vp) <= FTINY) {       /* behind source */
267 >        if (DOT(v,vp) <= 0.) {          /* behind source */
268                  si->np = 0;
269                  return;
270          }
# Line 368 | Line 337 | scylform(sn, dir)              /* compute cosine for cylinder's pr
337   int  sn;
338   register FVECT  dir;            /* assume normalized */
339   {
340 <        register FLOAT  *dv;
340 >        register RREAL  *dv;
341          double  d;
342  
343          dv = source[sn].ss[SU];

Diff Legend

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