49 |
|
{ |
50 |
|
double w, wsum; |
51 |
|
register int i; |
52 |
+ |
char *nm; |
53 |
|
register LUENT *lp; |
54 |
|
|
55 |
|
switch (mg_entity(av[0])) { |
83 |
|
c_ccolor = (C_COLOR *)lp->data; |
84 |
|
c_ccolor->clock = 0; |
85 |
|
} |
86 |
+ |
nm = lp->key; |
87 |
+ |
i = c_ccolor->clock; |
88 |
|
if (ac == 3) { /* use default template */ |
86 |
– |
i = c_ccolor->clock; |
89 |
|
*c_ccolor = c_dfcolor; |
90 |
< |
c_ccolor->name = av[1]; |
90 |
> |
c_ccolor->name = nm; |
91 |
|
c_ccolor->clock = i + 1; |
92 |
|
return(MG_OK); |
93 |
|
} |
96 |
|
return(MG_EMEM); |
97 |
|
if (lp->data == NULL) |
98 |
|
return(MG_EUNDEF); |
97 |
– |
i = c_ccolor->clock; |
99 |
|
*c_ccolor = *(C_COLOR *)lp->data; |
100 |
< |
c_ccolor->name = av[1]; |
100 |
> |
c_ccolor->name = nm; |
101 |
|
c_ccolor->clock = i + 1; |
102 |
|
return(MG_OK); |
103 |
|
case MG_E_CXY: /* assign CIE XY value */ |
147 |
|
w, (C_COLOR *)lp->data); |
148 |
|
wsum += w; |
149 |
|
} |
150 |
+ |
c_ccolor->clock++; |
151 |
|
return(MG_OK); |
152 |
|
} |
153 |
|
return(MG_EUNK); |
160 |
|
register char **av; |
161 |
|
{ |
162 |
|
int i; |
163 |
+ |
char *nm; |
164 |
|
register LUENT *lp; |
165 |
|
|
166 |
|
switch (mg_entity(av[0])) { |
194 |
|
c_cmaterial = (C_MATERIAL *)lp->data; |
195 |
|
c_cmaterial->clock = 0; |
196 |
|
} |
197 |
+ |
nm = lp->key; |
198 |
+ |
i = c_cmaterial->clock; |
199 |
|
if (ac == 3) { /* use default template */ |
195 |
– |
i = c_cmaterial->clock; |
200 |
|
*c_cmaterial = c_dfmaterial; |
201 |
< |
c_cmaterial->name = av[1]; |
201 |
> |
c_cmaterial->name = nm; |
202 |
|
c_cmaterial->clock = i + 1; |
203 |
|
return(MG_OK); |
204 |
|
} |
207 |
|
return(MG_EMEM); |
208 |
|
if (lp->data == NULL) |
209 |
|
return(MG_EUNDEF); |
206 |
– |
i = c_cmaterial->clock; |
210 |
|
*c_cmaterial = *(C_MATERIAL *)lp->data; |
211 |
< |
c_cmaterial->name = av[1]; |
211 |
> |
c_cmaterial->name = nm; |
212 |
|
c_cmaterial->clock = i + 1; |
213 |
|
return(MG_OK); |
214 |
|
case MG_E_RD: /* set diffuse reflectance */ |
281 |
|
register char **av; |
282 |
|
{ |
283 |
|
int i; |
284 |
+ |
char *nm; |
285 |
|
register LUENT *lp; |
286 |
|
|
287 |
|
switch (mg_entity(av[0])) { |
314 |
|
return(MG_EMEM); |
315 |
|
c_cvertex = (C_VERTEX *)lp->data; |
316 |
|
} |
317 |
+ |
nm = lp->key; |
318 |
+ |
i = c_cvertex->clock; |
319 |
|
if (ac == 3) { /* use default template */ |
314 |
– |
i = c_cvertex->clock; |
320 |
|
*c_cvertex = c_dfvertex; |
321 |
< |
c_cvertex->name = av[1]; |
321 |
> |
c_cvertex->name = nm; |
322 |
|
c_cvertex->clock = i + 1; |
323 |
|
return(MG_OK); |
324 |
|
} |
327 |
|
return(MG_EMEM); |
328 |
|
if (lp->data == NULL) |
329 |
|
return(MG_EUNDEF); |
325 |
– |
i = c_cvertex->clock; |
330 |
|
*c_cvertex = *(C_VERTEX *)lp->data; |
331 |
< |
c_cvertex->name = av[1]; |
331 |
> |
c_cvertex->name = nm; |
332 |
|
c_cvertex->clock = i + 1; |
333 |
|
return(MG_OK); |
334 |
|
case MG_E_POINT: /* set point */ |
537 |
|
cres->cy = (w1 + w2) * scale; |
538 |
|
cres->flags = C_CDXY|C_CSXY; |
539 |
|
} |
536 |
– |
cres->clock++; /* record the change */ |
540 |
|
} |