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.16 by greg, Fri Jun 27 06:53:21 2003 UTC vs.
Revision 2.21 by greg, Sun Dec 8 19:25:36 2013 UTC

# Line 22 | Line 22 | extern "C" {
22   */
23  
24   typedef struct {
25        short  nsargs;                  /* # of string arguments */
26        short  nfargs;                  /* # of real arguments */
25          char  **sarg;                   /* string arguments */
26          RREAL  *farg;                   /* real arguments */
27 +        short  nsargs;                  /* # of string arguments */
28 +        short  nfargs;                  /* # of real arguments */
29   #ifdef  IARGS
30          short  niargs;                  /* # of integer arguments */
31          long  *iarg;                    /* integer arguments */
32   #endif
33   }  FUNARGS;
34  
35 < #define  MAXSTR         128             /* maximum string length */
35 > #define  MAXSTR         512             /* maximum string (word) length */
36  
37   /*
38   *      An object is defined as an index into an array of
# 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);
97                                          /* defined in objset.c */
# Line 115 | Line 117 | extern void    freefargs(FUNARGS *fa);
117                                          /* defined in readobj.c */
118   extern void     readobj(char *inpspec);
119   extern void     getobject(char *name, FILE *fp);
120 < extern OBJECT   newobject();
120 > extern OBJECT   newobject(void);
121   extern void     freeobjects(int firstobj, int nobjs);
122                                          /* defined in free_os.c */
123   extern int      free_os(OBJREC *op);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines