--- ray/src/common/objutil.h	2020/05/01 18:55:34	2.5
+++ ray/src/common/objutil.h	2021/02/12 15:35:07	2.10
@@ -1,4 +1,4 @@
-/* RCSid $Id: objutil.h,v 2.5 2020/05/01 18:55:34 greg Exp $ */
+/* RCSid $Id: objutil.h,v 2.10 2021/02/12 15:35:07 greg Exp $ */
 /*
  *  Declarations for .OBJ file utility
  *
@@ -17,12 +17,16 @@
 #define POPEN_SUPPORT		1       /* support "!command" i/o */
 #endif
 					/* face flags */
-#define FACE_SELECTED		01
-#define FACE_DEGENERATE		02
-#define FACE_DUPLICATE		04
+#define FACE_DEGENERATE		01
+#define FACE_DUPLICATE		02
+#define FACE_SELECTED		04
+#define FACE_CUSTOM(n)		(1<<(2+(n)))
 
 struct Face;				/* forward declaration */
 
+typedef int		VNDX[3];	/* vertex indices (point,map,normal) */
+
+/* Structure to hold vertex indices and link back to face list */
 typedef struct {
 	int		vid;		/* vertex id */
 	int		tid;		/* texture id */
@@ -85,8 +89,8 @@ Scene *		newScene(void);
 /* Add a .OBJ file to a scene */
 Scene *		loadOBJ(Scene *sc, const char *fspec);
 
-/* Duplicate a scene */
-Scene *		dupScene(const Scene *sc);
+/* Duplicate a scene, optionally selecting faces */
+Scene *		dupScene(const Scene *sc, int flreq, int flexc);
 
 /* Transform entire scene */
 int		xfScene(Scene *sc, int xac, char *xav[]);
@@ -95,6 +99,9 @@ int		xfmScene(Scene *sc, const char *xfm);
 /* Add a descriptive comment */
 void		addComment(Scene *sc, const char *comment);
 
+/* Find index for comment containing the given string (starting from n) */
+int		findComment(Scene *sc, const char *match, int n);
+
 /* Clear comments */
 void		clearComments(Scene *sc);
 
@@ -152,20 +159,26 @@ int		changeGroup(Scene *sc, const char *gname,
 int		changeMaterial(Scene *sc, const char *mname,
 					int flreq, int flexc);
 
-/* Add a vertex to our scene */
+/* Add a vertex to our scene, returning index */
 int		addVertex(Scene *sc, double x, double y, double z);
 
-/* Add a texture coordinate to our scene */
+/* Add a texture coordinate to our scene, returning index */
 int		addTexture(Scene *sc, double u, double v);
 
-/* Add a surface normal to our scene */
+/* Add a surface normal to our scene, returning index */
 int		addNormal(Scene *sc, double xn, double yn, double zn);
 
-/* Set current (last) group */
+/* Set current group (sc->lastgrp) to given ID */
 void		setGroup(Scene *sc, const char *nm);
 
-/* Set current (last) material */
+/* Set current material (sc->lastmat) to given ID */
 void		setMaterial(Scene *sc, const char *nm);
+
+/* Add a new face to our scene, using current group and material */
+Face *		addFace(Scene *sc, VNDX vid[], int nv);
+
+/* Delete unreferenced vertices, normals, texture coords */
+void		deleteUnreferenced(Scene *sc);
 
 /* Free a scene */
 void		freeScene(Scene *sc);