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

Comparing ray/src/rt/ray.h (file contents):
Revision 2.35 by greg, Tue Oct 26 03:45:35 2010 UTC vs.
Revision 2.39 by greg, Tue Nov 13 19:58:33 2018 UTC

# Line 9 | Line 9
9   #include  "octree.h"
10   #include  "object.h"
11   #include  "color.h"
12 + #include  "pmapparm.h"
13  
14   #ifdef __cplusplus
15   extern "C" {
# Line 45 | Line 46 | typedef struct ray {
46          RREAL   rod;            /* -DOT(rdir, ron) */
47          RREAL   uv[2];          /* local coordinates */
48          FVECT   pert;           /* surface normal perturbation */
49 <        RREAL   rt;             /* returned effective ray length */
49 >        RREAL   rmt;            /* returned mirrored ray length */
50 >        RREAL   rxt;            /* returned unmirrored ray length */
51          const struct ray  *parent;      /* ray this originated from */
52          OBJECT  *clipset;       /* set of objects currently clipped */
53          OBJECT  *newcset;       /* next clipset, used for transmission */
# Line 60 | Line 62 | typedef struct ray {
62          float   rweight;        /* cumulative weight (for termination) */
63          COLOR   rcoef;          /* contribution coefficient w.r.t. parent */
64          COLOR   pcol;           /* pattern color */
65 +        COLOR   mcol;           /* mirrored color contribution */
66          COLOR   rcol;           /* returned radiance value */
67          COLOR   cext;           /* medium extinction coefficient */
68          COLOR   albedo;         /* medium scattering albedo */
# Line 71 | Line 74 | typedef struct ray {
74  
75   #define  rayvalue(r)    (*(r)->revf)(r)
76  
77 + #define  raydistance(r) (bright((r)->mcol) > 0.5*bright((r)->rcol) ? \
78 +                                (r)->rmt : (r)->rxt)
79 +
80   extern char  VersionID[];       /* Radiance version ID string */
81  
82   extern CUBE     thescene;       /* our scene */
# Line 164 | Line 170 | typedef struct {               /* rendering parameter holder */
170          int     ambincl;
171          short   amblndx[AMBLLEN+1];
172          char    amblval[AMBLLEN*AMBWORD];
173 +        
174 +        /* PMAP: photon mapping parameters */
175 +        PhotonMapParams pmapParams [NUM_PMAP_TYPES];
176   } RAYPARAMS;
177  
178   #define rpambmod(p,i)   ( (i)>=AMBLLEN||(p)->amblndx[i]<0 ? \
# Line 216 | Line 225 | extern int     rayshade(RAY *r, int mod);
225   extern void     rayparticipate(RAY *r);
226   extern void     raytexture(RAY *r, OBJECT mod);
227   extern int      raymixture(RAY *r, OBJECT fore, OBJECT back, double coef);
228 < extern void     raycontrib(double rc[3], const RAY *r, int flags);
228 > extern void     raycontrib(RREAL rc[3], const RAY *r, int flags);
229   extern double   raydist(const RAY *r, int flags);
230   extern double   raynormal(FVECT norm, RAY *r);
231   extern void     newrayxf(RAY *r);
# Line 238 | Line 247 | extern void    rview(void);
247   extern void     rpict(int seq, char *pout, char *zout, char *prvr);
248  
249   #ifdef __FAST_MATH__
250 < #define checknorm(vn)   normalize(vn)
250 > #define checknorm(vn)   (void)normalize(vn)
251   #else
252 < #define checknorm(vn)   1.0
252 > #define checknorm(vn)
253   #endif
254  
255   #ifdef __cplusplus

Diff Legend

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