--- ray/src/rt/func.h	1991/11/25 09:49:47	2.1
+++ ray/src/rt/func.h	2012/06/09 07:16:47	2.9
@@ -1,23 +1,45 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: func.h,v 2.9 2012/06/09 07:16:47 greg Exp $ */
 /*
  * Header file for modifiers using function files.
- * Include after standard.h.
+ *
+ * Include after ray.h
  */
+#ifndef _RAD_FUNC_H_
+#define _RAD_FUNC_H_
 
-#include  "calcomp.h"
+#include "calcomp.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define  MAXEXPR	9	/* maximum expressions in modifier */
 
 typedef struct {
 	EPNODE  *ep[MAXEXPR+1];		/* NULL-terminated expression list */
 	char  *ctx;			/* context (from file name) */
-	XF  *f, *b;			/* forward and backward transforms */
+	XF  *fxp, *bxp;			/* forward and backward transforms */
 } MFUNC;			/* material function */
 
 extern XF  unitxf;		/* identity transform */
 extern XF  funcxf;		/* current transform */
 
-extern MFUNC  *getfunc();	/* get MFUNC structure for modifier */
+extern void	initfunc(void);
+extern MFUNC	*getfunc(OBJREC *m, int ff, unsigned int ef, int dofwd);
+extern void	freefunc(OBJREC *m);
+extern int	setfunc(OBJREC *m, RAY *r);
+extern int	worldfunc(char *ctx, RAY *r);
+extern void	loadfunc(char *fname);
+
+	/* defined in noise3.c */
+extern void	setnoisefuncs(void);
+
+	/* defined in fprism.c */
+extern void	setprismfuncs(void);
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_FUNC_H_ */
+