--- ray/src/common/object.h	1998/08/25 10:16:08	2.5
+++ ray/src/common/object.h	2003/02/25 02:47:21	2.9
@@ -1,13 +1,14 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: object.h,v 2.9 2003/02/25 02:47:21 greg Exp $ */
 /*
  *  object.h - header file for routines using objects and object sets.
- *
- *     7/28/85
  */
 
+#include "copyright.h"
+
+#ifndef  OCTREE
+#define  OCTREE		int
+#endif
+
 /*
  *	Object definitions require general specifications
  *	which may include a number of different argument types.
@@ -54,15 +55,16 @@ typedef struct {
 #ifdef  BIGMEM
 #define  MAXOBJBLK	65535		/* maximum number of object blocks */
 #else
-#define  MAXOBJBLK	31		/* maximum number of object blocks */
+#define  MAXOBJBLK	63		/* maximum number of object blocks */
 #endif
 #endif
 
 extern OBJREC  *objblock[MAXOBJBLK];	/* the object blocks */
 extern OBJECT  nobjects;		/* # of objects */
 
-#define  OBJBLKSIZ	01000		/* object block size */
-#define  objptr(obj)	(objblock[(obj)>>9]+((obj)&0777))
+#define  OBJBLKSHFT	9
+#define  OBJBLKSIZ	(1<<OBJBLKSHFT)	/* object block size */
+#define  objptr(obj)	(objblock[(obj)>>OBJBLKSHFT]+((obj)&(OBJBLKSIZ-1)))
 
 #define  OVOID		(-1)		/* void object */
 #define  VOIDID		"void"		/* void identifier */
@@ -74,6 +76,74 @@ extern OBJECT  nobjects;		/* # of objects */
 
 #define  MAXSET		127		/* maximum object set size */
 
-OBJECT	*setsave();
+#define setfree(os)	free((void *)(os))
 
-#define setfree(os)	free((char *)(os))
+extern void  (*addobjnotify[])();        /* people to notify of new objects */
+
+#ifdef NOPROTO
+
+extern int	objndx();
+extern int	lastmod();
+extern int	modifier();
+extern int	object();
+extern void	insertobject();
+extern void	clearobjndx();
+extern void	insertelem();
+extern void	deletelem();
+extern int	inset();
+extern int	setequal();
+extern void	setcopy();
+extern OBJECT *	setsave();
+extern void	setunion();
+extern void	setintersect();
+extern OCTREE	fullnode();
+extern void	objset();
+extern int	dosets();
+extern void	donesets();
+extern int	otype();
+extern void	objerror();
+extern int	readfargs();
+extern void	freefargs();
+extern void	readobj();
+extern void	getobject();
+extern int	newobject();
+extern void	freeobjects();
+extern int	free_os();
+
+#else
+					/* defined in modobject.c */
+extern int	objndx(OBJREC *op);
+extern int	lastmod(OBJECT obj, char *mname);
+extern int	modifier(char *name);
+extern int	object(char *oname);
+extern void	insertobject(OBJECT obj);
+extern void	clearobjndx(void);
+					/* defined in objset.c */
+extern void	insertelem(OBJECT *os, OBJECT obj);
+extern void	deletelem(OBJECT *os, OBJECT obj);
+extern int	inset(OBJECT *os, OBJECT obj);
+extern int	setequal(OBJECT *os1, OBJECT *os2);
+extern void	setcopy(OBJECT *os1, OBJECT *os2);
+extern OBJECT *	setsave(OBJECT *os);
+extern void	setunion(OBJECT *osr, OBJECT *os1, OBJECT *os2);
+extern void	setintersect(OBJECT *osr, OBJECT *os1, OBJECT *os2);
+extern OCTREE	fullnode(OBJECT *oset);
+extern void	objset(OBJECT *oset, OCTREE ot);
+extern int	dosets(int (*f)());
+extern void	donesets(void);
+
+					/* defined in otypes.c */
+extern int	otype(char *ofname);
+extern void	objerror(OBJREC *o, int etyp, char *msg);
+					/* defined in readfargs.c */
+extern int	readfargs(FUNARGS *fa, FILE *fp);
+extern void	freefargs(FUNARGS *fa);
+					/* defined in readobj.c */
+extern void	readobj(char *inpspec);
+extern void	getobject(char *name, FILE *fp);
+extern int	newobject();
+extern void	freeobjects(int firstobj, int nobjs);
+					/* defined in free_os.c */
+extern int	free_os(OBJREC *op);
+
+#endif