--- ray/src/common/objutil.c	2021/04/07 14:37:57	2.15
+++ ray/src/common/objutil.c	2021/05/01 00:58:18	2.20
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: objutil.c,v 2.15 2021/04/07 14:37:57 greg Exp $";
+static const char RCSid[] = "$Id: objutil.c,v 2.20 2021/05/01 00:58:18 greg Exp $";
 #endif
 /*
  *  Basic .OBJ scene handling routines.
@@ -700,6 +700,89 @@ addFace(Scene *sc, VNDX vid[], int nv)
 	return(f);
 }
 
+/* Get neighbor vertices: malloc array with valence in index[0] */
+int *
+getVertexNeighbors(Scene *sc, int vid)
+{
+	int	*varr;
+	Face	*f;
+	int	j=0;
+
+	if (sc == NULL || (vid < 0) | (vid >= sc->nverts) ||
+			(f = sc->vert[vid].vflist) == NULL)
+		return(NULL);
+
+	varr = (int *)emalloc(sizeof(int)*CHUNKSIZ);
+	varr[0] = 0;				/* add unique neighbors */
+	for ( ; f != NULL; f = f->v[j].fnext) {
+		int	i, cvi;
+		for (j = f->nv; j--; )		/* find ourself in poly */
+			if (f->v[j].vid == vid)
+				break;
+		if (j < 0)			/* this is an error */
+			break;
+		if (f->nv < 3)			/* also never happens */
+			continue;
+						/* check previous neighbor */
+		cvi = f->v[ (j > 0) ? j-1 : f->nv-1 ].vid;
+		for (i = varr[0]+1; --i; )	/* making sure not in list */
+			if (varr[i] == cvi)
+				break;
+		if (!i) {			/* new neighbor? */
+			varr = chunk_alloc(int, varr, varr[0]+1);
+			varr[++varr[0]] = cvi;
+		}
+						/* check next neighbor */
+		cvi = f->v[ (j < f->nv-1) ? j+1 : 0 ].vid;
+		for (i = varr[0]+1; --i; )
+			if (varr[i] == cvi)
+				break;
+		if (!i) {
+			varr = chunk_alloc(int, varr, varr[0]+1);
+			varr[++varr[0]] = cvi;
+		}
+	}
+	if (!varr[0]) {
+		efree((char *)varr);		/* something went awry */
+		return(NULL);
+	}
+						/* tighten array & return */
+	return((int *)erealloc((char *)varr, sizeof(int)*(varr[0]+1)));
+}
+
+/* Callback for growBoundingBox() */
+static int
+addBBox(Scene *sc, Face *f, void *p)
+{
+	double	(*bbox)[3] = (double (*)[3])p;
+	int	i, j;
+
+	for (i = f->nv; i-- > 0; ) {
+		double	*p3 = sc->vert[f->v[i].vid].p;
+		for (j = 3; j--; ) {
+			if (p3[j] < bbox[0][j])
+				bbox[0][j] = p3[j];
+			if (p3[j] > bbox[1][j])
+				bbox[1][j] = p3[j];
+		}
+	}
+	return(1);
+}
+
+/* Expand bounding box min & max (initialize bbox to all zeroes) */
+int
+growBoundingBox(Scene *sc, double bbox[2][3], int flreq, int flexc)
+{
+	if (sc == NULL || sc->nfaces <= 0 || bbox == NULL)
+		return(0);
+
+	if (VABSEQ(bbox[0], bbox[1])) {		/* first run */
+		bbox[0][0] = bbox[0][1] = bbox[0][2] = FHUGE;
+		bbox[1][0] = bbox[1][1] = bbox[1][2] = -FHUGE;
+	}
+	return(foreachFace(sc, addBBox, flreq, flexc, bbox));
+}
+
 /* Allocate an empty scene */
 Scene *
 newScene(void)
