--- ray/src/hd/rholo.h 1997/11/10 18:05:07 3.3 +++ ray/src/hd/rholo.h 1997/12/01 16:31:50 3.6 @@ -2,10 +2,6 @@ /* SCCSid "$SunId$ SGI" */ -/* Copyright (c) 1997 Silicon Graphics, Inc. */ - -/* SCCSid "$SunId$ SGI" */ - /* * Header file for rholo program */ @@ -21,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 */ @@ -30,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)) @@ -46,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}, \ @@ -62,24 +61,28 @@ 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}, \ } /* bundle set requests */ -#define BS_NEW 0 /* replace current set with new one */ -#define BS_ADD 1 /* add to current set */ -#define BS_DEL 2 /* delete from current set */ +#define BS_NEW 1 /* replace current set with new one */ +#define BS_ADD 2 /* add to 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 */ extern char froot[]; /* root file name */ +extern char *outdev; /* output device name */ + extern int nowarn; /* turn warnings off? */ -extern double expval; /* global exposure value */ - extern int ncprocs; /* number of 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 */