--- ray/src/hd/rholo.h	1997/12/01 16:31:50	3.6
+++ ray/src/hd/rholo.h	1998/08/26 12:42:27	3.15
@@ -18,7 +18,7 @@ typedef struct packet {
 	int4	bi;		/* beam index (second) */
 	int4	nr;		/* number of rays (third) */
 	int4	nc;		/* number calculated (fourth) */
-	RAYVAL	ra[RPACKSIZ];	/* ray values (fourth) */
+	RAYVAL	ra[RPACKSIZ];	/* ray values (fifth) */
 	float	*offset;	/* offset array if !vbool(OBSTRUCTIONS) */
 	struct packet	*next;	/* next in packet list */
 } PACKET;		/* a beam packet */
@@ -34,36 +34,34 @@ typedef struct {
 #define packra(p)	((RAYVAL *)((p)+1))
 
 				/* input variables */
-#define RENDER		0		/* rendering options */
-#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 VDIST		10		/* virtual distance calculation */
-#define OCCUPANCY	11		/* expected occupancy probability */
-#define REPORT		12		/* report interval and error file */
+#define CACHE		0		/* amount of memory to use as cache */
+#define DISKSPACE	1		/* how much disk space to use */
+#define EYESEP		2		/* eye separation distance */
+#define GRID		3		/* target grid size */
+#define OBSTRUCTIONS	4		/* shall we track obstructions? */
+#define OCTREE		5		/* octree file name */
+#define RENDER		6		/* rendering options */
+#define REPORT		7		/* report interval and error file */
+#define RIF		8		/* rad input file */
+#define SECTION		9		/* holodeck section boundaries */
+#define TIME		10		/* maximum rendering time */
+#define VDIST		11		/* virtual distance calculation */
 
-#define NRHVARS		13		/* number of variables */
+#define NRHVARS		12		/* number of variables */
 
 #define RHVINIT { \
-	{"render",	3,	0,	NULL,	catvalues}, \
-	{"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}, \
+	{"DISKSPACE",	3,	0,	NULL,	fltvalue}, \
+	{"EYESEP",	3,	0,	NULL,	fltvalue}, \
 	{"GRID",	2,	0,	NULL,	fltvalue}, \
 	{"OBSTRUCTIONS",3,	0,	NULL,	boolvalue}, \
-	{"VDISTANCE",	2,	0,	NULL,	boolvalue}, \
-	{"OCCUPANCY",	3,	0,	NULL,	onevalue}, \
+	{"OCTREE",	3,	0,	NULL,	onevalue}, \
+	{"render",	3,	0,	NULL,	catvalues}, \
 	{"REPORT",	3,	0,	NULL,	onevalue}, \
+	{"RIF",		3,	0,	NULL,	onevalue}, \
+	{"section",	3,	0,	NULL,	NULL}, \
+	{"TIME",	2,	0,	NULL,	fltvalue}, \
+	{"VDISTANCE",	2,	0,	NULL,	boolvalue}, \
 }
 
 				/* bundle set requests */
@@ -78,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[];