--- ray/src/hd/rholo.h 1997/12/08 18:51:15 3.8 +++ ray/src/hd/rholo.h 1998/05/22 08:30:40 3.13 @@ -44,8 +44,8 @@ typedef struct { #define GRID 7 /* target grid size */ #define OBSTRUCTIONS 8 /* shall we track obstructions? */ #define VDIST 9 /* virtual distance calculation */ -#define OCCUPANCY 10 /* expected occupancy probability */ -#define REPORT 11 /* report interval and error file */ +#define REPORT 10 /* report interval and error file */ +#define EYESEP 11 /* eye separation distance */ #define NRHVARS 12 /* number of variables */ @@ -60,8 +60,8 @@ typedef struct { {"GRID", 2, 0, NULL, fltvalue}, \ {"OBSTRUCTIONS",3, 0, NULL, boolvalue}, \ {"VDISTANCE", 2, 0, NULL, boolvalue}, \ - {"OCCUPANCY", 3, 0, NULL, onevalue}, \ {"REPORT", 3, 0, NULL, onevalue}, \ + {"EYESEP", 3, 0, NULL, fltvalue}, \ } /* bundle set requests */ @@ -78,15 +78,21 @@ extern char *outdev; /* output device name */ extern int readinp; /* read input from stdin */ +extern int force; /* allow overwrite of holodeck */ + extern int nowarn; /* turn warnings off? */ -extern int ncprocs; /* number of compute processes */ +extern int ncprocs; /* number of requested compute processes */ +extern int nprocs; /* number of running compute processes */ extern double expval; /* global exposure value */ extern time_t starttime; /* time we got started */ extern time_t endtime; /* time we should end by */ extern time_t reporttime; /* time for next report */ + +extern long nraysdone; /* number of rays done */ +extern long npacksdone; /* number of packets done */ extern int rtargc; /* rtrace command */ extern char *rtargv[];