--- ray/src/rt/func.h 2004/03/30 16:13:01 2.7 +++ ray/src/rt/func.h 2011/02/18 00:40:25 2.8 @@ -1,4 +1,4 @@ -/* RCSid $Id: func.h,v 2.7 2004/03/30 16:13:01 schorsch Exp $ */ +/* RCSid $Id: func.h,v 2.8 2011/02/18 00:40:25 greg Exp $ */ /* * Header file for modifiers using function files. * @@ -7,9 +7,7 @@ #ifndef _RAD_FUNC_H_ #define _RAD_FUNC_H_ -#include "ray.h" -#include "object.h" -#include "calcomp.h" +#include "calcomp.h" #ifdef __cplusplus extern "C" { @@ -27,17 +25,16 @@ extern XF unitxf; /* identity transform */ extern XF funcxf; /* current transform */ -extern MFUNC *getfunc(OBJREC *m, int ff, unsigned int ef, int dofwd); +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 void loadfunc(char *fname); /* defined in noise3.c */ -extern void setnoisefuncs(void); +extern void setnoisefuncs(void); /* defined in fprism.c */ -extern void setprismfuncs(void); - +extern void setprismfuncs(void); #ifdef __cplusplus