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

Comparing ray/src/common/object.h (file contents):
Revision 2.4 by gregl, Wed Dec 3 11:13:12 1997 UTC vs.
Revision 2.5 by gwlarson, Tue Aug 25 10:16:08 1998 UTC

# Line 36 | Line 36 | typedef struct {
36  
37   #ifndef  OBJECT
38   #ifdef  BIGMEM
39 < #define  OBJECT         int             /* index to object array */
39 > #define  OBJECT         int4            /* index to object array */
40   #else
41 < #define  OBJECT         short           /* index to object array */
41 > #define  OBJECT         int2            /* index to object array */
42   #endif
43   #endif
44  
# Line 52 | Line 52 | typedef struct {
52  
53   #ifndef  MAXOBJBLK
54   #ifdef  BIGMEM
55 < #define  MAXOBJBLK      32767           /* maximum number of object blocks */
55 > #define  MAXOBJBLK      65535           /* maximum number of object blocks */
56   #else
57 < #define  MAXOBJBLK      511             /* maximum number of object blocks */
57 > #define  MAXOBJBLK      31              /* maximum number of object blocks */
58   #endif
59   #endif
60  
61   extern OBJREC  *objblock[MAXOBJBLK];    /* the object blocks */
62   extern OBJECT  nobjects;                /* # of objects */
63  
64 < #define  objptr(obj)    (objblock[(obj)>>6]+((obj)&077))
64 > #define  OBJBLKSIZ      01000           /* object block size */
65 > #define  objptr(obj)    (objblock[(obj)>>9]+((obj)&0777))
66  
67   #define  OVOID          (-1)            /* void object */
68   #define  VOIDID         "void"          /* void identifier */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines