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.11 by greg, Thu Jun 30 11:07:38 1994 UTC vs.
Revision 1.12 by greg, Fri Jul 1 10:18:36 1994 UTC

# Line 201 | Line 201 | extern double  normalize(FVECT);       /* normalize a vector
201   #define C_CDXY          010             /* flag if defined w/ xy */
202  
203   typedef struct {
204        char    *name;                  /* material name */
204          int     clock;                  /* incremented each change */
205          short   flags;                  /* what's been set */
206          short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
# Line 209 | Line 208 | typedef struct {
208          float   cx, cy;                 /* xy chromaticity value */
209   } C_COLOR;
210  
211 < #define C_DEFCOLOR      { NULL, 0, C_CDXY|C_CSXY|C_CSSPEC,\
211 > #define C_DEFCOLOR      { 1, C_CDXY|C_CSXY|C_CSSPEC,\
212                          {C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
213                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
214                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
# Line 219 | Line 218 | typedef struct {
218                          C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
219                          (long)C_CNSS*C_CMAXV, 1./3., 1./3. }
220  
221 < #define C_CIEX          { "_cie_x", 0, C_CDSPEC|C_CSSPEC|C_CSXY,\
221 > #define C_CIEX          { 1, C_CDSPEC|C_CSSPEC|C_CSXY,\
222                          {14,42,143,435,1344,2839,3483,3362,2908,1954,956,\
223                          320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\
224                          10622,10026,8544,6424,4479,2835,1649,874,468,227,\
225                          114,58,29,14,7,3,2,1,0}, 106836L, .735, .265 }
226  
227 < #define C_CIEY          { "_cie_y", 0, C_CDSPEC|C_CSSPEC|C_CSXY,\
227 > #define C_CIEY          { 1, C_CDSPEC|C_CSSPEC|C_CSXY,\
228                          {0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\
229                          5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\
230                          5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\
231                          5,2,1,1,0,0}, 106856L, .274, .717 }
232  
233 < #define C_CIEZ          { "_cie_z", 0, C_CDSPEC|C_CSSPEC|C_CSXY,\
233 > #define C_CIEZ          { 1, C_CDSPEC|C_CSSPEC|C_CSXY,\
234                          {65,201,679,2074,6456,13856,17471,17721,16692,\
235                          12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\
236                          11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},\
# Line 240 | Line 239 | typedef struct {
239   #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->sum)
240  
241   typedef struct {
243        char    *name;          /* material name */
242          int     clock;          /* incremented each change -- resettable */
243          float   rd;             /* diffuse reflectance */
244          C_COLOR rd_c;           /* diffuse reflectance color */
# Line 257 | Line 255 | typedef struct {
255   } C_MATERIAL;           /* material context */
256  
257   typedef struct {
260        char    *name;          /* vector name */
258          int     clock;          /* incremented each change -- resettable */
259          FVECT   p, n;           /* point and normal */
260   } C_VERTEX;             /* vertex context */
261  
262 < #define C_DEFMATERIAL   {NULL,0,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
262 > #define C_DEFMATERIAL   {1,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
263                                          0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
264 < #define C_DEFVERTEX     {NULL,0,{0.,0.,0.},{0.,0.,0.}}
264 > #define C_DEFVERTEX     {1,{0.,0.,0.},{0.,0.,0.}}
265  
266   extern C_COLOR          *c_ccolor;      /* the current color */
267 + extern char             *c_ccname;      /* current color name */
268   extern C_MATERIAL       *c_cmaterial;   /* the current material */
269 + extern char             *c_cmname;      /* current material name */
270   extern C_VERTEX         *c_cvertex;     /* the current vertex */
271 + extern char             *c_cvname;      /* current vertex name */
272  
273   #ifdef NOPROTO
274   extern int      c_hcolor();                     /* handle color entity */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines