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 1.3 by greg, Wed Jul 24 14:15:51 1991 UTC vs.
Revision 2.2 by greg, Mon Jan 25 12:41:25 1993 UTC

# Line 19 | Line 19 | typedef struct {
19          short  nsargs;                  /* # of string arguments */
20          short  nfargs;                  /* # of real arguments */
21          char  **sarg;                   /* string arguments */
22 <        double  *farg;                  /* real arguments */
22 >        FLOAT  *farg;                   /* real arguments */
23   #ifdef  IARGS
24          short  niargs;                  /* # of integer arguments */
25          long  *iarg;                    /* integer arguments */
# Line 34 | Line 34 | typedef struct {
34   *      and the modifier index.
35   */
36  
37 < typedef short  OBJECT;                  /* index into object array */
37 > #ifndef  OBJECT
38 > #ifdef  BIGMEM
39 > #define  OBJECT         int             /* index to object array */
40 > #else
41 > #define  OBJECT         short           /* index to object array */
42 > #endif
43 > #endif
44  
45   typedef struct {
46          OBJECT  omod;                   /* modifier number */
# Line 42 | Line 48 | typedef struct {
48          char  *oname;                   /* object name */
49          FUNARGS  oargs;                 /* object specification */
50          char  *os;                      /* object structure */
45 –        long  lastrno;                  /* last ray this was used with */
51   }  OBJREC;
52  
53 + #ifndef  MAXOBJBLK
54 + #ifdef  BIGMEM
55 + #define  MAXOBJBLK      4095            /* maximum number of object blocks */
56 + #else
57   #define  MAXOBJBLK      511             /* maximum number of object blocks */
58 + #endif
59 + #endif
60  
61   extern OBJREC  *objblock[MAXOBJBLK];    /* the object blocks */
62   extern OBJECT  nobjects;                /* # of objects */

Diff Legend

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