--- ray/src/hd/rhd_geom.c	1999/01/01 10:41:28	3.5
+++ ray/src/hd/rhd_geom.c	2004/01/01 11:21:55	3.14
@@ -1,15 +1,16 @@
-/* Copyright (c) 1999 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rhd_geom.c,v 3.14 2004/01/01 11:21:55 schorsch Exp $";
 #endif
-
 /*
  * Geometry drawing operations for OpenGL driver.
  */
 
+#include <string.h>
+
+#include "rtio.h"
 #include "radogl.h"
 #include "rhdriver.h"
+#include "rhd_odraw.h"
 
 #ifndef MAXGEO
 #define	MAXGEO		8		/* maximum geometry list length */
@@ -19,25 +20,29 @@ static char SCCSid[] = "$SunId$ SGI";
 #endif
 
 int	gmPortals = 0;			/* current portal GL list id */
+static int	Nlists = 0;		/* number of lists allocated */
 static char	*curportlist[MAXPORT];	/* current portal list */
 static char	*newportlist[MAXPORT];	/* new portal file list */
 
 static struct gmEntry {
 	char	*gfile;			/* geometry file name */
 	FVECT	cent;			/* centroid */
-	FLOAT	rad;			/* radius */
+	RREAL	rad;			/* radius */
 	int	listid;			/* display list identifier */
+	int	nlists;			/* number of lists allocated */
 } gmCurrent[MAXGEO], gmNext[MAXGEO];	/* current and next list */
 
 #define FORALLGEOM(ot,i)	for (i=0;i<MAXGEO&&ot[i].gfile!=NULL;i++)
 
 #define FORALLPORT(pl,i)		for (i=0;i<MAXPORT&&pl[i]!=NULL;i++)
 
-extern char	*atos(), *sskip(), *sskip2();
 
 
-gmNewGeom(file)			/* add new geometry to next list */
-char	*file;
+
+extern void
+gmNewGeom(			/* add new geometry to next list */
+	char	*file
+)
 {
 	register int	i, j;
 					/* check if already in next list */
@@ -51,14 +56,15 @@ char	*file;
 					/* check if copy in current list */
 	FORALLGEOM(gmCurrent, j)
 		if (!strcmp(file, gmCurrent[j].gfile)) {
-			copystruct(&gmNext[i], &gmCurrent[j]);
+			gmNext[i] = gmCurrent[j];
 			return;
 		}
 					/* else load new octree */
-	gmNext[i].gfile = file;
+	gmNext[i].gfile = savestr(file);
 	dolights = 0;
 	domats = 1;
-	gmNext[i].listid = rgl_octlist(file, gmNext[i].cent, &gmNext[i].rad);
+	gmNext[i].listid = rgl_octlist(file, gmNext[i].cent, &gmNext[i].rad,
+					&gmNext[i].nlists);
 	gmNext[i].rad *= 1.732;		/* go to corners */
 #ifdef DEBUG
 	fprintf(stderr, "Loaded octree \"%s\" into listID %d with radius %f\n",
@@ -67,7 +73,8 @@ char	*file;
 }
 
 
-gmEndGeom()			/* make next list current */
+extern void
+gmEndGeom(void)			/* make next list current */
 {
 	register int	i, j;
 
@@ -75,16 +82,19 @@ gmEndGeom()			/* make next list current */
 		FORALLGEOM(gmNext, j)
 			if (gmNext[j].listid == gmCurrent[i].listid)
 				break;
-		if (j >= MAXGEO || gmNext[j].gfile == NULL)
-			glDeleteLists(gmCurrent[i].listid, 1);	/* not found */
+		if (j >= MAXGEO || gmNext[j].gfile == NULL) {
+			glDeleteLists(gmCurrent[i].listid,	/* not found */
+					gmCurrent[i].nlists);
+			freestr(gmCurrent[i].gfile);
+		}
 	}
-	bcopy((char *)gmNext, (char *)gmCurrent, sizeof(gmNext));
-	bzero((char *)gmNext, sizeof(gmNext));
+	memcpy((void *)gmCurrent, (void *)gmNext, sizeof(gmNext));
+	memset((void *)gmNext, '\0', sizeof(gmNext));
 }
 
 
