ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/cv/mgflib/parser.c

Comparing ray/src/cv/mgflib/parser.c (file contents):
Revision 1.10 by greg, Wed Jun 29 16:15:20 1994 UTC vs.
Revision 1.19 by greg, Fri Oct 27 15:47:18 1995 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1994 Regents of the University of California */
1	>	/* Copyright (c) 1995 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 27 | Line 27 | char   mg_ename[MG_NENTITIES][MG_MAXELEN] = MG_NAMELIST;
27
28		int     (*mg_ehand[MG_NENTITIES])();
29
30	+	/* Handler routine for unknown entities */
31	+
32	+	int     (*mg_uhand)() = mg_defuhand;
33	+
34	+	unsigned        mg_nunknown;    /* count of unknown entities */
35	+
36		/* error messages */
37
38		char    *mg_err[MG_NERRS] = MG_ERRLIST;
#	Line 59 | Line 65 | static int     e_any_toss(),           /* discard unneeded entity *
65		e_ies(),                /* IES luminaire file */
66		e_include(),            /* include file */
67		e_sph(),                /* sphere */
68	+	e_cct(),                /* color temperature */
69		e_cmix(),               /* color mixtures */
70		e_cspec(),              /* color spectra */
71		e_cyl(),                /* cylinder */
#	Line 88 | Line 95 | mg_init()                      /* initialize alternate entity handlers */
95		mg_ehand[MG_E_INCLUDE] = e_include;
96		if (mg_ehand[MG_E_SPH] == NULL) {
97		mg_ehand[MG_E_SPH] = e_sph;
98	<	ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
98	>	ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
99		} else
100	<	uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
100	>	uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
101		if (mg_ehand[MG_E_CYL] == NULL) {
102		mg_ehand[MG_E_CYL] = e_cyl;
103	<	ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
103	>	ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
104		} else
105	<	uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
105	>	uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
106		if (mg_ehand[MG_E_CONE] == NULL) {
107		mg_ehand[MG_E_CONE] = e_cone;
108	<	ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
108	>	ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
109		} else
110	<	uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
110	>	uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
111		if (mg_ehand[MG_E_RING] == NULL) {
112		mg_ehand[MG_E_RING] = e_ring;
113	<	ineed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX;
113	>	ineed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX;
114		} else
115	<	uneed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX|1<<MG_E_XF;
115	>	uneed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX|1L<<MG_E_XF;
116		if (mg_ehand[MG_E_PRISM] == NULL) {
117		mg_ehand[MG_E_PRISM] = e_prism;
118	<	ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
118	>	ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
119		} else
120	<	uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
120	>	uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
121		if (mg_ehand[MG_E_TORUS] == NULL) {
122		mg_ehand[MG_E_TORUS] = e_torus;
123	<	ineed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX;
123	>	ineed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX;
124		} else
125	<	uneed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX|1<<MG_E_XF;
125	>	uneed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX|1L<<MG_E_XF;
126		if (mg_ehand[MG_E_COLOR] != NULL) {
127		if (mg_ehand[MG_E_CMIX] == NULL) {
128		mg_ehand[MG_E_CMIX] = e_cmix;
129	<	ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX;
129	>	ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
130		}
131		if (mg_ehand[MG_E_CSPEC] == NULL) {
132		mg_ehand[MG_E_CSPEC] = e_cspec;
133	<	ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX;
133	>	ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
134		}
135	+	if (mg_ehand[MG_E_CCT] == NULL) {
136	+	mg_ehand[MG_E_CCT] = e_cct;
137	+	ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
138	+	}
139		}
140		/* check for consistency */
141		if (mg_ehand[MG_E_FACE] != NULL)
142	<	uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
142	>	uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
143		if (mg_ehand[MG_E_CXY] != NULL || mg_ehand[MG_E_CSPEC] != NULL ||
144		mg_ehand[MG_E_CMIX] != NULL)
145	<	uneed |= 1<<MG_E_COLOR;
145	>	uneed |= 1L<<MG_E_COLOR;
146		if (mg_ehand[MG_E_RD] != NULL || mg_ehand[MG_E_TD] != NULL ||
147	+	mg_ehand[MG_E_IR] != NULL ||
148		mg_ehand[MG_E_ED] != NULL ||
149		mg_ehand[MG_E_RS] != NULL ||
150	<	mg_ehand[MG_E_TS] != NULL)
151	<	uneed |= 1<<MG_E_MATERIAL;
150	>	mg_ehand[MG_E_TS] != NULL ||
151	>	mg_ehand[MG_E_SIDES] != NULL)
152	>	uneed |= 1L<<MG_E_MATERIAL;
153		for (i = 0; i < MG_NENTITIES; i++)
154	<	if (uneed & 1<<i && mg_ehand[i] == NULL) {
154	>	if (uneed & 1L<<i && mg_ehand[i] == NULL) {
155		fprintf(stderr, "Missing support for \"%s\" entity\n",
156		mg_ename[i]);
157		exit(1);
158		}
159		/* add support as needed */
160	<	if (ineed & 1<<MG_E_VERTEX && mg_ehand[MG_E_VERTEX] != c_hvertex)
160	>	if (ineed & 1L<<MG_E_VERTEX && mg_ehand[MG_E_VERTEX] != c_hvertex)
161		e_supp[MG_E_VERTEX] = c_hvertex;
162	<	if (ineed & 1<<MG_E_POINT && mg_ehand[MG_E_POINT] != c_hvertex)
162	>	if (ineed & 1L<<MG_E_POINT && mg_ehand[MG_E_POINT] != c_hvertex)
163		e_supp[MG_E_POINT] = c_hvertex;
164	<	if (ineed & 1<<MG_E_NORMAL && mg_ehand[MG_E_NORMAL] != c_hvertex)
164	>	if (ineed & 1L<<MG_E_NORMAL && mg_ehand[MG_E_NORMAL] != c_hvertex)
165		e_supp[MG_E_NORMAL] = c_hvertex;
166	<	if (ineed & 1<<MG_E_COLOR && mg_ehand[MG_E_COLOR] != c_hcolor)
166	>	if (ineed & 1L<<MG_E_COLOR && mg_ehand[MG_E_COLOR] != c_hcolor)
167		e_supp[MG_E_COLOR] = c_hcolor;
168	<	if (ineed & 1<<MG_E_CXY && mg_ehand[MG_E_CXY] != c_hcolor)
168	>	if (ineed & 1L<<MG_E_CXY && mg_ehand[MG_E_CXY] != c_hcolor)
169		e_supp[MG_E_CXY] = c_hcolor;
170	<	if (ineed & 1<<MG_E_CSPEC && mg_ehand[MG_E_CSPEC] != c_hcolor)
170	>	if (ineed & 1L<<MG_E_CSPEC && mg_ehand[MG_E_CSPEC] != c_hcolor)
171		e_supp[MG_E_CSPEC] = c_hcolor;
172	<	if (ineed & 1<<MG_E_CMIX && mg_ehand[MG_E_CMIX] != c_hcolor)
172	>	if (ineed & 1L<<MG_E_CMIX && mg_ehand[MG_E_CMIX] != c_hcolor)
173		e_supp[MG_E_CMIX] = c_hcolor;
174	+	if (ineed & 1L<<MG_E_CCT && mg_ehand[MG_E_CCT] != c_hcolor)
175	+	e_supp[MG_E_CCT] = c_hcolor;
176		/* discard remaining entities */
177		for (i = 0; i < MG_NENTITIES; i++)
178		if (mg_ehand[i] == NULL)
#	Line 165 | Line 180 | mg_init()                      /* initialize alternate entity handlers */
180		}
181
182
168	–
183		int
184		mg_entity(name)                 /* get entity number from its name */
185		char    *name;
#	Line 195 | Line 209 | char   **av;
209		{
210		int     rv;
211
212	<	if (en < 0 && (en = mg_entity(av[0])) < 0)
212	>	if (en < 0 && (en = mg_entity(av[0])) < 0) {    /* unknown entity */
213	>	if (mg_uhand != NULL)
214	>	return((*mg_uhand)(ac, av));
215		return(MG_EUNK);
216	<	if (e_supp[en] != NULL) {
216	>	}
217	>	if (e_supp[en] != NULL) {                       /* support handler */
218		if ((rv = (*e_supp[en])(ac, av)) != MG_OK)
219		return(rv);
220		}
221	<	return((*mg_ehand[en])(ac, av));
221	>	return((*mg_ehand[en])(ac, av));                /* assigned handler */
222		}
223
224
#	Line 211 | Line 228 | register MG_FCTXT      *ctx;
228		char    *fn;
229		{
230		static int      nfids;
214	–	int     olen;
231		register char   *cp;
232
233		ctx->fid = ++nfids;
#	Line 224 | Line 240 | char   *fn;
240		return(MG_OK);
241		}
242		/* get name relative to this context */
243	<	if (mg_file != NULL &&
228	<	(cp = strrchr(mg_file->fname, '/')) != NULL)
229	<	olen = cp - mg_file->fname + 1;
230	<	else
231	<	olen = 0;
232	<	if (olen)
243	>	if (mg_file != NULL && (cp = strrchr(mg_file->fname, '/')) != NULL) {
244		strcpy(ctx->fname, mg_file->fname);
245	<	strcpy(ctx->fname+olen, fn);
245	>	strcpy(ctx->fname+(cp-mg_file->fname+1), fn);
246	>	} else
247	>	strcpy(ctx->fname, fn);
248		ctx->fp = fopen(ctx->fname, "r");
249		if (ctx->fp == NULL)
250		return(MG_ENOFILE);
#	Line 353 | Line 366 | char   *fn;
366		}
367
368
369	+	int
370	+	mg_defuhand(ac, av)             /* default handler for unknown entities */
371	+	int     ac;
372	+	char    **av;
373	+	{
374	+	if (mg_nunknown++ == 0)         /* report first incident */
375	+	fprintf(stderr, "%s: %d: %s: %s\n", mg_file->fname,
376	+	mg_file->lineno, mg_err[MG_EUNK], av[0]);
377	+	return(MG_OK);
378	+	}
379	+
380	+
381		void
382		mg_clear()                      /* clear parser history */
383		{
#	Line 382 | Line 407 | char   **av;
407		{
408		char    *xfarg[MG_MAXARGC];
409		MG_FCTXT        ictx;
410	+	XF_SPEC *xf_orig = xf_context;
411		int     rv;
412
413		if (ac < 2)
#	Line 398 | Line 424 | char   **av;
424		if ((rv = mg_handle(MG_E_XF, ac-1, xfarg)) != MG_OK)
425		return(rv);
426		}
427	<	while (!feof(mg_file->fp)) {
427	>	do {
428		while (mg_read())
429		if ((rv = mg_parse()) != MG_OK) {
430		fprintf(stderr, "%s: %d: %s:\n%s", ictx.fname,
#	Line 410 | Line 436 | char   **av;
436		if (ac > 2)
437		if ((rv = mg_handle(MG_E_XF, 1, xfarg)) != MG_OK)
438		return(rv);
439	<	}
439	>	} while (xf_context != xf_orig);
440		mg_close();
441		return(MG_OK);
442		}
#	Line 707 | Line 733 | char   **av;
733		static char     *p4ent[5] = {mg_ename[MG_E_POINT],p4[0],p4[1],p4[2]};
734		static char     *n4ent[5] = {mg_ename[MG_E_NORMAL],n4[0],n4[1],n4[2]};
735		static char     *fent[6] = {mg_ename[MG_E_FACE],"_cv1","_cv2","_cv3","_cv4"};
736	+	char    *v1n;
737		register C_VERTEX       *cv1, *cv2;
738		register int    i, j;
739		FVECT   u, v, w;
#	Line 722 | Line 749 | char   **av;
749		if ((cv1 = c_getvert(av[1])) == NULL ||
750		(cv2 = c_getvert(av[3])) == NULL)
751		return(MG_EUNDEF);
752	+	v1n = av[1];
753		if (!isflt(av[2]) || !isflt(av[4]))
754		return(MG_ETYPE);
755		rad1 = atof(av[2]);
#	Line 740 | Line 768 | char   **av;
768		cv = cv1;
769		cv1 = cv2;
770		cv2 = cv;
771	+	v1n = av[3];
772		d = rad1;
773		rad1 = rad2;
774		rad2 = d;
#	Line 773 | Line 802 | char   **av;
802		if ((rv = mg_handle(MG_E_NORMAL, 4, n3ent)) != MG_OK)
803		return(rv);
804		if (rad1 == 0.) {               /* triangles */
805	<	v1ent[3] = av[1];
805	>	v1ent[3] = v1n;
806		if ((rv = mg_handle(MG_E_VERTEX, 4, v1ent)) != MG_OK)
807		return(rv);
808		for (j = 0; j < 3; j++)
#	Line 865 | Line 894 | int    ac;
894		char    **av;
895		{
896		static char     p[3][24];
897	<	static char     *vent[4] = {mg_ename[MG_E_VERTEX],NULL,"="};
897	>	static char     *vent[5] = {mg_ename[MG_E_VERTEX],NULL,"="};
898		static char     *pent[5] = {mg_ename[MG_E_POINT],p[0],p[1],p[2]};
899	+	static char     *znorm[5] = {mg_ename[MG_E_NORMAL],"0","0","0"};
900		char    *newav[MG_MAXARGC], nvn[MG_MAXARGC-1][8];
901		double  length;
902	+	int     hasnorm;
903		FVECT   v1, v2, v3, norm;
904		register C_VERTEX       *cv;
905		C_VERTEX        *cv0;
906		int     rv;
907		register int    i, j;
908	<
908	>	/* check arguments */
909		if (ac < 5)
910		return(MG_EARGC);
911		if (!isflt(av[ac-1]))
#	Line 882 | Line 913 | char   **av;
913		length = atof(av[ac-1]);
914		if (length <= FTINY && length >= -FTINY)
915		return(MG_EILL);
916	<	/* do bottom face */
886	<	newav[0] = mg_ename[MG_E_FACE];
887	<	for (i = 1; i < ac-1; i++)
888	<	newav[i] = av[i];
889	<	newav[i] = NULL;
890	<	if ((rv = mg_handle(MG_E_FACE, i, newav)) != MG_OK)
891	<	return(rv);
892	<	/* compute face normal */
916	>	/* compute face normal */
917		if ((cv0 = c_getvert(av[1])) == NULL)
918		return(MG_EUNDEF);
919	+	hasnorm = 0;
920		norm[0] = norm[1] = norm[2] = 0.;
921		v1[0] = v1[1] = v1[2] = 0.;
922		for (i = 2; i < ac-1; i++) {
923		if ((cv = c_getvert(av[i])) == NULL)
924		return(MG_EUNDEF);
925	+	hasnorm += !is0vect(cv->n);
926		v2[0] = cv->p[0] - cv0->p[0];
927		v2[1] = cv->p[1] - cv0->p[1];
928		v2[2] = cv->p[2] - cv0->p[2];
#	Line 908 | Line 934 | char   **av;
934		}
935		if (normalize(norm) == 0.)
936		return(MG_EILL);
937	<	/* create moved vertices */
937	>	/* create moved vertices */
938		for (i = 1; i < ac-1; i++) {
939		sprintf(nvn[i-1], "_pv%d", i);
940		vent[1] = nvn[i-1];
941	<	if ((rv = mg_handle(MG_E_VERTEX, 3, vent)) != MG_OK)
941	>	vent[3] = av[i];
942	>	if ((rv = mg_handle(MG_E_VERTEX, 4, vent)) != MG_OK)
943		return(rv);
944		cv = c_getvert(av[i]);          /* checked above */
945		for (j = 0; j < 3; j++)
946		sprintf(p[j], FLTFMT, cv->p[j] - length*norm[j]);
947		if ((rv = mg_handle(MG_E_POINT, 4, pent)) != MG_OK)
948		return(rv);
922	–	newav[ac-1-i] = nvn[i-1];       /* reverse */
949		}
950	<	/* do top face */
951	<	if ((rv = mg_handle(MG_E_FACE, ac-1, newav)) != MG_OK)
926	<	return(rv);
950	>	/* make faces */
951	>	newav[0] = mg_ename[MG_E_FACE];
952		/* do the side faces */
953		newav[5] = NULL;
954		newav[3] = av[ac-2];
#	Line 936 | Line 961 | char   **av;
961		newav[3] = newav[2];
962		newav[4] = newav[1];
963		}
964	+	/* do top face */
965	+	for (i = 1; i < ac-1; i++) {
966	+	if (hasnorm) {                  /* zero normals */
967	+	vent[1] = nvn[i-1];
968	+	if ((rv = mg_handle(MG_E_VERTEX, 2, vent)) != MG_OK)
969	+	return(rv);
970	+	if ((rv = mg_handle(MG_E_NORMAL, 4, znorm)) != MG_OK)
971	+	return(rv);
972	+	}
973	+	newav[ac-1-i] = nvn[i-1];       /* reverse */
974	+	}
975	+	if ((rv = mg_handle(MG_E_FACE, ac-1, newav)) != MG_OK)
976	+	return(rv);
977	+	/* do bottom face */
978	+	if (hasnorm)
979	+	for (i = 1; i < ac-1; i++) {
980	+	vent[1] = nvn[i-1];
981	+	vent[3] = av[i];
982	+	if ((rv = mg_handle(MG_E_VERTEX, 4, vent)) != MG_OK)
983	+	return(rv);
984	+	if ((rv = mg_handle(MG_E_NORMAL, 4, znorm)) != MG_OK)
985	+	return(rv);
986	+	newav[i] = nvn[i-1];
987	+	}
988	+	else
989	+	for (i = 1; i < ac-1; i++)
990	+	newav[i] = av[i];
991	+	newav[i] = NULL;
992	+	if ((rv = mg_handle(MG_E_FACE, i, newav)) != MG_OK)
993	+	return(rv);
994		return(MG_OK);
995		}
996
997
998		static int
999	<	e_cspec(ac, av)                 /* handle spectral color */
945	<	int     ac;
946	<	char    **av;
999	>	put_cxy()                       /* put out current xy chromaticities */
1000		{
1001		static char     xbuf[24], ybuf[24];
1002		static char     *ccom[4] = {mg_ename[MG_E_CXY], xbuf, ybuf};
1003		int     rv;
1004
1005	+	sprintf(xbuf, "%.4f", c_ccolor->cx);
1006	+	sprintf(ybuf, "%.4f", c_ccolor->cy);
1007	+	if ((rv = mg_handle(MG_E_CXY, 3, ccom)) != MG_OK)
1008	+	return(rv);
1009	+	return(MG_OK);
1010	+	}
1011	+
1012	+
1013	+	static int
1014	+	put_cspec()                     /* put out current color spectrum */
1015	+	{
1016	+	char    wl[2][6], vbuf[C_CNSS][24];
1017	+	char    *newav[C_CNSS+4];
1018	+	double  sf;
1019	+	register int    i;
1020	+
1021	+	if (mg_ehand[MG_E_CSPEC] != c_hcolor) {
1022	+	sprintf(wl[0], "%d", C_CMINWL);
1023	+	sprintf(wl[1], "%d", C_CMAXWL);
1024	+	newav[0] = mg_ename[MG_E_CSPEC];
1025	+	newav[1] = wl[0];
1026	+	newav[2] = wl[1];
1027	+	sf = (double)C_CNSS / c_ccolor->ssum;
1028	+	for (i = 0; i < C_CNSS; i++) {
1029	+	sprintf(vbuf[i], "%.4f", sf*c_ccolor->ssamp[i]);
1030	+	newav[i+3] = vbuf[i];
1031	+	}
1032	+	newav[C_CNSS+3] = NULL;
1033	+	if ((i = mg_handle(MG_E_CSPEC, C_CNSS+3, newav)) != MG_OK)
1034	+	return(i);
1035	+	}
1036	+	return(MG_OK);
1037	+	}
1038	+
1039	+
1040	+	static int
1041	+	e_cspec(ac, av)                 /* handle spectral color */
1042	+	int     ac;
1043	+	char    **av;
1044	+	{
1045	+	/* convert to xy chromaticity */
1046		c_ccvt(c_ccolor, C_CSXY);
1047		/* if it's really their handler, use it */
1048	<	if (mg_ehand[MG_E_CXY] != c_hcolor) {
1049	<	sprintf(xbuf, "%.4f", c_ccolor->cx);
956	<	sprintf(ybuf, "%.4f", c_ccolor->cy);
957	<	if ((rv = mg_handle(MG_E_CXY, 3, ccom)) != MG_OK)
958	<	return(rv);
959	<	}
1048	>	if (mg_ehand[MG_E_CXY] != c_hcolor)
1049	>	return(put_cxy());
1050		return(MG_OK);
1051		}
1052
#	Line 966 | Line 1056 | e_cmix(ac, av)                 /* handle mixing of colors */
1056		int     ac;
1057		char    **av;
1058		{
969	–	char    wl[2][6], vbuf[C_CNSS][24];
970	–	char    *newav[C_CNSS+4];
971	–	int     rv;
972	–	register int    i;
1059		/*
1060		* Contorted logic works as follows:
1061		*      1. the colors are already mixed in c_hcolor() support function
#	Line 980 | Line 1066 | char   **av;
1066		*/
1067		if (mg_ehand[MG_E_CSPEC] == e_cspec)
1068		c_ccvt(c_ccolor, C_CSXY);
1069	<	else if (c_ccolor->flags & C_CDSPEC) {
1070	<	if (mg_ehand[MG_E_CSPEC] != c_hcolor) {
1071	<	sprintf(wl[0], "%d", C_CMINWL);
1072	<	sprintf(wl[1], "%d", C_CMAXWL);
1073	<	newav[0] = mg_ename[MG_E_CSPEC];
1074	<	newav[1] = wl[0];
1075	<	newav[2] = wl[1];
1076	<	for (i = 0; i < C_CNSS; i++) {
1077	<	sprintf(vbuf[i], "%.6f",
1078	<	(double)c_ccolor->ssamp[i] /
1079	<	c_ccolor->ssum);
1080	<	newav[i+3] = vbuf[i];
1081	<	}
1082	<	newav[C_CNSS+3] = NULL;
1083	<	if ((rv = mg_handle(MG_E_CSPEC, C_CNSS+3, newav)) != MG_OK)
1084	<	return(rv);
1085	<	}
1086	<	return(MG_OK);
1087	<	}
1088	<	if (mg_ehand[MG_E_CXY] != c_hcolor) {
1089	<	sprintf(vbuf[0], "%.4f", c_ccolor->cx);
1090	<	sprintf(vbuf[1], "%.4f", c_ccolor->cy);
1091	<	newav[0] = mg_ename[MG_E_CXY];
1092	<	newav[1] = vbuf[0];
1007	<	newav[2] = vbuf[1];
1008	<	newav[3] = NULL;
1009	<	if ((rv = mg_handle(MG_E_CXY, 3, newav)) != MG_OK)
1010	<	return(rv);
1011	<	}
1069	>	else if (c_ccolor->flags & C_CDSPEC)
1070	>	return(put_cspec());
1071	>	if (mg_ehand[MG_E_CXY] != c_hcolor)
1072	>	return(put_cxy());
1073	>	return(MG_OK);
1074	>	}
1075	>
1076	>
1077	>	static int
1078	>	e_cct(ac, av)                   /* handle color temperature */
1079	>	int     ac;
1080	>	char    **av;
1081	>	{
1082	>	/*
1083	>	* Logic is similar to e_cmix here.  Support handler has already
1084	>	* converted temperature to spectral color.  Put it out as such
1085	>	* if they support it, otherwise convert to xy chromaticity and
1086	>	* put it out if they handle it.
1087	>	*/
1088	>	if (mg_ehand[MG_E_CSPEC] != e_cspec)
1089	>	return(put_cspec());
1090	>	c_ccvt(c_ccolor, C_CSXY);
1091	>	if (mg_ehand[MG_E_CXY] != c_hcolor)
1092	>	return(put_cxy());
1093		return(MG_OK);
1094		}

Diff Legend

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