--- ray/src/hd/rholo.h 1997/12/02 12:29:18 3.7 +++ ray/src/hd/rholo.h 1997/12/15 20:41:39 3.12 @@ -44,10 +44,9 @@ 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 NRHVARS 12 /* number of variables */ +#define NRHVARS 11 /* number of variables */ #define RHVINIT { \ {"render", 3, 0, NULL, catvalues}, \ @@ -60,7 +59,6 @@ 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}, \ } @@ -76,15 +74,23 @@ extern char froot[]; /* root file name */ 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[];