--- ray/src/common/object.h	1993/01/25 12:41:25	2.2
+++ ray/src/common/object.h	2003/03/10 17:13:29	2.10
@@ -1,13 +1,14 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: object.h,v 2.10 2003/03/10 17:13:29 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.
@@ -36,9 +37,9 @@ typedef struct {
 
 #ifndef  OBJECT
 #ifdef  BIGMEM
-#define  OBJECT		int		/* index to object array */
+#define  OBJECT		int4		/* index to object array */
 #else
-#define  OBJECT		short		/* index to object array */
+#define  OBJECT		int2		/* index to object array */
 #endif
 #endif
 
@@ -52,16 +53,18 @@ typedef struct {
 
 #ifndef  MAXOBJBLK
 #ifdef  BIGMEM
-#define  MAXOBJBLK	4095		/* maximum number of object blocks */
+#define  MAXOBJBLK	65535		/* maximum number of object blocks */
 #else
-#define  MAXOBJBLK	511		/* 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  objptr(obj)	(objblock[(obj)>>6]+((obj)&077))
+#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 */
@@ -72,3 +75,75 @@ extern OBJECT  nobjects;		/* # of objects */
  */
 
 #define  MAXSET		127		/* maximum object set size */
+
+#define setfree(os)	free((void *)(os))
+
+extern void  (*addobjnotify[])();        /* people to notify of new objects */
+
+#ifdef NOPROTO
+
+extern OBJECT	objndx();
+extern OBJECT	lastmod();
+extern OBJECT	modifier();
+extern OBJECT	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 OBJECT	newobject();
+extern void	freeobjects();
+extern int	free_os();
+
+#else
+					/* defined in modobject.c */
+extern OBJECT	objndx(OBJREC *op);
+extern OBJECT	lastmod(OBJECT obj, char *mname);
+extern OBJECT	modifier(char *name);
+extern OBJECT	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 OBJECT	newobject();
+extern void	freeobjects(int firstobj, int nobjs);
+					/* defined in free_os.c */
+extern int	free_os(OBJREC *op);
+
+#endif /* NOPROTO */