--- ray/src/rt/ambient.h	2003/06/27 06:53:22	2.10
+++ ray/src/rt/ambient.h	2011/09/22 02:15:56	2.18
@@ -1,4 +1,4 @@
-/* RCSid $Id: ambient.h,v 2.10 2003/06/27 06:53:22 greg Exp $ */
+/* RCSid $Id: ambient.h,v 2.18 2011/09/22 02:15:56 greg Exp $ */
 /*
  * Common definitions for interreflection routines.
  *
@@ -16,16 +16,16 @@ extern "C" {
  * and don't pass these vectors to fvect routines.
  */
 typedef struct ambrec {
+	struct ambrec  *next;	/* next in list */
 	unsigned long  latick;	/* last accessed tick */
 	float  pos[3];		/* position in space */
 	float  dir[3];		/* normal direction */
-	int  lvl;		/* recursion level of parent ray */
+	int    lvl;		/* recursion level of parent ray */
 	float  weight;		/* weight of parent ray */
 	float  rad;		/* validity radius */
 	COLOR  val;		/* computed ambient value */
 	float  gpos[3];		/* gradient wrt. position */
 	float  gdir[3];		/* gradient wrt. direction */
-	struct ambrec  *next;	/* next in list */
 }  AMBVAL;			/* ambient value */
 
 typedef struct ambtree {
@@ -34,46 +34,51 @@ typedef struct ambtree {
 }  AMBTREE;			/* ambient octree */
 
 typedef struct {
-	short  t, p;		/* theta, phi indices */
-	COLOR  v;		/* value sum */
+	COLOR  v;		/* division sum (partial) */
 	float  r;		/* 1/distance sum */
 	float  k;		/* variance for this division */
-	int  n;			/* number of subsamples */
+	int    n;		/* number of subsamples */
+	unsigned short  t, p;	/* theta, phi indices */
 }  AMBSAMP;		/* ambient sample division */
 
 typedef struct {
 	FVECT  ux, uy, uz;	/* x, y and z axis directions */
-	short  nt, np;		/* number of theta and phi directions */
+	COLOR  acoef;		/* division contribution coefficient */
+	int    ns;		/* number of super-samples */
+	int    nt, np;		/* number of theta and phi directions */
 }  AMBHEMI;		/* ambient sample hemisphere */
 
 extern double  maxarad;		/* maximum ambient radius */
 extern double  minarad;		/* minimum ambient radius */
 
+#ifndef AVGREFL
 #define  AVGREFL	0.5	/* assumed average reflectance */
+#endif
 
 #define  AMBVALSIZ	75	/* number of bytes in portable AMBVAL struct */
 #define  AMBMAGIC	557	/* magic number for ambient value files */
 #define  AMBFMT		"Radiance_ambval"	/* format id string */
 
-					/* defined in ambcomp.c */
-extern int	divsample(AMBSAMP *dp, AMBHEMI *h, RAY *r);
-extern double	doambient(COLOR acol, RAY *r, double wt, FVECT pg, FVECT dg);
-extern void	inithemi(AMBHEMI *hp, RAY *r, double wt);
-extern void	comperrs(AMBSAMP *da, AMBHEMI *hp);
-extern void	posgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
-extern void	dirgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
 					/* defined in ambient.c */
 extern void	setambres(int ar);
 extern void	setambacc(double newa);
 extern void	setambient(void);
+extern void	multambient(COLOR aval, RAY *r, FVECT nrm);
 extern void	ambdone(void);
 extern void	ambnotify(OBJECT obj);
-extern void	ambient(COLOR acol, RAY *r, FVECT nrm);
 extern double	sumambient(COLOR acol, RAY *r, FVECT rn, int al,
 				AMBTREE *at, FVECT c0, double s);
 extern double	makeambient(COLOR acol, RAY *r, FVECT rn, int al);
 extern void	extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
 extern int	ambsync(void);
+					/* defined in ambcomp.c */
+extern double	doambient(COLOR acol, RAY *r, double wt,
+					FVECT pg, FVECT dg);
+extern void	inithemi(AMBHEMI *hp, COLOR ac, RAY *r, double wt);
+extern int	divsample(AMBSAMP *dp, AMBHEMI *h, RAY *r);
+extern void	comperrs(AMBSAMP *da, AMBHEMI *hp);
+extern void	posgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
+extern void	dirgradient(FVECT gv, AMBSAMP *da, AMBHEMI *hp);
 					/* defined in ambio.c */
 extern void	putambmagic(FILE *fp);
 extern int	hasambmagic(FILE *fp);