--- ray/src/rt/ambient.h	1992/07/16 12:08:46	2.3
+++ ray/src/rt/ambient.h	2003/06/07 00:54:58	2.9
@@ -1,17 +1,25 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: ambient.h,v 2.9 2003/06/07 00:54:58 schorsch Exp $ */
 /*
  * Common definitions for interreflection routines.
+ *
+ * Include after ray.h
  */
+#ifndef _RAD_AMBIENT_H_
+#define _RAD_AMBIENT_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
+
+#include "copyright.h"
+
 /*
  * 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 {
+	unsigned long  latick;	/* last accessed tick */
 	float  pos[3];		/* position in space */
 	float  dir[3];		/* normal direction */
 	int  lvl;		/* recursion level of parent ray */
@@ -23,21 +31,65 @@ typedef struct ambrec {
 	struct ambrec  *next;	/* next in list */
 }  AMBVAL;			/* ambient value */
 
-extern COLOR  ambval;		/* global ambient component */
-extern double  ambacc;		/* ambient accuracy */
-extern int  ambres;		/* ambient resolution */
-extern int  ambdiv;		/* number of divisions for calculation */
-extern int  ambssamp;		/* number of super-samples */
-extern int  ambounce;		/* number of ambient bounces */
-extern char  *amblist[];	/* ambient include/exclude list */
-extern int  ambincl;		/* include == 1, exclude == 0 */
+typedef struct ambtree {
+	AMBVAL	*alist;		/* ambient value list */
+	struct ambtree	*kid;	/* 8 child nodes */
+}  AMBTREE;			/* ambient octree */
+
+typedef struct {
+	short  t, p;		/* theta, phi indices */
+	COLOR  v;		/* value sum */
+	float  r;		/* 1/distance sum */
+	float  k;		/* variance for this division */
+	int  n;			/* number of subsamples */
+}  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 */
+}  AMBHEMI;		/* ambient sample hemisphere */
+
 extern double  maxarad;		/* maximum ambient radius */
 extern double  minarad;		/* minimum ambient radius */
 
-extern double  sumambient(), doambient(), makeambient();
-
 #define  AVGREFL	0.5	/* assumed average reflectance */
 
 #define  AMBVALSIZ	75	/* number of bytes in portable AMBVAL struct */
-#define  AMBMAGIC	357	/* magic number for ambient value files */
+#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	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 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);
+					/* defined in lookamb.c */
+extern void	lookamb(FILE *fp);
+extern void	writamb(FILE *fp);
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_AMBIENT_H_ */
+