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.1 by greg, Tue Feb 24 19:39:26 2015 UTC vs.
Revision 2.4 by greg, Wed May 20 14:15:26 2015 UTC

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

Diff Legend

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