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

Comparing ray/src/rt/source.c (file contents):
Revision 2.84 by greg, Fri Nov 15 20:47:42 2024 UTC vs.
Revision 2.85 by greg, Wed Dec 25 17:40:27 2024 UTC

# Line 219 | Line 219 | freesources(void)                      /* free all source structures */
219  
220  
221   int
222 < srcray(                         /* send a ray to a source, return domega */
223 <        RAY  *sr,               /* returned source ray */
224 <        RAY  *r,                        /* ray which hit object */
222 > srcray(                         /* aim a ray at a source, return domega */
223 >        RAY  *sr,               /* prepared source ray */
224 >        RAY  *r,                        /* originating ray (or NULL) */
225          SRCINDEX  *si                   /* source sample index */
226   )
227   {
# Line 234 | Line 234 | srcray(                                /* send a ray to a source, return domega */
234                  sr->rmax = 0.0;
235  
236          while ((d = nextssamp(sr, si)) != 0.0) {
237 <                sr->rsrc = si->sn;                      /* remember source */
237 >                sr->rsrc = si->sn;              /* remember source */
238                  srcp = source + si->sn;
239                  if (srcp->sflags & SDISTANT) {
240                          if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s))
# Line 610 | Line 610 | srcscatter(                    /* compute source scattering into ray */
610                          sr.rorg[2] = r->rorg[2] + r->rdir[2]*t;
611                          
612                          if (!volumePhotonMapping) {
613 <                                if (srcskip(r->slights[i], r))
613 >                                sr.parent = r;          /* hack for preemptive test */
614 >                                if (srcskip(r->slights[i], &sr))
615                                          continue;
616                                  initsrcindex(&si);      /* sample ray to this source */
617                                  si.sn = r->slights[i];

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)