--- ray/src/rt/ambient.h	2005/05/25 18:06:22	2.13
+++ ray/src/rt/ambient.h	2014/04/11 20:31:37	2.19
@@ -1,31 +1,112 @@
-/* RCSid $Id: ambient.h,v 2.13 2005/05/25 18:06:22 greg Exp $ */
+/* RCSid $Id: ambient.h,v 2.19 2014/04/11 20:31:37 greg Exp $ */
 /*
  * Common definitions for interreflection routines.
  *
  * Include after ray.h
  */
+
 #ifndef _RAD_AMBIENT_H_
 #define _RAD_AMBIENT_H_
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#ifdef NEWAMB
+
 /*
+ * Normal and u-vector directions encoded using dircode.c
+ */
+typedef struct ambrec {
+	struct ambrec  *next;	/* next in list */
+	unsigned long  latick;	/* last accessed tick */
+	float  pos[3];		/* position in space */
+	int32  ndir;		/* encoded surface normal */
+	int32  udir;		/* u-vector direction */
+	int    lvl;		/* recursion level of parent ray */
+	float  weight;		/* weight of parent ray */
+	float  rad[2];		/* anisotropic radii (rad[0] <= rad[1]) */
+	COLOR  val;		/* computed ambient value */
+	float  gpos[2];		/* (u,v) gradient wrt. position */
+	float  gdir[2];		/* (u,v) gradient wrt. direction */
+}  AMBVAL;			/* ambient value */
+
+typedef struct ambtree {
+	AMBVAL	*alist;		/* ambient value list */
+	struct ambtree	*kid;	/* 8 child nodes */
+}  AMBTREE;			/* ambient octree */
+
+typedef struct {
+	COLOR  v;		/* division sum (partial) */
+	float  r;		/* 1/distance sum */
+	float  k;		/* variance for this division */
+	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 */
+	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	63	/* number of bytes in portable AMBVAL struct */
+#define  AMBMAGIC	558	/* magic number for ambient value files */
+#define  AMBFMT		"Radiance_ambval"	/* format id string */
+
+					/* 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 double	sumambient(COLOR acol, RAY *r, FVECT rn, int al,
+				AMBTREE *at, FVECT c0, double s);
+extern int	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 int	doambient(COLOR acol, RAY *r, double wt,
+				FVECT uv[2], float rad[2],
+				float gpos[2], float gdir[2]);
+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);
+extern int	writambval(AMBVAL *av, FILE *fp);
+extern int	ambvalOK(AMBVAL *av);
+extern int	readambval(AMBVAL *av, FILE *fp);
+
+#else /* ! NEWAMB */
+
+/*
  * Since we've defined our vectors as float below to save space,
  * watch out for changes in the definitions of VCOPY() and DOT()
  * 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,17 +115,18 @@ 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 {
-	COLOR  acoef;		/* coefficient for rayorigin() */
 	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 */
@@ -65,15 +147,15 @@ extern void	setambient(void);
 extern void	multambient(COLOR aval, RAY *r, FVECT nrm);
 extern void	ambdone(void);
 extern void	ambnotify(OBJECT obj);
-extern double	sumambient(COLOR acol, RAY *r, double rw, FVECT rn, int al,
+extern double	sumambient(COLOR acol, RAY *r, FVECT rn, int al,
 				AMBTREE *at, FVECT c0, double s);
-extern double	makeambient(COLOR acol, RAY *r, COLOR ac, FVECT rn, int al);
+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, COLOR ac, double wt,
+extern double	doambient(COLOR acol, RAY *r, double wt,
 					FVECT pg, FVECT dg);
-extern int	inithemi(AMBHEMI *hp, RAY *r, COLOR ac, double wt);
+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);
@@ -84,10 +166,8 @@ extern int	hasambmagic(FILE *fp);
 extern int	writambval(AMBVAL *av, FILE *fp);
 extern int	ambvalOK(AMBVAL *av);
 extern int	readambval(AMBVAL *av, FILE *fp);
-					/* defined in lookamb.c */
-extern void	lookamb(FILE *fp);
-extern void	writamb(FILE *fp);
 
+#endif	/* ! NEWAMB */
 
 #ifdef __cplusplus
 }