ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/cv/mgflib/parser.h
(Generate patch)

Comparing ray/src/cv/mgflib/parser.h (file contents):
Revision 1.30 by greg, Tue Mar 18 11:05:40 1997 UTC vs.
Revision 1.33 by greg, Fri Feb 28 20:11:29 2003 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1995 Regents of the University of California */
2 <
3 < /* SCCSid "$SunId$ LBL" */
4 <
1 > /* RCSid: $Id$ */
2   /*
3   * Header file for MGF interpreter
4   */
5  
6   #ifndef MG_VMAJOR
7  
8 < /* must include stdio.h before us */
8 > /* must include stdio.h and stdlib.h before us */
9  
10   #define MG_VMAJOR       2               /* major version number */
11   #define MG_VMINOR       0               /* minor version number */
# Line 173 | Line 170 | extern int isfltd();                   /* same with delimiter set */
170   extern int isname();                    /* non-zero if legal identifier name */
171   extern int badarg();                    /* check argument format */
172   extern int e_include();                 /* expand include entity */
173 + extern int e_pipe();                    /* expand piped command */
174   extern int e_sph();                     /* expand sphere as other entities */
175   extern int e_torus();                   /* expand torus as other entities */
176   extern int e_cyl();                     /* expand cylinder as other entities */
# Line 189 | Line 187 | extern int isfltd(char *, char *);     /* same with delimi
187   extern int isname(char *);              /* non-zero if legal identifier name */
188   extern int badarg(int, char **, char *);/* check argument format */
189   extern int e_include(int, char **);     /* expand include entity */
190 + extern int e_pipe(int, char **);        /* expand piped command */
191   extern int e_sph(int, char **);         /* expand sphere as other entities */
192   extern int e_torus(int, char **);       /* expand torus as other entities */
193   extern int e_cyl(int, char **);         /* expand cylinder as other entities */
# Line 249 | Line 248 | extern void    fcross(FVECT,FVECT,FVECT);/* cross product
248   #define C_CSEFF         020             /* flag if efficacy set */
249  
250   typedef struct {
251 <        int     clock;                  /* incremented each change */
252 <        short   flags;                  /* what's been set */
253 <        short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
254 <        long    ssum;                   /* straight sum of spectral values */
255 <        float   cx, cy;                 /* xy chromaticity value */
256 <        float   eff;                    /* efficacy (lumens/watt) */
251 >        int     clock;          /* incremented each change */
252 >        char    *client_data;   /* pointer to private client-owned data */
253 >        short   flags;          /* what's been set */
254 >        short   ssamp[C_CNSS];  /* spectral samples, min wl to max */
255 >        long    ssum;           /* straight sum of spectral values */
256 >        float   cx, cy;         /* xy chromaticity value */
257 >        float   eff;            /* efficacy (lumens/watt) */
258   } C_COLOR;
259  
260 < #define C_DEFCOLOR      { 1, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\
260 > #define C_DEFCOLOR      { 1, NULL, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\
261                          {C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
262                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
263                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
# Line 273 | Line 273 | typedef struct {
273  
274   typedef struct {
275          int     clock;          /* incremented each change -- resettable */
276 +        char    *client_data;   /* pointer to private client-owned data */
277          int     sided;          /* 1 if surface is 1-sided, 0 for 2-sided */
278          float   nr, ni;         /* index of refraction, real and imaginary */
279          float   rd;             /* diffuse reflectance */
# Line 291 | Line 292 | typedef struct {
292  
293   typedef struct {
294          int     clock;          /* incremented each change -- resettable */
295 +        char    *client_data;   /* pointer to private client-owned data */
296          FVECT   p, n;           /* point and normal */
297   } C_VERTEX;             /* vertex context */
298  
299 < #define C_DEFMATERIAL   {1,0,1.,0.,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
300 <                                        0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
301 < #define C_DEFVERTEX     {1,{0.,0.,0.},{0.,0.,0.}}
299 > #define C_DEFMATERIAL   {1,NULL,0,1.,0.,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,\
300 >                                C_DEFCOLOR,0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
301 > #define C_DEFVERTEX     {1,NULL,{0.,0.,0.},{0.,0.,0.}}
302  
303   extern C_COLOR          *c_ccolor;      /* the current color */
304   extern char             *c_ccname;      /* current color name */
# Line 458 | Line 460 | extern int     xf(XF *, int, char **);         /* interpret trans
460  
461   #ifndef  PI
462   #ifdef  M_PI
463 < #define  PI             M_PI
463 > #define  PI             ((double)M_PI)
464   #else
465   #define  PI             3.14159265358979323846
466   #endif
467   #endif
468  
467 – #ifdef DCL_ATOF
468 – extern double   atof();
469 – #endif
470 –
469   #ifndef MEM_PTR
470   #define MEM_PTR         void *
471   #endif
474 –
475 – extern MEM_PTR  malloc();
476 – extern MEM_PTR  calloc();
477 – extern MEM_PTR  realloc();
478 – extern void     free();
472  
473   #endif /*MG_VMAJOR*/

Diff Legend

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