--- ray/src/hd/rhdriver.h	1998/12/18 11:56:10	3.18
+++ ray/src/hd/rhdriver.h	2011/05/20 02:06:39	3.26
@@ -1,13 +1,16 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
-/* SCCSid "$SunId$ SGI" */
-
+/* RCSid: $Id: rhdriver.h,v 3.26 2011/05/20 02:06:39 greg Exp $ */
 /*
  * Header file for holodeck device driver routines.
  */
+#ifndef _RAD_RHDRIVER_H_
+#define _RAD_RHDRIVER_H_
 
 #include "view.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern struct driver {
 	char	*name;		/* holodeck name or title */
 	VIEW	v;		/* base view parameters */
@@ -133,19 +136,24 @@ views.  The zeroeth auxiliary view is the base view it
 
 
 void
-dev_section(otf)	: add octree geometry for rendering
-char	*otf;		: octree and portal file names
+dev_section(gf, pf)	: add geometry and ports for rendering
+char	*gf;		: geometry file name
+char	*pf;		: portal file name(s)
 
-Add the given octree file to the list of geometry to be used to render
-intermediate views if direct geometry rendering is available.  Additional
-file names (separated by spaces) are Radiance scene files containing
-the geometry for "portals" to separate sections.  The given
-character string is guaranteed to be static (or permanently allocated)
-such that it may be safely stored as a pointer.  The same pointer or
-file list may be (and often is) given repeatedly.  If a given octree
-does not exist, the call should be silently ignored.  If otn is NULL,
-then the last octree has been given, and the display can be updated
-with the new information.
+Add the given geometry file to the list of geometry to render for
+intermediate views if direct geometry rendering is available.  The
+second argument gives the name(s) of any portal geometry files
+associated with this section.  Multiple portal file names are separated
+by spaces.  A single octree file will be given for the geometry, ending
+in the ".oct" suffix.  Portal files will be given as zero or more
+Radiance scene description file names.  If no portals are given for
+this section, the string may be NULL.  The character strings are
+guaranteed to be static (or permanently allocated) such that they may
+be safely stored as a pointer.  The same pointers or file lists may be
+(and often are) given repeatedly.  If a given geometry file does not
+exist, the call should be silently ignored.  If gf is NULL, then the
+last section has been given, and the display can be updated with the
+new information.
 
 
 void
@@ -158,6 +166,27 @@ Set odev.v.type=0 and odev.hres=odev.vres=0 when done.
  ************************************************************************/
 
 
+/*
 extern VIEW	*dev_auxview();
+*/
+extern int16	*beam_view(VIEW *vn, int hr, int vr);
 
-extern int	*beam_view();
+
+extern void dev_open(char  *id);
+extern void dev_close(void);
+extern void dev_clear(void);
+extern int dev_view(register VIEW *nv);
+extern void dev_section(char *gfn, char *pfn);
+extern void dev_auxcom(char *cmd, char *args);
+extern VIEW *dev_auxview(int n, int hvres[2]);
+extern int dev_input(void);
+extern void dev_value(COLR c, FVECT d, FVECT p);
+extern int dev_flush(void);
+extern void dev_paintr(uby8 rgb[3], int xmin, int ymin, int xmax, int ymax);
+extern void dev_cone(uby8 rgb[3], FVECT ip, double rad);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_RHDRIVER_H_ */
+