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

Comparing ray/src/rt/pmapdata.h (file contents):
Revision 2.3 by greg, Wed May 20 12:58:31 2015 UTC vs.
Revision 2.9 by greg, Tue Sep 1 16:27:52 2015 UTC

# Line 1 | Line 1
1 + /* RCSid $Id$ */
2   /*
3     ==================================================================
4     Photon map data structures and kd-tree handling  
# Line 8 | Line 9
9     supported by the Swiss National Science Foundation (SNSF, #147053)
10     ==================================================================
11    
11 –   $Id$
12   */
13  
14  
# Line 34 | Line 34
34  
35     /* Primary photon ray for light source contributions */
36     typedef struct {
37 <      short srcIdx;               /* Index of emitting light source */
38 <      float dir [3], pos [3];     /* Incident dir & hit point */
37 >      int32 srcIdx;               /* Index of emitting light source */
38 >      int32 dir;                  /* Encoded ray direction */
39 >      float pos [3];              /* Hit point */
40     } PhotonPrimary;
41        
42     #define photonSrcIdx(pm, p) ((pm) -> primary [(p) -> primary].srcIdx)
# Line 53 | Line 54
54           COLR flux;                  /* Photon flux */
55        #endif
56  
57 <      unsigned primary;              /* Index to primary ray */
57 >      uint32 primary;              /* Index to primary ray */
58     } Photon;
59    
60     /* Photon flag bitmasks and manipulation macros */

Diff Legend

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