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

Comparing src/common/object.h (file contents):
Revision 1.2 by greg, Thu Sep 6 23:32:38 1990 UTC vs.
Revision 1.5 by greg, Wed Oct 23 12:19:28 1991 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 */
26   #endif
27   }  FUNARGS;
28  
29 < #define  MAXSTR         512             /* maximum string length */
29 > #define  MAXSTR         128             /* maximum string length */
30  
31   /*
32   *      An object is defined as an index into an array of
# 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 45 | Line 51 | typedef struct {
51          long  lastrno;                  /* last ray this was used with */
52   }  OBJREC;
53  
54 + #ifndef  MAXOBJBLK
55 + #ifdef  BIGMEM
56 + #define  MAXOBJBLK      4095            /* maximum number of object blocks */
57 + #else
58   #define  MAXOBJBLK      511             /* maximum number of object blocks */
59 + #endif
60 + #endif
61  
62   extern OBJREC  *objblock[MAXOBJBLK];    /* the object blocks */
63   extern OBJECT  nobjects;                /* # of objects */

Diff Legend

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