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

Comparing ray/src/rt/ambcomp.c (file contents):
Revision 2.8 by gwlarson, Wed Dec 16 18:14:57 1998 UTC vs.
Revision 2.9 by greg, Sat Feb 22 02:07:28 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1998 Silicon Graphics, Inc. */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Routines to compute "ambient" values using Monte Carlo
6 + *
7 + *  Declarations of external symbols in ambient.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  "ambient.h"
70  
71   #include  "random.h"
72  
17 – typedef struct {
18 –        short  t, p;            /* theta, phi indices */
19 –        COLOR  v;               /* value sum */
20 –        float  r;               /* 1/distance sum */
21 –        float  k;               /* variance for this division */
22 –        int  n;                 /* number of subsamples */
23 – }  AMBSAMP;             /* ambient sample division */
73  
25 – typedef struct {
26 –        FVECT  ux, uy, uz;      /* x, y and z axis directions */
27 –        short  nt, np;          /* number of theta and phi directions */
28 – }  AMBHEMI;             /* ambient sample hemisphere */
29 –
30 –
74   static int
75   ambcmp(d1, d2)                          /* decreasing order */
76   AMBSAMP  *d1, *d2;
# Line 52 | Line 95 | AMBSAMP  *d1, *d2;
95   }
96  
97  
98 + int
99   divsample(dp, h, r)                     /* sample a division */
100   register AMBSAMP  *dp;
101   AMBHEMI  *h;
# Line 84 | Line 128 | RAY  *r;
128          rayvalue(&ar);
129          ndims--;
130          addcolor(dp->v, ar.rcol);
131 <                                        /* be conservative and use rot */
132 <        if (ar.rot > FTINY && ar.rot < FHUGE)
133 <                dp->r += 1.0/ar.rot;
131 >                                        /* use rt to improve gradient calc */
132 >        if (ar.rt > FTINY && ar.rt < FHUGE)
133 >                dp->r += 1.0/ar.rt;
134                                          /* (re)initialize error */
135          if (dp->n++) {
136                  b2 = bright(dp->v)/dp->n - bright(ar.rcol);
# Line 202 | Line 246 | FVECT  pg, dg;
246                                  for (i = 0; i < 3; i++)
247                                          dg[i] = 0.0;
248                  }
249 <                free((char *)div);
249 >                free((void *)div);
250          }
251          b = 1.0/ndivs;
252          scalecolor(acol, b);
# Line 228 | Line 272 | FVECT  pg, dg;
272          return(arad);
273   oopsy:
274          if (div != NULL)
275 <                free((char *)div);
275 >                free((void *)div);
276          return(0.0);
277   }
278  
279  
280 + void
281   inithemi(hp, r, wt)             /* initialize sampling hemisphere */
282   register AMBHEMI  *hp;
283   RAY  *r;
# Line 261 | Line 306 | double  wt;
306   }
307  
308  
309 + void
310   comperrs(da, hp)                /* compute initial error estimates */
311   AMBSAMP  *da;           /* assumes standard ordering */
312   register AMBHEMI  *hp;
# Line 311 | Line 357 | register AMBHEMI  *hp;
357   }
358  
359  
360 + void
361   posgradient(gv, da, hp)                         /* compute position gradient */
362   FVECT  gv;
363   AMBSAMP  *da;                   /* assumes standard ordering */
# Line 367 | Line 414 | register AMBHEMI  *hp;
414   }
415  
416  
417 + void
418   dirgradient(gv, da, hp)                         /* compute direction gradient */
419   FVECT  gv;
420   AMBSAMP  *da;                   /* assumes standard ordering */

Diff Legend

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