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.7 by greg, Sat Jun 25 09:47:58 1994 UTC vs.
Revision 1.8 by greg, Sat Jun 25 11:55:42 1994 UTC

# Line 189 | Line 189 | extern double  normalize(FVECT);       /* normalize a vector
189   #define C_CDXY          010             /* flag if defined w/ xy */
190  
191   typedef struct {
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      { C_CDXY|C_CSXY|C_CSSPEC,\
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,\
# Line 205 | Line 207 | typedef struct {
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          { C_CDSPEC|C_CSSPEC|C_CSXY,\
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          { C_CDSPEC|C_CSSPEC|C_CSXY,\
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          { C_CDSPEC|C_CSSPEC|C_CSXY,\
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},\
# Line 243 | 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  
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 */

Diff Legend

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