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.13 by schorsch, Fri Jun 6 16:38:47 2003 UTC vs.
Revision 2.22 by greg, Sun May 11 21:37:40 2014 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 58 | Line 58 | typedef struct {
58  
59   #ifndef  MAXOBJBLK
60   #ifdef  SMLMEM
61 < #define  MAXOBJBLK      63              /* maximum number of object blocks */
61 > #define  MAXOBJBLK      1023            /* maximum number of object blocks */
62   #else
63 < #define  MAXOBJBLK      65535           /* maximum number of object blocks */
63 > #define  MAXOBJBLK      131071          /* maximum number of object blocks */
64   #endif
65   #endif
66  
67   extern OBJREC  *objblock[MAXOBJBLK];    /* the object blocks */
68   extern OBJECT  nobjects;                /* # of objects */
69  
70 < #define  OBJBLKSHFT     9
70 > #define  OBJBLKSHFT     11
71   #define  OBJBLKSIZ      (1<<OBJBLKSHFT) /* object block size */
72   #define  objptr(obj)    (objblock[(obj)>>OBJBLKSHFT]+((obj)&(OBJBLKSIZ-1)))
73  
# 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