--- ray/src/gen/mkillum.h 2010/09/03 23:53:50 2.18 +++ ray/src/gen/mkillum.h 2012/10/13 20:15:43 2.19 @@ -1,4 +1,4 @@ -/* RCSid: $Id: mkillum.h,v 2.18 2010/09/03 23:53:50 greg Exp $ */ +/* RCSid: $Id: mkillum.h,v 2.19 2012/10/13 20:15:43 greg Exp $ */ /* * Common definitions for mkillum */ @@ -7,7 +7,6 @@ #include "ray.h" #include "otypes.h" -#include "bsdf.h" #include "random.h" #ifdef __cplusplus @@ -21,7 +20,6 @@ extern "C" { struct illum_args { int flags; /* flags from list above */ - UpDir udir; /* up direction */ double thick; /* object thickness */ char matname[MAXSTR]; /* illum material name */ char datafile[MAXSTR]; /* distribution data file name */ @@ -29,15 +27,10 @@ struct illum_args { char altmat[MAXSTR]; /* alternate material name */ int sampdens; /* point sample density */ int nsamps; /* # of samples in each direction */ - struct BSDF_data - *sd; /* scattering data (if set) */ float minbrt; /* minimum average brightness */ COLOR col; /* computed average color */ }; /* illum options */ -extern void redistribute(struct BSDF_data *b, int nalt, int nazi, - FVECT u, FVECT v, FVECT w, MAT4 xm); - extern void printobj(char *mod, OBJREC *obj); extern int average(struct illum_args *il, COLORV *da, int n); extern void flatout(struct illum_args *il, COLORV *da, int n, int m, @@ -53,9 +46,6 @@ extern void rayclean(void); extern void flatdir(FVECT dv, double alt, double azi); extern int flatindex(FVECT dv, int nalt, int nazi); -extern int printgeom(struct BSDF_data *sd, char *xfrot, - FVECT ctr, double s1, double s2); - extern int my_default(OBJREC *, struct illum_args *, char *); extern int my_face(OBJREC *, struct illum_args *, char *); extern int my_sphere(OBJREC *, struct illum_args *, char *); @@ -63,7 +53,6 @@ extern int my_ring(OBJREC *, struct illum_args *, char extern COLORV * distarr; /* distribution array */ extern int distsiz; -extern COLORV * direct_discount; /* amount to take off direct */ extern char *progname;