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

Comparing ray/src/rt/pmapdata.h (file contents):
Revision 2.1 by greg, Tue Feb 24 19:39:26 2015 UTC vs.
Revision 2.8 by greg, Tue Aug 18 18:45:55 2015 UTC

# Line 1 | Line 1
1 + /* RCSid $Id$ */
2   /*
3     ==================================================================
4     Photon map data structures and kd-tree handling  
5  
6     Roland Schregle (roland.schregle@{hslu.ch, gmail.com})
7     (c) Fraunhofer Institute for Solar Energy Systems,
8 <       Lucerne University of Applied Sciences & Arts  
8 >   (c) Lucerne University of Applied Sciences and Arts,
9 >   supported by the Swiss National Science Foundation (SNSF, #147053)
10     ==================================================================
11    
12     $Id$
# Line 33 | Line 35
35  
36     /* Primary photon ray for light source contributions */
37     typedef struct {
38 <      short srcIdx;               /* Index of emitting light source */
39 <      float dir [3], org [3];     /* Incident dir & origin on source */
38 >      int32 srcIdx;               /* Index of emitting light source */
39 >      int32 dir;                  /* Encoded ray direction */
40 >      float pos [3];              /* Hit point */
41     } PhotonPrimary;
42        
43     #define photonSrcIdx(pm, p) ((pm) -> primary [(p) -> primary].srcIdx)
# Line 52 | Line 55
55           COLR flux;                  /* Photon flux */
56        #endif
57  
58 <      unsigned primary;              /* Index to primary ray */
58 >      uint32 primary;              /* Index to primary ray */
59     } Photon;
60    
61     /* Photon flag bitmasks and manipulation macros */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines