--- ray/src/rt/ray.h 2003/08/28 03:22:16 2.21 +++ ray/src/rt/ray.h 2005/04/15 04:44:51 2.24 @@ -1,4 +1,4 @@ -/* RCSid $Id: ray.h,v 2.21 2003/08/28 03:22:16 greg Exp $ */ +/* RCSid $Id: ray.h,v 2.24 2005/04/15 04:44:51 greg Exp $ */ /* * ray.h - header file for routines using rays. */ @@ -41,7 +41,6 @@ typedef struct ray { int rsrc; /* source we're aiming for */ OBJECT *clipset; /* set of objects currently clipped */ OBJECT *newcset; /* next clipset, used for transmission */ - void (*revf)(struct ray *); /* evaluation function for this ray */ void (*hitf)(OBJECT *, struct ray *); /* custom hit test */ OBJECT robj; /* intersected object number */ OBJREC *ro; /* intersected object (one with material) */ @@ -53,7 +52,7 @@ typedef struct ray { RREAL uv[2]; /* local coordinates */ FVECT pert; /* surface normal perturbation */ COLOR pcol; /* pattern color */ - COLOR rcol; /* returned ray value */ + COLOR rcol; /* returned radiance value */ double rt; /* returned effective ray length */ COLOR cext; /* medium extinction coefficient */ COLOR albedo; /* medium scattering albedo */ @@ -61,8 +60,6 @@ typedef struct ray { int *slights; /* list of lights to test for scattering */ } RAY; -#define rayvalue(r) (*(r)->revf)(r) - extern char VersionID[]; /* Radiance version ID string */ extern CUBE thescene; /* our scene */ @@ -119,8 +116,10 @@ extern int ambincl; /* include == 1, exclude == 0 */ extern int ray_pnprocs; /* number of child processes */ extern int ray_pnidle; /* number of idle processes */ -#define AMBLLEN 128 /* max. ambient list length */ -#define AMBWORD 8 /* average word length */ +#ifndef AMBLLEN +#define AMBLLEN 512 /* max. ambient list length */ +#endif +#define AMBWORD 12 /* average word length */ typedef struct { /* rendering parameter holder */ int do_irrad; @@ -160,6 +159,8 @@ typedef struct { /* rendering parameter holder */ extern void headclean(void); extern void openheader(void); extern void dupheader(void); + /* defined in persist.c */ +extern void persistfile(char *pfn); extern void pfdetach(void); extern void pfclean(void); extern void pflock(int lf); @@ -189,7 +190,7 @@ extern void ray_pclose(int nsub); /* defined in raytrace.c */ extern int rayorigin(RAY *r, RAY *ro, int rt, double rw); extern void rayclear(RAY *r); -extern void raytrace(RAY *r); +extern void rayvalue(RAY *r); extern void rayhit(OBJECT *oset, RAY *r); extern void raycont(RAY *r); extern void raytrans(RAY *r); @@ -208,8 +209,12 @@ extern void print_rdefaults(void); /* defined in srcdraw.c */ extern void drawsources(COLOR *pic[], float *zbf[], int x0, int xsiz, int y0, int ysiz); +extern void init_drawsources(int rad); + /* defined in rt/initotypes.c */ +extern void initotypes(void); /* module main procedures */ extern void rtrace(char *fname); +extern char * formstr(int f); extern void rview(void); extern void rpict(int seq, char *pout, char *zout, char *prvr);