--- ray/src/rt/ray.h	2004/03/30 16:13:01	2.22
+++ ray/src/rt/ray.h	2005/04/19 01:15:06	2.25
@@ -1,4 +1,4 @@
-/* RCSid $Id: ray.h,v 2.22 2004/03/30 16:13:01 schorsch Exp $ */
+/* RCSid $Id: ray.h,v 2.25 2005/04/19 01:15:06 greg Exp $ */
 /*
  *  ray.h - header file for routines using rays.
  */
@@ -31,17 +31,17 @@ 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 *);	/* evaluation function for this ray */
 	void	(*hitf)(OBJECT *, struct ray *);	/* custom hit test */
 	OBJECT	robj;		/* intersected object number */
  	OBJREC	*ro;		/* intersected object (one with material) */
@@ -53,7 +53,7 @@ typedef struct ray {
 	RREAL	uv[2];		/* local coordinates */
 	FVECT	pert;		/* surface normal perturbation */
 	COLOR	pcol;		/* pattern color */
-	COLOR	rcol;		/* returned ray value */
+	COLOR	rcol;		/* returned radiance value */
 	double	rt;		/* returned effective ray length */
 	COLOR	cext;		/* medium extinction coefficient */
 	COLOR	albedo;		/* medium scattering albedo */
@@ -61,8 +61,6 @@ 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 */
@@ -119,8 +117,10 @@ extern int	ambincl;	/* include == 1, exclude == 0 */
 extern int	ray_pnprocs;	/* number of child processes */
 extern int	ray_pnidle;	/* number of idle processes */
 
-#define AMBLLEN		128	/* max. ambient list length */
-#define AMBWORD		8	/* average word length */
+#ifndef AMBLLEN
+#define AMBLLEN		512	/* max. ambient list length */
+#endif
+#define AMBWORD		12	/* average word length */
 
 typedef struct {		/* rendering parameter holder */
 	int	do_irrad;
@@ -189,9 +189,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	raytrace(RAY *r);
+extern void	rayvalue(RAY *r);
 extern void	rayhit(OBJECT *oset, RAY *r);
 extern void	raycont(RAY *r);
 extern void	raytrans(RAY *r);
@@ -199,7 +199,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(COLOR rc, 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);