--- ray/src/hd/rholo.h 1997/11/26 20:16:01 3.4 +++ ray/src/hd/rholo.h 1997/12/01 16:31:50 3.6 @@ -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)) @@ -42,10 +44,11 @@ typedef struct { #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 VDIST 10 /* virtual distance calculation */ +#define OCCUPANCY 11 /* expected occupancy probability */ +#define REPORT 12 /* report interval and error file */ -#define NRHVARS 12 /* number of variables */ +#define NRHVARS 13 /* number of variables */ #define RHVINIT { \ {"render", 3, 0, NULL, catvalues}, \ @@ -58,6 +61,7 @@ typedef struct { {"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 +69,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 */