--- ray/src/hd/rholo.h 1997/11/26 21:34:27 3.5 +++ ray/src/hd/rholo.h 1998/05/22 08:30:40 3.13 @@ -38,14 +38,14 @@ typedef struct { #define SECTION 1 /* holodeck section boundaries */ #define OCTREE 2 /* octree file name */ #define RIF 3 /* rad input file */ -#define EXPOSURE 4 /* section exposure value */ -#define TIME 5 /* maximum rendering time */ -#define DISKSPACE 6 /* how much disk space to use */ -#define CACHE 7 /* amount of memory to use as cache */ -#define GRID 8 /* target grid size */ -#define OBSTRUCTIONS 9 /* shall we track obstructions? */ -#define OCCUPANCY 10 /* expected occupancy probability */ -#define REPORT 11 /* report interval and error file */ +#define TIME 4 /* maximum rendering time */ +#define DISKSPACE 5 /* how much disk space to use */ +#define CACHE 6 /* amount of memory to use as cache */ +#define GRID 7 /* target grid size */ +#define OBSTRUCTIONS 8 /* shall we track obstructions? */ +#define VDIST 9 /* virtual distance calculation */ +#define REPORT 10 /* report interval and error file */ +#define EYESEP 11 /* eye separation distance */ #define NRHVARS 12 /* number of variables */ @@ -54,14 +54,14 @@ typedef struct { {"section", 3, 0, NULL, NULL}, \ {"OCTREE", 3, 0, NULL, onevalue}, \ {"RIF", 3, 0, NULL, onevalue}, \ - {"EXPOSURE", 3, 0, NULL, fltvalue}, \ {"TIME", 2, 0, NULL, fltvalue}, \ {"DISKSPACE", 3, 0, NULL, fltvalue}, \ {"CACHE", 2, 0, NULL, fltvalue}, \ {"GRID", 2, 0, NULL, fltvalue}, \ {"OBSTRUCTIONS",3, 0, NULL, boolvalue}, \ - {"OCCUPANCY", 3, 0, NULL, onevalue}, \ + {"VDISTANCE", 2, 0, NULL, boolvalue}, \ {"REPORT", 3, 0, NULL, onevalue}, \ + {"EYESEP", 3, 0, NULL, fltvalue}, \ } /* bundle set requests */ @@ -76,15 +76,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[];