--- ray/src/hd/rholo.h	1999/01/31 10:56:57	3.18
+++ ray/src/hd/rholo.h	2004/01/01 11:21:55	3.24
@@ -1,39 +1,50 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
-/* SCCSid "$SunId$ SGI" */
-
+/* RCSid: $Id: rholo.h,v 3.24 2004/01/01 11:21:55 schorsch Exp $ */
 /*
  * Header file for rholo program
  */
+#ifndef _RAD_RHOLO_H_
+#define _RAD_RHOLO_H_
 
+#include <stdio.h>
+
+#include "view.h"
 #include "holo.h"
 #include "vars.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef RPACKSIZ
 #define RPACKSIZ	21		/* good packet size */
 #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) */
+	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 */
@@ -78,6 +89,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 */
@@ -94,7 +106,7 @@ 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 */
 
@@ -108,4 +120,35 @@ extern long	npacksdone;	/* number of packets done */
 extern int	rtargc;		/* rtrace command */
 extern char	*rtargv[];
 
-extern PACKET	*do_packets(), *get_packets(), *flush_queue();
+	/* rholo.c */
+extern void done_packets(PACKET	*pl);
+	/* rholo2.c */
+extern void new_rtrace(void);
+extern int done_rtrace(void);
+extern void packrays(float *rod, PACKET *p);
+extern void donerays(PACKET *p, float *rvl);
+extern int getradfile(void);
+extern void report(time_t t);
+	/* rholo2l.c */
+extern int start_rtrace(void);
+extern int end_rtrace(void);
+extern PACKET *do_packets(PACKET *pl);
+extern PACKET *flush_queue(void);
+	/* rholo3.c */
+extern void init_global(void);
+extern int next_packet(PACKET *p, int	n);
+extern void bundle_set(int op, PACKHEAD *clist, int nents);
+	/* rholo4.c */
+extern void disp_open(char *dname);
+extern void disp_packet(register PACKHEAD *p);
+extern int disp_check(int block);
+extern int disp_close(void);
+	/* viewbeams.c */
+extern int nextview(VIEW *vp, FILE *fp);
+extern int16 * viewbeams(VIEW *vp, int hr, int vr, BEAMLIST *blp);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_RHOLO_H_ */
+