@@ -784,8 +867,8 @@ addScene(Scene *scdst, const Scene *scsrc)
 {
 	VNDX		my_vlist[4];
 	int		*vert_map = NULL;
-	int		*norm_map = NULL;
-	int		*tex_map = NULL;
+	int		tex_off = 0;
+	int		norm_off = 0;
 	VNDX		*vlist = my_vlist;
 	int		vllen = sizeof(my_vlist)/sizeof(VNDX);
 	int		cur_mat = 0;
@@ -799,7 +882,7 @@ addScene(Scene *scdst, const Scene *scsrc)
 	if (scsrc->nfaces <= 0)
 		return(0);
 					/* map vertices */
-	vert_map = (int *)emalloc(sizeof(int *)*scsrc->nverts);
+	vert_map = (int *)emalloc(sizeof(int)*scsrc->nverts);
 	for (i = 0; i < scsrc->nverts; i++) {
 		const Vertex	*v = scsrc->vert + i;
 		if (v->vflist == NULL) {
@@ -808,17 +891,19 @@ addScene(Scene *scdst, const Scene *scsrc)
 		}
 		vert_map[i] = addVertex(scdst, v->p[0], v->p[1], v->p[2]);
 	}
-	if (scsrc->ntex > 0)		/* map texture coords */
-		tex_map = (int *)emalloc(sizeof(int *)*scsrc->ntex);
-	for (i = 0; i < scsrc->ntex; i++) {
-		const TexCoord	*t = scsrc->tex + i;
-		tex_map[i] = addTexture(scdst, t->u, t->v);
+	tex_off = scdst->ntex;		/* append texture coords */
+	if (scsrc->ntex > 0) {
+		scdst->tex = (TexCoord *)erealloc((char *)scdst->tex,
+			sizeof(TexCoord)*(tex_off+scsrc->ntex+(CHUNKSIZ-1)));
+		memcpy(scdst->tex+tex_off, scsrc->tex,
+				sizeof(TexCoord)*scsrc->ntex);
 	}
-	if (scsrc->nnorms > 0)		/* map normals */
-		norm_map = (int *)emalloc(sizeof(int *)*scsrc->nnorms);
-	for (i = 0; i < scsrc->nnorms; i++) {
-		const float	*n = scsrc->norm[i];
-		norm_map[i] = addNormal(scdst, n[0], n[1], n[2]);
+	norm_off = scdst->nnorms;	/* append normals */
+	if (scsrc->nnorms > 0) {
+		scdst->norm = (Normal *)erealloc((char *)scdst->norm,
+			sizeof(Normal)*(norm_off+scsrc->nnorms+(CHUNKSIZ-1)));
+		memcpy(scdst->norm+norm_off, scsrc->norm,
+				sizeof(Normal)*scsrc->nnorms);
 	}
 					/* add faces */
 	scdst->lastgrp = scdst->lastmat = 0;
@@ -828,28 +913,24 @@ addScene(Scene *scdst, const Scene *scsrc)
 		if (f->mat != cur_mat)
 			setMaterial(scdst, scsrc->matname[cur_mat = f->mat]);
 		if (f->nv > vllen) {
-			if (vlist == my_vlist)
-				vlist = (VNDX *)emalloc(
-						sizeof(VNDX)*(vllen = f->nv));
-			else
-				vlist = (VNDX *)erealloc((char *)vlist,
-						sizeof(VNDX)*(vllen = f->nv));
+			vlist = (VNDX *)( vlist == my_vlist ?
+				emalloc(sizeof(VNDX)*f->nv) :
+				erealloc((char *)vlist, sizeof(VNDX)*f->nv) );
+			vllen = f->nv;
 		}
 		memset(vlist, 0xff, sizeof(VNDX)*f->nv);
 		for (i = f->nv; i-- > 0; ) {
 			if (f->v[i].vid >= 0)
 				vlist[i][0] = vert_map[f->v[i].vid];
 			if (f->v[i].tid >= 0)
-				vlist[i][1] = tex_map[f->v[i].tid];
+				vlist[i][1] = f->v[i].tid + tex_off;
 			if (f->v[i].nid >= 0)
-				vlist[i][2] = norm_map[f->v[i].nid];
+				vlist[i][2] = f->v[i].nid + norm_off;
 		}
 		fcnt += (addFace(scdst, vlist, f->nv) != NULL);
 	}
 					/* clean up */
 	if (vlist != my_vlist) efree((char *)vlist);
-	if (norm_map != NULL) efree((char *)norm_map);
-	if (tex_map != NULL) efree((char *)tex_map);
 	efree((char *)vert_map);
 	return(fcnt);
 }
@@ -910,7 +991,7 @@ xfmScene(Scene *sc, const char *xfm)
 	if (!*xfm)
 		return(0);
 					/* parse string into words */
-	xav[0] = strcpy((char *)emalloc(strlen(xfm)+1), xfm);
+	xav[0] = savqstr((char *)xfm);
 	xac = 1; i = 0;
 	for ( ; ; ) {
 		while (!isspace(xfm[++i]))
@@ -921,14 +1002,14 @@ xfmScene(Scene *sc, const char *xfm)
 		if (!xfm[i])
 			break;
 		if (xac >= MAXAC-1) {
-			free(xav[0]);
+			freeqstr(xav[0]);
 			return(0);
 		}
 		xav[xac++] = xav[0] + i;
 	}
 	xav[xac] = NULL;
 	i = xfScene(sc, xac, xav);
-	efree((char *)xav[0]);
+	freeqstr(xav[0]);
 	return(i);
 }
 #undef MAXAC