--- ray/src/rt/ray.h	2004/11/05 17:36:55	2.23
+++ ray/src/rt/ray.h	2009/12/12 05:20:10	2.31
@@ -1,4 +1,4 @@
-/* RCSid $Id: ray.h,v 2.23 2004/11/05 17:36:55 greg Exp $ */
+/* RCSid $Id: ray.h,v 2.31 2009/12/12 05:20:10 greg Exp $ */
 /*
  *  ray.h - header file for routines using rays.
  */
@@ -14,6 +14,10 @@
 extern "C" {
 #endif
 
+#ifndef RNUMBER
+#define RNUMBER		unsigned long	/* ray counter (>= sizeof pointer) */
+#endif
+
 #define  MAXDIM		32	/* maximum number of dimensions */
 
 				/* ray type flags */
@@ -28,37 +32,41 @@ extern "C" {
 				/* reflected ray types */
 #define  RAYREFL	(SHADOW|REFLECTED|AMBIENT|SPECULAR)
 
+/* Arrange so double's come first for optimal alignment */
+/* Pointers and long's come second for 64-bit mode */
+/* Int's next (unknown length), then floats, followed by short's & char's */
 typedef struct ray {
-	unsigned long  rno;	/* unique ray number */
-	int	rlvl;		/* number of reflections for this ray */
-	float	rweight;	/* cumulative weight of this ray */
-	short	rtype;		/* ray type */
-	short	crtype;		/* cumulative ray type */
-	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 */
+	RREAL	rmax;		/* maximum distance (aft clipping plane) */
+	RREAL	rot;		/* distance to object */
+	FVECT	rop;		/* intersection point */
+	FVECT	ron;		/* intersection surface normal */
+	RREAL	rod;		/* -DOT(rdir, ron) */
+	RREAL	uv[2];		/* local coordinates */
+	FVECT	pert;		/* surface normal perturbation */
+	RREAL	rt;		/* returned effective ray length */
+	const struct ray  *parent;	/* ray this originated from */
 	OBJECT	*clipset;	/* set of objects currently clipped */
 	OBJECT	*newcset;	/* next clipset, used for transmission */
-	void	(*revf)(struct ray *);	/* evaluation function for this ray */
+	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) */
-	double	rot;		/* distance to object */
-	FVECT	rop;		/* intersection point */
-	FVECT	ron;		/* intersection surface normal */
-	double	rod;		/* -DOT(rdir, ron) */
 	FULLXF	*rox;		/* object transformation */
-	RREAL	uv[2];		/* local coordinates */
-	FVECT	pert;		/* surface normal perturbation */
+	int	*slights;	/* list of lights to test for scattering */
+	RNUMBER	rno;		/* unique ray number */
+	int	rlvl;		/* number of reflections for this ray */
+	int	rsrc;		/* source we're aiming for */
+	float	rweight;	/* cumulative weight (for termination) */
+	COLOR	rcoef;		/* contribution coefficient w.r.t. parent */
 	COLOR	pcol;		/* pattern color */
-	COLOR	rcol;		/* returned ray value */
-	double	rt;		/* returned effective ray length */
+	COLOR	rcol;		/* returned radiance value */
 	COLOR	cext;		/* medium extinction coefficient */
 	COLOR	albedo;		/* medium scattering albedo */
 	float	gecc;		/* scattering eccentricity coefficient */
-	int	*slights;	/* list of lights to test for scattering */
+	OBJECT	robj;		/* intersected object number */
+	short	rtype;		/* ray type */
+	short	crtype;		/* cumulative ray type */
 }  RAY;
 
 #define  rayvalue(r)	(*(r)->revf)(r)
@@ -84,6 +92,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 */
@@ -126,6 +136,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;
@@ -190,8 +201,12 @@ extern int	ray_presult(RAY *r, int poll);
 extern void	ray_pdone(int freall);
 extern void	ray_popen(int nadd);
 extern void	ray_pclose(int nsub);
+					/* defined in ray_fifo.c */
+extern int	(*ray_fifo_out)(RAY *r);
+extern int	ray_fifo_in(RAY *r);
+extern int	ray_fifo_flush(void);
 					/* 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	rayhit(OBJECT *oset, RAY *r);
@@ -201,7 +216,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);