| 11 |
|
/* Entities (order doesn't really matter) */ |
| 12 |
|
#define MG_E_COMMENT 0 |
| 13 |
|
#define MG_E_COLOR 1 |
| 14 |
< |
#define MG_E_CONE 2 |
| 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_SIDES 19 |
| 32 |
< |
#define MG_E_SPH 20 |
| 33 |
< |
#define MG_E_TD 21 |
| 34 |
< |
#define MG_E_TORUS 22 |
| 35 |
< |
#define MG_E_TS 23 |
| 36 |
< |
#define MG_E_VERTEX 24 |
| 37 |
< |
#define MG_E_XF 25 |
| 14 |
> |
#define MG_E_CCT 2 |
| 15 |
> |
#define MG_E_CONE 3 |
| 16 |
> |
#define MG_E_CMIX 4 |
| 17 |
> |
#define MG_E_CSPEC 5 |
| 18 |
> |
#define MG_E_CXY 6 |
| 19 |
> |
#define MG_E_CYL 7 |
| 20 |
> |
#define MG_E_ED 8 |
| 21 |
> |
#define MG_E_FACE 9 |
| 22 |
> |
#define MG_E_INCLUDE 10 |
| 23 |
> |
#define MG_E_IES 11 |
| 24 |
> |
#define MG_E_MATERIAL 12 |
| 25 |
> |
#define MG_E_NORMAL 13 |
| 26 |
> |
#define MG_E_OBJECT 14 |
| 27 |
> |
#define MG_E_POINT 15 |
| 28 |
> |
#define MG_E_PRISM 16 |
| 29 |
> |
#define MG_E_RD 17 |
| 30 |
> |
#define MG_E_RING 18 |
| 31 |
> |
#define MG_E_RS 19 |
| 32 |
> |
#define MG_E_SIDES 20 |
| 33 |
> |
#define MG_E_SPH 21 |
| 34 |
> |
#define MG_E_TD 22 |
| 35 |
> |
#define MG_E_TORUS 23 |
| 36 |
> |
#define MG_E_TS 24 |
| 37 |
> |
#define MG_E_VERTEX 25 |
| 38 |
> |
#define MG_E_XF 26 |
| 39 |
|
|
| 40 |
< |
#define MG_NENTITIES 26 |
| 40 |
> |
#define MG_NENTITIES 27 |
| 41 |
|
|
| 42 |
< |
#define MG_NAMELIST {"#","c","cone","cmix","cspec","cxy","cyl","ed","f",\ |
| 43 |
< |
"i","ies","m","n","o","p","prism","rd","ring","rs",\ |
| 44 |
< |
"sides","sph","td","torus","ts","v","xf"} |
| 42 |
> |
#define MG_NAMELIST {"#","c","cct","cone","cmix","cspec","cxy","cyl","ed",\ |
| 43 |
> |
"f","i","ies","m","n","o","p","prism","rd","ring",\ |
| 44 |
> |
"rs","sides","sph","td","torus","ts","v","xf"} |
| 45 |
|
|
| 46 |
|
#define MG_MAXELEN 6 |
| 47 |
|
|
| 91 |
|
* returns 0 when the end of file has been reached. |
| 92 |
|
*/ |
| 93 |
|
|
| 94 |
< |
#define MG_MAXLINE 512 /* maximum input line length */ |
| 94 |
> |
#define MG_MAXLINE 4096 /* maximum input line length */ |
| 95 |
|
#define MG_MAXARGC (MG_MAXLINE/4) /* maximum argument count */ |
| 96 |
|
|
| 97 |
|
typedef struct mg_fctxt { |
| 206 |
|
|
| 207 |
|
typedef struct { |
| 208 |
|
int clock; /* incremented each change */ |
| 209 |
< |
short flags; /* what's been set */ |
| 210 |
< |
short ssamp[C_CNSS]; /* spectral samples, min wl to max */ |
| 211 |
< |
long ssum; /* straight sum of spectral values */ |
| 209 |
> |
unsigned short flags; /* what's been set */ |
| 210 |
> |
unsigned short ssamp[C_CNSS]; /* spectral samples, min wl to max */ |
| 211 |
> |
unsigned long ssum; /* straight sum of spectral values */ |
| 212 |
|
float cx, cy; /* xy chromaticity value */ |
| 213 |
|
float eff; /* efficacy (lumens/watt) */ |
| 214 |
|
} C_COLOR; |
| 227 |
|
{14,42,143,435,1344,2839,3483,3362,2908,1954,956,\ |
| 228 |
|
320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\ |
| 229 |
|
10622,10026,8544,6424,4479,2835,1649,874,468,227,\ |
| 230 |
< |
114,58,29,14,7,3,2,1,0}, 106836L, .735, .265, 362.230 } |
| 230 |
> |
114,58,29,14,7,3,2,1,0}, 106836L, .467, .368, 362.230 } |
| 231 |
|
|
| 232 |
|
#define C_CIEY { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\ |
| 233 |
|
{0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\ |
| 234 |
|
5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\ |
| 235 |
|
5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\ |
| 236 |
< |
5,2,1,1,0,0}, 106856L, .274, .717, 493.525 } |
| 236 |
> |
5,2,1,1,0,0}, 106856L, .398, .542, 493.525 } |
| 237 |
|
|
| 238 |
|
#define C_CIEZ { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\ |
| 239 |
|
{65,201,679,2074,6456,13856,17471,17721,16692,\ |
| 240 |
|
12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\ |
| 241 |
|
11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},\ |
| 242 |
< |
106770L, .167, .009, 54.363 } |
| 242 |
> |
106770L, .147, .077, 54.363 } |
| 243 |
|
|
| 244 |
|
#define c_cval(c,l) ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum) |
| 245 |
|
|
