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

Comparing ray/src/rt/source.c (file contents):
Revision 2.29 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.37 by greg, Fri Sep 12 22:35:54 2003 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   *  source.c - routines dealing with illumination sources.
# 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 109 | Line 54 | marksources()                  /* find and mark source objects */
54                                          /* initialize dispatch table */
55          initstypes();
56                                          /* find direct sources */
57 <        for (i = 0; i < nobjects; i++) {
57 >        for (i = 0; i < nsceneobjs; i++) {
58          
59                  o = objptr(i);
60  
61                  if (!issurface(o->otype) || o->omod == OVOID)
62                          continue;
63 <
63 >                                        /* find material */
64                  m = objptr(o->omod);
65 <
66 <                if (!islight(m->otype))
67 <                        continue;
65 >                while (!ismaterial(m->otype))
66 >                        if (ismixture(m->otype) || m->omod == OVOID) {
67 >                                m = NULL;
68 >                                break;
69 >                        } else
70 >                                m = objptr(m->omod);
71 >                if (m == NULL || !islight(m->otype))
72 >                        continue;       /* not source modifier */
73          
74                  if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 :
75                                  m->otype == MAT_SPOT ? 7 : 3))
# Line 170 | Line 120 | marksources()                  /* find and mark source objects */
120          maxcntr = nsources + MAXSPART;  /* start with this many */
121          srccnt = (CONTRIB *)malloc(maxcntr*sizeof(CONTRIB));
122          cntord = (CNTPTR *)malloc(maxcntr*sizeof(CNTPTR));
123 <        if (srccnt == NULL | cntord == NULL)
123 >        if ((srccnt == NULL) | (cntord == NULL))
124                  goto memerr;
125          return;
126   memerr:
# Line 305 | Line 255 | register RAY  *r;
255                  for (i = 0; i < 3; i++)
256                          r->ron[i] = -r->rdir[i];
257                  r->rod = 1.0;
258 +                r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
259 +                r->uv[0] = r->uv[1] = 0.0;
260                  r->rox = NULL;
261                  return(1);
262          }
# Line 346 | Line 298 | char  *p;                      /* data for f */
298          for (sn = 0; srcray(&sr, r, &si); sn++) {
299                  if (sn >= maxcntr) {
300                          maxcntr = sn + MAXSPART;
301 <                        srccnt = (CONTRIB *)realloc((char *)srccnt,
301 >                        srccnt = (CONTRIB *)realloc((void *)srccnt,
302                                          maxcntr*sizeof(CONTRIB));
303 <                        cntord = (CNTPTR *)realloc((char *)cntord,
303 >                        cntord = (CNTPTR *)realloc((void *)cntord,
304                                          maxcntr*sizeof(CNTPTR));
305 <                        if (srccnt == NULL | cntord == NULL)
305 >                        if ((srccnt == NULL) | (cntord == NULL))
306                                  error(SYSTEM, "out of memory in direct");
307                  }
308                  cntord[sn].sndx = sn;
# Line 408 | Line 360 | char  *p;                      /* data for f */
360                  rayorigin(&sr, r, SHADOW, 1.0);
361                  VCOPY(sr.rdir, scp->dir);
362                  sr.rsrc = scp->sno;
363 <                source[scp->sno].ntests++;      /* keep statistics */
363 >                                                /* keep statistics */
364 >                if (source[scp->sno].ntests++ > 0xfffffff0) {
365 >                        source[scp->sno].ntests >>= 1;
366 >                        source[scp->sno].nhits >>= 1;
367 >                }
368                  if (localhit(&sr, &thescene) &&
369                                  ( sr.ro != source[scp->sno].so ||
370                                  source[scp->sno].sflags & SFOLLOW )) {
# Line 540 | Line 496 | register RAY  *r;
496   * geometry behind (or inside) an effective radiator.
497   */
498  
499 < static int weaksrcmod(obj) int obj;     /* efficiency booster function */
500 < {register OBJREC *o = objptr(obj);
501 < return(o->otype==MAT_ILLUM|o->otype==MAT_GLOW);}
499 > static int
500 > weaksrcmat(int obj)             /* identify material */
501 > {
502 >        register OBJREC *o = objptr(obj);
503 >        
504 >        while (!ismaterial(o->otype))   /* find material */
505 >                o = objptr(o->omod);
506 >        return((o->otype==MAT_ILLUM)|(o->otype==MAT_GLOW));
507 > }
508  
509   #define  illumblock(m, r)       (!(source[r->rsrc].sflags&SVIRTUAL) && \
510                                  r->rod > 0.0 && \
511 <                                weaksrcmod(source[r->rsrc].so->omod))
511 >                                weaksrcmat(source[r->rsrc].so->omod))
512  
513   /* wrongsource *
514   *

Diff Legend

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