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

Comparing ray/src/cv/mgflib/parser.h (file contents):
Revision 1.4 by greg, Thu Jun 23 07:48:36 1994 UTC vs.
Revision 1.8 by greg, Sat Jun 25 11:55:42 1994 UTC

# Line 12 | Line 12
12   #define MG_E_COMMENT    0
13   #define MG_E_COLOR      1
14   #define MG_E_CONE       2
15 < #define MG_E_CXY        3
16 < #define MG_E_CYL        4
17 < #define MG_E_ED         5
18 < #define MG_E_FACE       6
19 < #define MG_E_INCLUDE    7
20 < #define MG_E_IES        8
21 < #define MG_E_MATERIAL   9
22 < #define MG_E_NORMAL     10
23 < #define MG_E_OBJECT     11
24 < #define MG_E_POINT      12
25 < #define MG_E_RD         13
26 < #define MG_E_RING       14
27 < #define MG_E_RS         15
28 < #define MG_E_SPH        16
29 < #define MG_E_TD         17
30 < #define MG_E_TORUS      18
31 < #define MG_E_TS         19
32 < #define MG_E_VERTEX     20
33 < #define MG_E_XF         21
15 > #define MG_E_CMIX       3
16 > #define MG_E_CSPEC      4
17 > #define MG_E_CXY        5
18 > #define MG_E_CYL        6
19 > #define MG_E_ED         7
20 > #define MG_E_FACE       8
21 > #define MG_E_INCLUDE    9
22 > #define MG_E_IES        10
23 > #define MG_E_MATERIAL   11
24 > #define MG_E_NORMAL     12
25 > #define MG_E_OBJECT     13
26 > #define MG_E_POINT      14
27 > #define MG_E_PRISM      15
28 > #define MG_E_RD         16
29 > #define MG_E_RING       17
30 > #define MG_E_RS         18
31 > #define MG_E_SPH        19
32 > #define MG_E_TD         20
33 > #define MG_E_TORUS      21
34 > #define MG_E_TS         22
35 > #define MG_E_VERTEX     23
36 > #define MG_E_XF         24
37  
38 < #define MG_NENTITIES    22
38 > #define MG_NENTITIES    25
39  
40 < #define MG_NAMELIST     {"#","c","cone","cxy","cyl","ed","f","i","ies",\
41 <        "m","n","o","p","rd","ring","rs","sph","td","torus","ts","v","xf"}
40 > #define MG_NAMELIST     {"#","c","cone","cmix","cspec","cxy","cyl","ed","f",\
41 >                        "i","ies","m","n","o","p","prism","rd","ring","rs",\
42 >                        "sph","td","torus","ts","v","xf"}
43  
44   #define MG_MAXELEN      6
45  
# Line 86 | Line 90 | extern char    *mg_err[MG_NERRS];
90   #define MG_MAXARGC      (MG_MAXLINE/4)  /* maximum argument count */
91  
92   typedef struct mg_fctxt {
93 <        char    *fname;                         /* file name */
93 >        char    fname[96];                      /* file name */
94          FILE    *fp;                            /* stream pointer */
95          char    inpline[MG_MAXLINE];            /* input line */
96          int     lineno;                         /* line number */
# Line 158 | Line 162 | typedef FLOAT  FVECT[3];
162                                  (vr)[1]=(v1)[1]+(f)*(v2)[1], \
163                                  (vr)[2]=(v1)[2]+(f)*(v2)[2])
164  
165 < #define is0vect(v)      (DOT(v,v) < FTINY*FTINY)
165 > #define is0vect(v)      (DOT(v,v) <= FTINY*FTINY)
166  
167   #define round0(x)       if (x <= FTINY && x >= -FTINY) x = 0
168  
# Line 173 | Line 177 | extern double  normalize(FVECT);       /* normalize a vector
177   *      (materials, colors, vectors)
178   */
179  
180 + #define C_CMINWL        380             /* minimum wavelength */
181 + #define C_CMAXWL        780             /* maximum wavelength */
182 + #define C_CNSS          41              /* number of spectral samples */
183 + #define C_CWLI          ((C_CMAXWL-C_CMINWL)/(C_CNSS-1))
184 + #define C_CMAXV         10000           /* nominal maximum sample value */
185 +
186 + #define C_CSSPEC        01              /* flag if spectrum is set */
187 + #define C_CDSPEC        02              /* flag if defined w/ spectrum */
188 + #define C_CSXY          04              /* flag if xy is set */
189 + #define C_CDXY          010             /* flag if defined w/ xy */
190 +
191   typedef struct {
192 <        float   cx, cy;         /* XY chromaticity coordinates */
193 < } C_COLOR;              /* color context */
192 >        char    *name;                  /* material name */
193 >        int     clock;                  /* incremented each change */
194 >        short   flags;                  /* what's been set */
195 >        short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
196 >        long    ssum;                   /* straight sum of spectral values */
197 >        float   cx, cy;                 /* xy chromaticity value */
198 > } C_COLOR;
199  
200 + #define C_DEFCOLOR      { NULL, 1, C_CDXY|C_CSXY|C_CSSPEC,\
201 +                        {C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
202 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
203 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
204 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
205 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
206 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
207 +                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
208 +                        (long)C_CNSS*C_CMAXV, 1./3., 1./3. }
209 +
210 + #define C_CIEX          { "_cie_x", 1, C_CDSPEC|C_CSSPEC|C_CSXY,\
211 +                        {14,42,143,435,1344,2839,3483,3362,2908,1954,956,\
212 +                        320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\
213 +                        10622,10026,8544,6424,4479,2835,1649,874,468,227,\
214 +                        114,58,29,14,7,3,2,1,0}, 106836L, .735, .265 }
215 +
216 + #define C_CIEY          { "_cie_y", 1, C_CDSPEC|C_CSSPEC|C_CSXY,\
217 +                        {0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\
218 +                        5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\
219 +                        5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\
220 +                        5,2,1,1,0,0}, 106856L, .274, .717 }
221 +
222 + #define C_CIEZ          { "_cie_z", 1, C_CDSPEC|C_CSSPEC|C_CSXY,\
223 +                        {65,201,679,2074,6456,13856,17471,17721,16692,\
224 +                        12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\
225 +                        11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},\
226 +                        106770L, .167, .009 }
227 +
228 + #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->sum)
229 +
230   typedef struct {
231          char    *name;          /* material name */
232          int     clock;          /* incremented each change -- resettable */
# Line 195 | Line 245 | typedef struct {
245   } C_MATERIAL;           /* material context */
246  
247   typedef struct {
248 +        char    *name;          /* vector name */
249 +        int     clock;          /* incremented each change -- resettable */
250          FVECT   p, n;           /* point and normal */
251   } C_VERTEX;             /* vertex context */
252  
201 – #define isgrey(cxy)     ((cxy)->cx > .31 && (cxy)->cx < .35 && \
202 –                        (cxy)->cy > .31 && (cxy)->cy < .35)
203 –
204 – #define C_DEFCOLOR      {.333,.333}
253   #define C_DEFMATERIAL   {NULL,1,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
254                                          0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
255 < #define C_DEFVERTEX     {{0.,0.,0.},{0.,0.,0.}}
255 > #define C_DEFVERTEX     {NULL,1,{0.,0.,0.},{0.,0.,0.}}
256  
257   extern C_COLOR          *c_ccolor;      /* the current color */
258   extern C_MATERIAL       *c_cmaterial;   /* the current material */
# Line 216 | Line 264 | extern int     c_hmaterial();                  /* handle material entity
264   extern int      c_hvertex();                    /* handle vertex entity */
265   extern void     c_clearall();                   /* clear context tables */
266   extern C_VERTEX *c_getvert();                   /* get a named vertex */
267 + extern C_COLOR  *c_getcolor();                  /* get a named color */
268 + extern void     c_ccvt();                       /* fix color representation */
269 + extern int      c_isgrey();                     /* check if color is grey */
270   #else
271   extern int      c_hcolor(int, char **);         /* handle color entity */
272   extern int      c_hmaterial(int, char **);      /* handle material entity */
273   extern int      c_hvertex(int, char **);        /* handle vertex entity */
274   extern void     c_clearall(void);               /* clear context tables */
275   extern C_VERTEX *c_getvert(char *);             /* get a named vertex */
276 + extern C_COLOR  *c_getcolor(char *);            /* get a named color */
277 + extern void     c_ccvt(C_COLOR *, int);         /* fix color representation */
278 + extern int      c_isgrey(C_COLOR *);            /* check if color is grey */
279   #endif
280  
281   /*************************************************************************
# Line 249 | Line 303 | typedef FLOAT  MAT4[4][4];
303   #define  copymat4(m4a,m4b)      bcopy((char *)m4b,(char *)m4a,sizeof(MAT4))
304   #else
305   #define  copymat4(m4a,m4b)      (void)memcpy((char *)m4a,(char *)m4b,sizeof(MAT4))
252 – extern char  *memcpy();
306   #endif
307  
308   #define  MAT4IDENT              { {1.,0.,0.,0.}, {0.,1.,0.,0.}, \
# Line 320 | Line 373 | extern void    xf_clear(void);                 /* clear xf stack */
373   extern void     multmat4(MAT4, MAT4, MAT4);     /* m4a = m4b X m4c */
374   extern void     multv3(FVECT, FVECT, MAT4);     /* v3a = v3b X m4 (vectors) */
375   extern void     multp3(FVECT, FVECT, MAT4);     /* p3a = p3b X m4 (points) */
376 < extern int      xf(XF, int, char **);           /* interpret transform spec. */
376 > extern int      xf(XF *, int, char **);         /* interpret transform spec. */
377  
378   #endif
379  

Diff Legend

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