34 |
|
mg_ehand[MG_E_COMMENT] = r_comment; |
35 |
|
mg_ehand[MG_E_COLOR] = c_hcolor; |
36 |
|
mg_ehand[MG_E_CONE] = r_cone; |
37 |
+ |
mg_ehand[MG_E_CMIX] = c_hcolor; |
38 |
+ |
mg_ehand[MG_E_CSPEC] = c_hcolor; |
39 |
|
mg_ehand[MG_E_CXY] = c_hcolor; |
40 |
|
mg_ehand[MG_E_CYL] = r_cyl; |
41 |
|
mg_ehand[MG_E_ED] = c_hmaterial; |
48 |
|
mg_ehand[MG_E_RD] = c_hmaterial; |
49 |
|
mg_ehand[MG_E_RING] = r_ring; |
50 |
|
mg_ehand[MG_E_RS] = c_hmaterial; |
51 |
+ |
mg_ehand[MG_E_SIDES] = c_hmaterial; |
52 |
|
mg_ehand[MG_E_SPH] = r_sph; |
53 |
|
mg_ehand[MG_E_TD] = c_hmaterial; |
54 |
|
mg_ehand[MG_E_TS] = c_hmaterial; |
340 |
|
/* put out xform command */ |
341 |
|
printf("\n!xform"); |
342 |
|
oname = object(); |
343 |
< |
if (*oname) |
344 |
< |
printf(" -n %s", oname); |
343 |
> |
if (*oname) { |
344 |
> |
printf(" -n "); |
345 |
> |
for (op = oname; op[1]; op++) /* remove trailing separator */ |
346 |
> |
putchar(*op); |
347 |
> |
} |
348 |
|
for (i = xa0; i < ac; i++) |
349 |
|
printf(" %s", av[i]); |
350 |
|
if (ac > xa0 && xf_argc > 0) |
402 |
|
double d; |
403 |
|
register int i; |
404 |
|
|
405 |
< |
if (c_cmaterial->name != NULL) |
406 |
< |
mname = c_cmaterial->name; |
405 |
> |
if (c_cmname != NULL) |
406 |
> |
mname = c_cmname; |
407 |
|
if (!c_cmaterial->clock) |
408 |
|
return(mname); /* already current */ |
409 |
|
/* else update output */ |
432 |
|
if (c_cmaterial->td > .01 || c_cmaterial->ts > .01) { |
433 |
|
double ts, a5, a6; |
434 |
|
|
435 |
< |
ts = sqrt(c_cmaterial->ts); /* because we use 2 sides */ |
435 |
> |
if (c_cmaterial->sided) { |
436 |
> |
ts = sqrt(c_cmaterial->ts); /* approximate */ |
437 |
> |
a5 = .5; |
438 |
> |
} else |
439 |
> |
a5 = 1.; |
440 |
|
/* average colors */ |
441 |
|
d = c_cmaterial->rd + c_cmaterial->td + ts; |
442 |
|
cvtcolor(radrgb, &c_cmaterial->rd_c, c_cmaterial->rd/d); |
446 |
|
addcolor(radrgb, c2); |
447 |
|
if (c_cmaterial->rs + ts > .0001) |
448 |
|
a5 = (c_cmaterial->rs*c_cmaterial->rs_a + |
449 |
< |
ts*.5*c_cmaterial->ts_a) / |
449 |
> |
ts*a5*c_cmaterial->ts_a) / |
450 |
|
(c_cmaterial->rs + ts); |
451 |
|
a6 = (c_cmaterial->td + ts) / |
452 |
|
(c_cmaterial->rd + c_cmaterial->td + ts); |
498 |
|
{ |
499 |
|
static COLOR ciexyz; |
500 |
|
|
501 |
+ |
c_ccvt(ciec, C_CSXY); /* get xy representation */ |
502 |
|
ciexyz[1] = intensity; |
503 |
|
ciexyz[0] = ciec->cx/ciec->cy*ciexyz[1]; |
504 |
|
ciexyz[2] = ciexyz[1]*(1./ciec->cy - 1.) - ciexyz[0]; |