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

Comparing ray/src/rt/pmapdata.c (file contents):
Revision 2.4 by greg, Wed May 20 12:58:31 2015 UTC vs.
Revision 2.6 by greg, Thu May 21 13:54:59 2015 UTC

# Line 66 | Line 66 | void initPhotonMap (PhotonMap *pmap, PhotonMapType t)
66   const PhotonPrimary* addPhotonPrimary (PhotonMap *pmap, const RAY *ray)
67   {
68     PhotonPrimary *prim = NULL;
69 +   FVECT dvec;
70    
71     if (!pmap || !ray)
72        return NULL;
# Line 98 | Line 99 | const PhotonPrimary* addPhotonPrimary (PhotonMap *pmap
99     prim -> srcIdx = -1;
100        
101     /* Reverse incident direction to point to light source */
102 <   prim -> dir [0] = -ray -> rdir [0];
103 <   prim -> dir [1] = -ray -> rdir [1];
104 <   prim -> dir [2] = -ray -> rdir [2];
102 >   dvec [0] = -ray -> rdir [0];
103 >   dvec [1] = -ray -> rdir [1];
104 >   dvec [2] = -ray -> rdir [2];
105 >   prim -> dir = encodedir(dvec);
106  
107     VCOPY(prim -> pos, ray -> rop);
108    
# Line 238 | Line 240 | static void nearestNeighbours (PhotonMap* pmap, const
240        if (srcIdx < 0 || srcIdx >= nsources)
241           error(INTERNAL, "invalid light source index in photon map");
242        
243 <      srcMod = objptr(source [srcIdx].so -> omod);
243 >      srcMod = findmaterial(source [srcIdx].so);
244  
245        /* Reject photon if contributions from light source which emitted it
246         * are not sought */

Diff Legend

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