ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/ray.h

Comparing ray/src/rt/ray.h (file contents):
Revision 2.38 by greg, Tue Feb 24 19:39:27 2015 UTC vs.
Revision 2.39 by greg, Tue Nov 13 19:58:33 2018 UTC

#	Line 46 | 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 61 | 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 73 | typedef struct ray {
73		}  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

Diff Legend

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