--- ray/src/rt/func.h	2003/06/07 00:54:58	2.4
+++ ray/src/rt/func.h	2012/06/09 07:16:47	2.9
@@ -1,4 +1,4 @@
-/* RCSid $Id: func.h,v 2.4 2003/06/07 00:54:58 schorsch Exp $ */
+/* RCSid $Id: func.h,v 2.9 2012/06/09 07:16:47 greg Exp $ */
 /*
  * Header file for modifiers using function files.
  *
@@ -6,31 +6,36 @@
  */
 #ifndef _RAD_FUNC_H_
 #define _RAD_FUNC_H_
+
+#include "calcomp.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-#include "copyright.h"
-
-#include  "calcomp.h"
-
 #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 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