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

Comparing ray/src/rt/pmapcontrib.c (file contents):
Revision 2.6 by greg, Wed May 20 13:43:28 2015 UTC vs.
Revision 2.7 by greg, Wed May 20 14:44:12 2015 UTC

# Line 154 | Line 154 | void photonContrib (PhotonMap *pmap, RAY *ray, COLOR i
154        if (pmap -> srcContrib) {
155           const PhotonPrimary *primary = pmap -> primary +
156                                          sq -> photon -> primary;
157 <         SRCREC *sp = &source[primary -> srcIdx];
157 >         const SRCREC *sp = &source[primary -> srcIdx];
158           OBJREC *srcMod = objptr(sp -> so -> omod);
159           MODCONT *srcContrib = (MODCONT*)lu_find(pmap -> srcContrib,
160                                                   srcMod -> oname) -> data;
# Line 174 | Line 174 | void photonContrib (PhotonMap *pmap, RAY *ray, COLOR i
174              rayorigin(&srcRay, SHADOW, NULL, NULL);
175              srcRay.rsrc = primary -> srcIdx;
176              VCOPY(srcRay.rorg, primary -> pos);
177 <            VCOPY(srcRay.rdir, primary -> dir);
178 <            if (!(source [primary -> srcIdx].sflags & SDISTANT ?
179 <                        sourcehit(&srcRay) :
180 <                        (*ofun[sp -> so -> otype].funp)(sp -> so, &srcRay)))
177 >            decodedir(srcRay.rdir, primary -> dir);
178 >
179 >            if (!(sp->sflags & SDISTANT ? sourcehit(&srcRay)
180 >                        : (*ofun[sp -> so -> otype].funp)(sp -> so, &srcRay)))
181                  continue;               /* XXX shouldn't happen! */
182 +
183              worldfunc(RCCONTEXT, &srcRay);
184              set_eparams((char *)srcContrib -> params);
185           }

Diff Legend

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