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

Comparing ray/src/rt/srcdraw.c (file contents):
Revision 2.3 by greg, Sat Jun 8 21:16:04 1996 UTC vs.
Revision 2.5 by greg, Sat Feb 22 02:07:29 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1996 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   * Draw small sources into image in case we missed them.
6 + *
7 + *  External symbols declared in ray.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  "view.h"
# Line 337 | Line 393 | int    rad;                            /* source sample size */
393                                          /* free old source list if one */
394          for (sp = sphead; sp != NULL; sp = sphead) {
395                  sphead = sp->next;
396 <                free((char *)sp);
396 >                free((void *)sp);
397          }
398                                          /* loop through all sources */
399          for (i = nsources; i--; ) {
# Line 356 | Line 412 | int    rad;                            /* source sample size */
412          }
413   }
414  
415 <                        /* add sources smaller than rad to computed subimage */
415 > void                    /* add sources smaller than rad to computed subimage */
416   drawsources(pic, zbf, x0, xsiz, y0, ysiz)
417   COLOR   *pic[];                         /* subimage pixel value array */
418   float   *zbf[];                         /* subimage distance array (opt.) */
# Line 366 | Line 422 | int    x0, xsiz, y0, ysiz;             /* origin and size of subimag
422          int     nsv, npv;
423          int     xmin, xmax, ymin, ymax, x, y;
424          FLOAT   cxy[2];
425 <        double  pa;
425 >        double  w;
426          RAY     sr;
427          register SPLIST *sp;
428          register int    i;
# Line 415 | Line 471 | int    x0, xsiz, y0, ysiz;             /* origin and size of subimag
471                                          continue;       /* missed/blocked */
472                                                          /* modify pixel */
473                                  if (zbf[y-y0] != NULL &&
474 <                                                sr.rt < zbf[y-y0][x-x0])
474 >                                                sr.rt < 0.999*zbf[y-y0][x-x0])
475                                          zbf[y-y0][x-x0] = sr.rt;
476 <                                pa = poly_area(ppoly, npv);
477 <                                scalecolor(sr.rcol, pa*hres*vres);
478 <                                scalecolor(pic[y-y0][x-x0], (1.-pa*hres*vres));
476 >                                else if (!bigdiff(sr.rcol, pic[y-y0][x-x0],
477 >                                                0.001)) /* source sample */
478 >                                        setcolor(pic[y-y0][x-x0], 0., 0., 0.);
479 >                                w = poly_area(ppoly, npv) * hres * vres;
480 >                                scalecolor(sr.rcol, w);
481 >                                scalecolor(pic[y-y0][x-x0], 1.-w);
482                                  addcolor(pic[y-y0][x-x0], sr.rcol);
483                          }
484          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines