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.13 by schorsch, Fri Jun 6 16:38:47 2003 UTC vs.
Revision 2.19 by greg, Fri Sep 7 21:45:22 2012 UTC

# Line 1 | Line 1
1   /* RCSid $Id$ */
2   /*
3   *  object.h - header file for routines using objects and object sets.
4 + *
5 + *  Include after "standard.h"
6   */
7   #ifndef _RAD_OBJECT_H_
8   #define _RAD_OBJECT_H_
# Line 8 | Line 10
10   extern "C" {
11   #endif
12  
11 – #include "copyright.h"
12 –
13   #ifndef  OCTREE
14   #define  OCTREE         int
15   #endif
# Line 22 | Line 22 | extern "C" {
22   */
23  
24   typedef struct {
25 +        char  **sarg;                   /* string arguments */
26 +        RREAL  *farg;                   /* real arguments */
27          short  nsargs;                  /* # of string arguments */
28          short  nfargs;                  /* # of real arguments */
27 –        char  **sarg;                   /* string arguments */
28 –        FLOAT  *farg;                   /* 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 42 | Line 42 | typedef struct {
42  
43   #ifndef  OBJECT
44   #ifdef  SMLMEM
45 < #define  OBJECT         int2            /* index to object array */
45 > #define  OBJECT         int16           /* index to object array */
46   #else
47 < #define  OBJECT         int4            /* index to object array */
47 > #define  OBJECT         int32           /* index to object array */
48   #endif
49   #endif
50  
# Line 115 | Line 115 | extern void    freefargs(FUNARGS *fa);
115                                          /* defined in readobj.c */
116   extern void     readobj(char *inpspec);
117   extern void     getobject(char *name, FILE *fp);
118 < extern OBJECT   newobject();
118 > extern OBJECT   newobject(void);
119   extern void     freeobjects(int firstobj, int nobjs);
120                                          /* defined in free_os.c */
121   extern int      free_os(OBJREC *op);

Diff Legend

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