--- ray/src/hd/rhinfo.c	1998/12/31 16:25:26	3.1
+++ ray/src/hd/rhinfo.c	2004/01/01 11:21:55	3.10
@@ -1,13 +1,14 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rhinfo.c,v 3.10 2004/01/01 11:21:55 schorsch Exp $";
 #endif
-
 /*
  * Get general information on holodeck file
  */
 
+#include <stdio.h>
+
+#include "platform.h"
+#include "resolu.h"
 #include "holo.h"
 
 #ifndef NHBINS
@@ -16,13 +17,18 @@ static char SCCSid[] = "$SunId$ SGI";
 
 char	*progname;		/* global argv[0] */
 
+long	beamtot, samptot;	/* total beams and samples */
 
-main(argc, argv)
-int	argc;
-char	*argv[];
-{
-	int	sect;
+static void gethdinfo(char	*fname, FILE	*fout);
+static void psectstats(HOLO	*hp, FILE	*fp);
 
+
+int
+main(
+	int	argc,
+	char	*argv[]
+)
+{
 	progname = argv[0];
 	if (argc != 2)
 		goto userr;
@@ -34,15 +40,16 @@ userr:
 }
 
 
-gethdinfo(fname, fout)		/* get information on holodeck */
-char	*fname;
-FILE	*fout;
+static void
+gethdinfo(		/* get information on holodeck */
+	char	*fname,
+	FILE	*fout
+)
 {
-	extern long	ftell();
 	FILE	*fp;
 	HOLO	*hdsect;
 	int	fd;
-	int4	nextloc;
+	int32	nextloc;
 	int	n;
 					/* open holodeck file */
 	if ((fp = fopen(fname, "r")) == NULL) {
@@ -58,13 +65,16 @@ FILE	*fout;
 	nextloc = ftell(fp);			/* get stdio position */
 	fclose(fp);				/* done with stdio */
 	for (n = 0; nextloc > 0L; n++) {	/* get the section(s) */
-		lseek(fd, (long)nextloc, 0);
+		lseek(fd, (off_t)nextloc, SEEK_SET);
 		read(fd, (char *)&nextloc, sizeof(nextloc));
+		fprintf(fout, "Section %d:\n", n);
 		hdsect = hdinit(fd, NULL);	/* load section directory */
-		fprintf(fout,"Section %d:\n",n);
 		psectstats(hdsect, fout);	/* print section statistics */
 	}
 	nextloc = hdfilen(fd);			/* print global statistics */
+	fputs("=====================================================\n", fout);
+	fprintf(fout, "Total samples/beams: %ld/%ld (%.2f samples/beam)\n",
+			samptot, beamtot, (double)samptot/beamtot);
 	fprintf(fout, "%.1f Mbyte file, %.1f%% fragmentation\n",
 			nextloc/(1024.*1024.),
 			100.*(nextloc-hdfiluse(fd,1))/nextloc);
@@ -76,20 +86,27 @@ FILE	*fout;
 }
 
 
-psectstats(hp, fp)		/* print statistical information for section */
-register HOLO	*hp;
-FILE	*fp;
+static void
+psectstats(		/* print statistical information for section */
+	register HOLO	*hp,
+	FILE	*fp
+)
 {
 	int	scount[NHBINS];
 	int	minsamp = 10000, maxsamp = 0;
+	FVECT	vt;
 	double	sqrtmaxp;
 	int	bmin, bmax, cnt;
 	register int	i;
 
+	fcross(vt, hp->xv[0], hp->xv[1]);
+	fprintf(fp, "\tWorld volume:            %g\n", fabs(DOT(vt,hp->xv[2])));
 	fprintf(fp, "\tGrid resolution:         %d x %d x %d\n",
 			hp->grid[0], hp->grid[1], hp->grid[2]);
-	fprintf(fp, "\tNumber of beams:         %d\n", nbeams(hp));
-	fprintf(fp, "\tNumber of ray samples:   %d\n", biglob(hp)->nrd);
+	fprintf(fp, "\tNumber of beams:         %ld\n", (long)nbeams(hp));
+	beamtot += nbeams(hp);
+	fprintf(fp, "\tNumber of ray samples:   %ld\n", (long)biglob(hp)->nrd);
+	samptot += biglob(hp)->nrd;
 	if (biglob(hp)->nrd <= 0)
 		return;				/* no samples to stat! */
 	for (i = nbeams(hp); i > 0; i--) {