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.17 by greg, Sat Oct 23 18:13:54 2010 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 80 | Line 25 | register RAY  *r;              /* origin is read, direction is set
25   register SRCINDEX  *si;         /* source index (modified to current) */
26   {
27          int  cent[3], size[3], parr[2];
28 +        SRCREC  *srcp;
29          FVECT  vpos;
30          double  d;
31          register int  i;
# Line 106 | Line 52 | nextsample:
52          if (!skipparts(cent, size, parr, si->spt))
53                  error(CONSISTENCY, "bad source partition in nextssamp");
54                                          /* compute sample */
55 +        srcp = source + si->sn;
56          if (dstrsrc > FTINY) {                  /* jitter sample */
57                  dimlist[ndims] = si->sn + 8831;
58                  dimlist[ndims+1] = si->sp + 3109;
59                  d = urand(ilhash(dimlist,ndims+2)+samplendx);
60 <                if (source[si->sn].sflags & SFLAT) {
60 >                if (srcp->sflags & SFLAT) {
61                          multisamp(vpos, 2, d);
62 <                        vpos[2] = 0.5;
62 >                        vpos[SW] = 0.5;
63                  } else
64                          multisamp(vpos, 3, d);
65                  for (i = 0; i < 3; i++)
66                          vpos[i] = dstrsrc * (1. - 2.*vpos[i]) *
67 <                                        (double)size[i]/MAXSPART;
67 >                                        (double)size[i]*(1.0/MAXSPART);
68          } else
69                  vpos[0] = vpos[1] = vpos[2] = 0.0;
70  
71 <        for (i = 0; i < 3; i++)
72 <                vpos[i] += (double)cent[i]/MAXSPART;
71 >        VSUM(vpos, vpos, cent, 1.0/MAXSPART);
72 >                                        /* avoid circular aiming failures */
73 >        if ((srcp->sflags & SCIR) && (si->np > 1 || dstrsrc > 0.7)) {
74 >                FVECT   trim;
75 >                if (srcp->sflags & (SFLAT|SDISTANT)) {
76 >                        d = 1.12837917;         /* correct setflatss() */
77 >                        trim[SU] = d*sqrt(1.0 - 0.5*vpos[SV]*vpos[SV]);
78 >                        trim[SV] = d*sqrt(1.0 - 0.5*vpos[SU]*vpos[SU]);
79 >                        trim[SW] = 0.0;
80 >                } else {
81 >                        trim[SW] = trim[SU] = vpos[SU]*vpos[SU];
82 >                        d = vpos[SV]*vpos[SV];
83 >                        if (d > trim[SW]) trim[SW] = d;
84 >                        trim[SU] += d;
85 >                        d = vpos[SW]*vpos[SW];
86 >                        if (d > trim[SW]) trim[SW] = d;
87 >                        trim[SU] += d;
88 >                        if (trim[SU] > FTINY*FTINY) {
89 >                                d = 1.0/0.7236; /* correct sphsetsrc() */
90 >                                trim[SW] = trim[SV] = trim[SU] =
91 >                                                d*sqrt(trim[SW]/trim[SU]);
92 >                        } else
93 >                                trim[SW] = trim[SV] = trim[SU] = 0.0;
94 >                }
95 >                for (i = 0; i < 3; i++)
96 >                        vpos[i] *= trim[i];
97 >        }
98                                          /* compute direction */
99          for (i = 0; i < 3; i++)
100 <                r->rdir[i] = source[si->sn].sloc[i] +
101 <                                vpos[SU]*source[si->sn].ss[SU][i] +
102 <                                vpos[SV]*source[si->sn].ss[SV][i] +
103 <                                vpos[SW]*source[si->sn].ss[SW][i];
100 >                r->rdir[i] = srcp->sloc[i] +
101 >                                vpos[SU]*srcp->ss[SU][i] +
102 >                                vpos[SV]*srcp->ss[SV][i] +
103 >                                vpos[SW]*srcp->ss[SW][i];
104  
105 <        if (!(source[si->sn].sflags & SDISTANT))
106 <                for (i = 0; i < 3; i++)
135 <                        r->rdir[i] -= r->rorg[i];
105 >        if (!(srcp->sflags & SDISTANT))
106 >                VSUB(r->rdir, r->rdir, r->rorg);
107                                          /* compute distance */
108          if ((d = normalize(r->rdir)) == 0.0)
109                  goto nextsample;                /* at source! */
110  
111                                          /* compute sample size */
112 <        if (source[si->sn].sflags & SFLAT) {
112 >        if (srcp->sflags & SFLAT) {
113                  si->dom = sflatform(si->sn, r->rdir);
114 <                si->dom *= size[SU]*size[SV]/(MAXSPART*(double)MAXSPART);
115 <        } else if (source[si->sn].sflags & SCYL) {
114 >                si->dom *= size[SU]*size[SV]*(1.0/MAXSPART/MAXSPART);
115 >        } else if (srcp->sflags & SCYL) {
116                  si->dom = scylform(si->sn, r->rdir);
117 <                si->dom *= size[SU]/(double)MAXSPART;
117 >                si->dom *= size[SU]*(1.0/MAXSPART);
118          } else {
119 <                si->dom = size[SU]*size[SV]*(double)size[SW] /
120 <                                (MAXSPART*MAXSPART*(double)MAXSPART) ;
119 >                si->dom = size[SU]*size[SV]*(double)size[SW] *
120 >                                (1.0/MAXSPART/MAXSPART/MAXSPART) ;
121          }
122 <        if (source[si->sn].sflags & SDISTANT) {
123 <                si->dom *= source[si->sn].ss2;
122 >        if (srcp->sflags & SDISTANT) {
123 >                si->dom *= srcp->ss2;
124                  return(FHUGE);
125          }
126          if (si->dom <= 1e-4)
127                  goto nextsample;                /* behind source? */
128 <        si->dom *= source[si->sn].ss2/(d*d);
128 >        si->dom *= srcp->ss2/(d*d);
129          return(d);              /* sample OK, return distance */
130   }
131  
# Line 169 | Line 140 | unsigned char  *pt;            /* partition array */
140                                          /* check this partition */
141          p = spart(pt, pp[0]);
142          pp[0]++;
143 <        if (p == S0)                    /* leaf partition */
143 >        if (p == S0) {                  /* leaf partition */
144                  if (pp[1]) {
145                          pp[1]--;
146                          return(0);      /* not there yet */
147                  } else
148                          return(1);      /* we've arrived */
149 +        }
150                                  /* else check lower */
151          sz[p] >>= 1;
152          ct[p] -= sz[p];
# Line 284 | Line 256 | flatpart(si, r)                                /* partition a flat source */
256   register SRCINDEX  *si;
257   register RAY  *r;
258   {
259 <        register FLOAT  *vp;
259 >        register RREAL  *vp;
260          FVECT  v;
261          double  du2, dv2;
262          int  pi;
# Line 295 | Line 267 | register RAY  *r;
267          v[1] = r->rorg[1] - vp[1];
268          v[2] = r->rorg[2] - vp[2];
269          vp = source[si->sn].snorm;
270 <        if (DOT(v,vp) <= FTINY) {       /* behind source */
270 >        if (DOT(v,vp) <= 0.) {          /* behind source */
271                  si->np = 0;
272                  return;
273          }
# Line 368 | Line 340 | scylform(sn, dir)              /* compute cosine for cylinder's pr
340   int  sn;
341   register FVECT  dir;            /* assume normalized */
342   {
343 <        register FLOAT  *dv;
343 >        register RREAL  *dv;
344          double  d;
345  
346          dv = source[sn].ss[SU];

Diff Legend

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