ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/common/object.h
(Generate patch)

Comparing ray/src/common/object.h (file contents):
Revision 2.20 by greg, Sun Dec 8 18:59:53 2013 UTC vs.
Revision 2.22 by greg, Sun May 11 21:37:40 2014 UTC

# Line 58 | Line 58 | typedef struct {
58  
59   #ifndef  MAXOBJBLK
60   #ifdef  SMLMEM
61 < #define  MAXOBJBLK      63              /* maximum number of object blocks */
61 > #define  MAXOBJBLK      1023            /* maximum number of object blocks */
62   #else
63 < #define  MAXOBJBLK      65535           /* maximum number of object blocks */
63 > #define  MAXOBJBLK      131071          /* maximum number of object blocks */
64   #endif
65   #endif
66  
67   extern OBJREC  *objblock[MAXOBJBLK];    /* the object blocks */
68   extern OBJECT  nobjects;                /* # of objects */
69  
70 < #define  OBJBLKSHFT     9
70 > #define  OBJBLKSHFT     11
71   #define  OBJBLKSIZ      (1<<OBJBLKSHFT) /* object block size */
72   #define  objptr(obj)    (objblock[(obj)>>OBJBLKSHFT]+((obj)&(OBJBLKSIZ-1)))
73  
# Line 90 | Line 90 | extern OBJECT  objndx(OBJREC *op);
90   extern OBJECT   lastmod(OBJECT obj, char *mname);
91   extern OBJECT   modifier(char *name);
92   extern OBJECT   object(char *oname);
93 + extern int      eqreal(double d1, double d2);
94   extern int      eqobjects(OBJECT obj1, OBJECT obj2);
95   extern void     insertobject(OBJECT obj);
96   extern void     clearobjndx(void);

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)