--- ray/src/common/object.h	2003/06/27 06:53:21	2.16
+++ ray/src/common/object.h	2023/02/06 22:40:21	2.25
@@ -1,4 +1,4 @@
-/* RCSid $Id: object.h,v 2.16 2003/06/27 06:53:21 greg Exp $ */
+/* RCSid $Id: object.h,v 2.25 2023/02/06 22:40:21 greg Exp $ */
 /*
  *  object.h - header file for routines using objects and object sets.
  *
@@ -22,17 +22,17 @@ extern "C" {
  */
 
 typedef struct {
-	short  nsargs;			/* # of string arguments */
-	short  nfargs;			/* # of real arguments */
 	char  **sarg;			/* string arguments */
 	RREAL  *farg;			/* real arguments */
+	short  nsargs;			/* # of string arguments */
+	short  nfargs;			/* # of real arguments */
 #ifdef  IARGS
 	short  niargs;			/* # of integer arguments */
 	long  *iarg;			/* integer arguments */
 #endif
 }  FUNARGS;
 
-#define  MAXSTR		128		/* maximum string length */
+#define  MAXSTR		512		/* maximum string (word) length */
 
 /*
  *	An object is defined as an index into an array of
@@ -58,16 +58,16 @@ typedef struct {
 
 #ifndef  MAXOBJBLK
 #ifdef  SMLMEM
-#define  MAXOBJBLK	63		/* maximum number of object blocks */
+#define  MAXOBJBLK	1023		/* maximum number of object blocks */
 #else
-#define  MAXOBJBLK	65535		/* maximum number of object blocks */
+#define  MAXOBJBLK	131071		/* maximum number of object blocks */
 #endif
 #endif
 
 extern OBJREC  *objblock[MAXOBJBLK];	/* the object blocks */
 extern OBJECT  nobjects;		/* # of objects */
 
-#define  OBJBLKSHFT	9
+#define  OBJBLKSHFT	11
 #define  OBJBLKSIZ	(1<<OBJBLKSHFT)	/* object block size */
 #define  objptr(obj)	(objblock[(obj)>>OBJBLKSHFT]+((obj)&(OBJBLKSIZ-1)))
 
@@ -79,19 +79,21 @@ extern OBJECT  nobjects;		/* # of objects */
  *  the objects in ascending order.
  */
 
-#define  MAXSET		511		/* maximum object set size */
+#define  MAXSET		8191		/* maximum object set size */
 
 #define setfree(os)	free((void *)(os))
 
-extern void  (*addobjnotify[])();        /* people to notify of new objects */
+extern void  (*addobjnotify[])(OBJECT);	/* people to notify of new objects */
 
 					/* 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 int	eqreal(double d1, double d2);
+extern int	eqobjects(OBJECT obj1, OBJECT obj2);
 extern void	insertobject(OBJECT obj);
-extern void	clearobjndx(void);
+extern void	truncobjndx(void);
 					/* defined in objset.c */
 extern void	insertelem(OBJECT *os, OBJECT obj);
 extern void	deletelem(OBJECT *os, OBJECT obj);
@@ -115,7 +117,7 @@ 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 OBJECT	newobject(void);
 extern void	freeobjects(int firstobj, int nobjs);
 					/* defined in free_os.c */
 extern int	free_os(OBJREC *op);