--- ray/src/hd/rholo.h 1997/11/26 20:16:01 3.4 +++ ray/src/hd/rholo.h 1997/12/12 11:13:17 3.10 @@ -17,6 +17,7 @@ typedef struct packet { int2 hd; /* holodeck section (first) */ int4 bi; /* beam index (second) */ int4 nr; /* number of rays (third) */ + int4 nc; /* number calculated (fourth) */ RAYVAL ra[RPACKSIZ]; /* ray values (fourth) */ float *offset; /* offset array if !vbool(OBSTRUCTIONS) */ struct packet *next; /* next in packet list */ @@ -26,6 +27,7 @@ typedef struct { int2 hd; /* holodeck section (first) */ int4 bi; /* beam index (second) */ int4 nr; /* number of rays (third) */ + int4 nc; /* number calculated (fourth) */ } PACKHEAD; /* followed by ray values */ #define packsiz(nr) (sizeof(PACKHEAD)+(nr)*sizeof(RAYVAL)) @@ -36,12 +38,12 @@ 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 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 OCCUPANCY 10 /* expected occupancy probability */ #define REPORT 11 /* report interval and error file */ @@ -52,12 +54,12 @@ 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}, \ + {"VDISTANCE", 2, 0, NULL, boolvalue}, \ {"OCCUPANCY", 3, 0, NULL, onevalue}, \ {"REPORT", 3, 0, NULL, onevalue}, \ } @@ -65,7 +67,8 @@ typedef struct { /* bundle set requests */ #define BS_NEW 1 /* replace current set with new one */ #define BS_ADD 2 /* add to current set */ -#define BS_DEL 3 /* delete from current set */ +#define BS_ADJ 3 /* adjust current set quantities */ +#define BS_DEL 4 /* delete from current set */ extern char *progname; /* our program name */ extern char *hdkfile; /* holodeck file name */ @@ -73,9 +76,14 @@ 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 */