-int
-gmDrawGeom()			/* draw current list of octrees (and ports) */
+extern int
+gmDrawGeom(void)			/* draw current list of octrees */
 {
 	register int	n;
 
@@ -94,10 +104,15 @@ gmDrawGeom()			/* draw current list of octrees (and po
 }
 
 
-gmDrawPortals(r, g, b, a)	/* draw portals with specific RGBA value */
-int	r, g, b, a;
+extern void
+gmDrawPortals(	/* draw portals with specific RGBA value */
+	int	r,
+	int	g,
+	int	b,
+	int	a
+)
 {
-	if (!gmPortals || r<0 & g<0 & b<0 & a<0)
+	if (!gmPortals || (r<0) & (g<0) & (b<0) & (a<0))
 		return;
 	glPushAttrib(GL_DEPTH_BUFFER_BIT|GL_COLOR_BUFFER_BIT|
 			GL_POLYGON_BIT|GL_LIGHTING_BIT);
@@ -115,9 +130,12 @@ int	r, g, b, a;
 }
 
 
-gmDepthLimit(dl, vorg, vdir)	/* compute approximate depth limits for view */
-double	dl[2];
-FVECT	vorg, vdir;
+extern void
+gmDepthLimit(	/* compute approximate depth limits for view */
+	double	dl[2],
+	FVECT	vorg,
+	FVECT	vdir
+)
 {
 	FVECT	v;
 	double	dcent;
@@ -137,19 +155,17 @@ FVECT	vorg, vdir;
 }
 
 
-gmNewPortal(pflist)		/* add portal file(s) to our new list */
-char	*pflist;
+extern void
+gmNewPortal(		/* add portal file(s) to our new list */
+	char	*pflist
+)
 {
-	register int	i, j;
+	register int	i;
 	char	newfile[128];
 
 	if (pflist == NULL)
 		return;
-	while (*pflist) {
-		atos(newfile, sizeof(newfile), pflist);
-		if (!*newfile)
-			break;
-		pflist = sskip(pflist);
+	while ((pflist = nextword(newfile, sizeof(newfile), pflist)) != NULL) {
 		FORALLPORT(newportlist,i)
 			if (!strcmp(newportlist[i], newfile))
 				goto endloop;	/* in list already */
@@ -171,15 +187,15 @@ char	**ss0, **ss1;
 }
 
 
-int
-gmEndPortal()			/* close portal list and return GL list */
+extern int
+gmEndPortal(void)			/* close portal list and return GL list */
 {
 	register int	n;
 
 	FORALLPORT(newportlist, n);
 	if (!n) {			/* free old GL list */
 		if (gmPortals)
-			glDeleteLists(gmPortals, 1);
+			glDeleteLists(gmPortals, Nlists);
 		gmPortals = 0;
 	} else
 		qsort(newportlist, n, sizeof(char *), sstrcmp);
@@ -192,12 +208,12 @@ gmEndPortal()			/* close portal list and return GL lis
 			FORALLPORT(newportlist, n);
 			dolights = 0;
 			domats = 0;
-			gmPortals = rgl_filelist(n, newportlist);
+			gmPortals = rgl_filelist(n, newportlist, &Nlists);
 			break;
 		}
 	FORALLPORT(curportlist, n)		/* free old file list */
 		freestr(curportlist[n]);
-	bcopy((char *)newportlist, (char *)curportlist, sizeof(newportlist));
-	bzero((char *)newportlist, sizeof(newportlist));
+	memcpy((void *)curportlist, (void *)newportlist, sizeof(newportlist));
+	memset((void *)newportlist, '\0', sizeof(newportlist));
 	return(gmPortals);			/* return GL list id */
 }