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 1.46 by greg, Mon Oct 21 14:23:36 1991 UTC vs.
Revision 2.1 by greg, Tue Nov 12 17:08:57 1991 UTC

# Line 100 | Line 100 | marksources()                  /* find and mark source objects */
100          }
101          markvirtuals();                 /* find and add virtual sources */
102                                  /* allocate our contribution arrays */
103 <        maxcntr = nsources + MAXSPART*2;        /* start with this many */
103 >        maxcntr = nsources + MAXSPART;  /* start with this many */
104          srccnt = (CONTRIB *)malloc(maxcntr*sizeof(CONTRIB));
105          cntord = (CNTPTR *)malloc(maxcntr*sizeof(CNTPTR));
106 <        if (srccnt == NULL || cntord == NULL)
106 >        if (srccnt == NULL | cntord == NULL)
107                  goto memerr;
108          return;
109   memerr:
# Line 123 | Line 123 | SRCINDEX  *si;                 /* source sample index */
123  
124      rayorigin(sr, r, SHADOW, 1.0);              /* ignore limits */
125  
126 <    while ((d = nextssamp(sr->rorg, sr->rdir, si)) != 0.0) {
126 >    while ((d = nextssamp(sr, si)) != 0.0) {
127          sr->rsrc = si->sn;                      /* remember source */
128          srcp = source + si->sn;
129          if (srcp->sflags & SDISTANT) {
# Line 228 | Line 228 | char  *p;                      /* data for f */
228                                          maxcntr*sizeof(CONTRIB));
229                          cntord = (CNTPTR *)realloc((char *)cntord,
230                                          maxcntr*sizeof(CNTPTR));
231 <                        if (srccnt == NULL || cntord == NULL)
231 >                        if (srccnt == NULL | cntord == NULL)
232                                  error(SYSTEM, "out of memory in direct");
233                  }
234                  cntord[sn].sndx = sn;

Diff Legend

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