--- ray/src/hd/rholo.h	1998/06/03 16:39:14	3.14
+++ ray/src/hd/rholo.h	2003/06/20 00:25:49	3.22
@@ -1,7 +1,4 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
-
-/* SCCSid "$SunId$ SGI" */
-
+/* RCSid: $Id: rholo.h,v 3.22 2003/06/20 00:25:49 greg Exp $ */
 /*
  * Header file for rholo program
  */
@@ -14,48 +11,62 @@
 #endif
 
 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) */
+	int16	hd;		/* holodeck section (first) */
+	int32	bi;		/* beam index (second) */
+	int32	nr;		/* number of rays (third) */
+	int32	nc;		/* number calculated (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 */
 
 typedef struct {
-	int2	hd;		/* holodeck section (first) */
-	int4	bi;		/* beam index (second) */
-	int4	nr;		/* number of rays (third) */
-	int4	nc;		/* number calculated (fourth) */
+	int16	hd;		/* holodeck section (first) */
+	int32	bi;		/* beam index (second) */
+	int32	nr;		/* number of rays (third) */
+	int32	nc;		/* number calculated (fourth) */
 } PACKHEAD;		/* followed by ray values */
 
 #define packsiz(nr)	(sizeof(PACKHEAD)+(nr)*sizeof(RAYVAL))
 #define packra(p)	((RAYVAL *)((p)+1))
 
+typedef struct {
+	int	nb;		/* number of beams in list */
+	PACKHEAD	*bl;	/* allocated beam list */
+} BEAMLIST;		/* a list of beam requests */
+
+typedef struct {
+	FVECT	vpt;		/* view (eye point) position */
+	double	rng;		/* desired mean radius for sample rays */
+} VIEWPOINT;		/* target eye position */
+
 				/* input variables */
 #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 GEOMETRY	3		/* section geometry */
+#define GRID		4		/* target grid size */
+#define OBSTRUCTIONS	5		/* shall we track obstructions? */
+#define OCTREE		6		/* octree file name */
+#define PORTS		7		/* section portals */
+#define RENDER		8		/* rendering options */
+#define REPORT		9		/* report interval and error file */
+#define RIF		10		/* rad input file */
+#define SECTION		11		/* holodeck section boundaries */
+#define TIME		12		/* maximum rendering time */
+#define VDIST		13		/* virtual distance calculation */
 
-#define NRHVARS		12		/* number of variables */
+#define NRHVARS		14		/* number of variables */
 
 #define RHVINIT { \
 	{"CACHE",	2,	0,	NULL,	fltvalue}, \
 	{"DISKSPACE",	3,	0,	NULL,	fltvalue}, \
 	{"EYESEP",	3,	0,	NULL,	fltvalue}, \
+	{"geometry",	3,	0,	NULL,	NULL}, \
 	{"GRID",	2,	0,	NULL,	fltvalue}, \
 	{"OBSTRUCTIONS",3,	0,	NULL,	boolvalue}, \
 	{"OCTREE",	3,	0,	NULL,	onevalue}, \
+	{"portals",	3,	0,	NULL,	NULL}, \
 	{"render",	3,	0,	NULL,	catvalues}, \
 	{"REPORT",	3,	0,	NULL,	onevalue}, \
 	{"RIF",		3,	0,	NULL,	onevalue}, \
@@ -69,6 +80,7 @@ typedef struct {
 #define BS_ADD		2		/* add to current set */
 #define BS_ADJ		3		/* adjust current set quantities */
 #define BS_DEL		4		/* delete from current set */
+#define BS_MAX		5		/* set to max of old and new */
 
 extern char	*progname;	/* our program name */
 extern char	*hdkfile;	/* holodeck file name */
@@ -85,8 +97,10 @@ extern int	nowarn;		/* turn warnings off? */
 extern int	ncprocs;	/* number of requested compute processes */
 extern int	nprocs;		/* number of running compute processes */
 
-extern double	expval;		/* global exposure value */
+extern int	chunkycmp;	/* using "chunky" comparison mode */
 
+extern VIEWPOINT	myeye;	/* target view position */
+
 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 */
@@ -98,3 +112,5 @@ extern int	rtargc;		/* rtrace command */
 extern char	*rtargv[];
 
 extern PACKET	*do_packets(), *get_packets(), *flush_queue();
+
+extern int16	*viewbeams();