--- ray/src/rt/ray.h	2005/04/15 04:44:51	2.24
+++ ray/src/rt/ray.h	2005/06/21 15:06:50	2.28
@@ -1,4 +1,4 @@
-/* RCSid $Id: ray.h,v 2.24 2005/04/15 04:44:51 greg Exp $ */
+/* RCSid $Id: ray.h,v 2.28 2005/06/21 15:06:50 greg Exp $ */
 /*
  *  ray.h - header file for routines using rays.
  */
@@ -31,16 +31,18 @@ extern "C" {
 typedef struct ray {
 	unsigned long  rno;	/* unique ray number */
 	int	rlvl;		/* number of reflections for this ray */
-	float	rweight;	/* cumulative weight of this ray */
+	float	rweight;	/* cumulative weight (for termination) */
+	COLOR	rcoef;		/* contribution coefficient w.r.t. parent */
 	short	rtype;		/* ray type */
 	short	crtype;		/* cumulative ray type */
-	struct ray  *parent;	/* ray this originated from */
+	const struct ray  *parent;	/* ray this originated from */
 	FVECT	rorg;		/* origin of ray */
 	FVECT	rdir;		/* normalized direction of ray */
 	double	rmax;		/* maximum distance (aft clipping plane) */
 	int	rsrc;		/* source we're aiming for */
 	OBJECT	*clipset;	/* set of objects currently clipped */
 	OBJECT	*newcset;	/* next clipset, used for transmission */
+	void	(*revf)(struct ray *);	/* ray evaluation function */
 	void	(*hitf)(OBJECT *, struct ray *);	/* custom hit test */
 	OBJECT	robj;		/* intersected object number */
  	OBJREC	*ro;		/* intersected object (one with material) */
@@ -60,6 +62,8 @@ typedef struct ray {
 	int	*slights;	/* list of lights to test for scattering */
 }  RAY;
 
+#define  rayvalue(r)	(*(r)->revf)(r)
+
 extern char  VersionID[];	/* Radiance version ID string */
 
 extern CUBE	thescene;	/* our scene */
@@ -81,6 +85,8 @@ extern int	ray_savesiz;	/* size of parameter save buff
 
 extern int	do_irrad;	/* compute irradiance? */
 
+extern int	rand_samp;	/* pure Monte Carlo sampling? */
+
 extern double	dstrsrc;	/* square source distribution */
 extern double	shadthresh;	/* shadow threshold */
 extern double	shadcert;	/* shadow testing certainty */
@@ -123,6 +129,7 @@ extern int	ray_pnidle;	/* number of idle processes */
 
 typedef struct {		/* rendering parameter holder */
 	int	do_irrad;
+	int	rand_samp;
 	double	dstrsrc;
 	double	shadthresh;
 	double	shadcert;
@@ -188,9 +195,9 @@ extern void	ray_pdone(int freall);
 extern void	ray_popen(int nadd);
 extern void	ray_pclose(int nsub);
 					/* defined in raytrace.c */
-extern int	rayorigin(RAY *r, RAY *ro, int rt, double rw);
+extern int	rayorigin(RAY *r, int rt, const RAY *ro, const COLOR rc);
 extern void	rayclear(RAY *r);
-extern void	rayvalue(RAY *r);
+extern void	raytrace(RAY *r);
 extern void	rayhit(OBJECT *oset, RAY *r);
 extern void	raycont(RAY *r);
 extern void	raytrans(RAY *r);
@@ -198,7 +205,8 @@ extern int	rayshade(RAY *r, int mod);
 extern void	rayparticipate(RAY *r);
 extern void	raytexture(RAY *r, OBJECT mod);
 extern int	raymixture(RAY *r, OBJECT fore, OBJECT back, double coef);
-extern double	raydist(RAY *r, int flags);
+extern void	raycontrib(double rc[3], const RAY *r, int flags);
+extern double	raydist(const RAY *r, int flags);
 extern double	raynormal(FVECT norm, RAY *r);
 extern void	newrayxf(RAY *r);
 extern void	flipsurface(RAY *r);