--- ray/src/hd/rholo.h	1997/11/03 18:33:12	3.2
+++ ray/src/hd/rholo.h	1997/11/26 21:34:27	3.5
@@ -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,31 +27,30 @@ 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))
-#define packray(p)	(RAYVAL *)((PACKHEAD *)(p)+1)
+#define packra(p)	((RAYVAL *)((p)+1))
 
 				/* input variables */
 #define RENDER		0		/* rendering options */
-#define VIEW		1		/* starting view */
-#define SECTION		2		/* holodeck section boundaries */
-#define OCTREE		3		/* octree file name */
-#define RIF		4		/* rad input file */
-#define EXPOSURE	5		/* section exposure value */
-#define TIME		6		/* maximum rendering time */
-#define DISKSPACE	7		/* how much disk space to use */
-#define CACHE		8		/* amount of memory to use as cache */
-#define GRID		9		/* target grid size */
-#define OBSTRUCTIONS	10		/* shall we track obstructions? */
-#define OCCUPANCY	11		/* expected occupancy probability */
-#define REPORT		12		/* report interval and error file */
+#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 NRHVARS		13		/* number of variables */
+#define NRHVARS		12		/* number of variables */
 
 #define RHVINIT { \
 	{"render",	3,	0,	NULL,	catvalues}, \
-	{"view",	2,	0,	NULL,	NULL}, \
 	{"section",	3,	0,	NULL,	NULL}, \
 	{"OCTREE",	3,	0,	NULL,	onevalue}, \
 	{"RIF",		3,	0,	NULL,	onevalue}, \
@@ -65,19 +65,22 @@ typedef struct {
 }
 
 				/* 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 */