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.13 by greg, Tue Mar 7 14:53:23 1995 UTC vs.
Revision 1.20 by greg, Wed Nov 8 09:40:22 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 89 | 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|1<<MG_E_CCT;
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|1<<MG_E_CCT;
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 |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX|1<<MG_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		mg_ehand[MG_E_SIDES] != NULL)
152	<	uneed |= 1<<MG_E_MATERIAL;
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 & 1<<MG_E_CCT && mg_ehand[MG_E_CCT] != 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++)
#	Line 202 | 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 218 | Line 228 | register MG_FCTXT      *ctx;
228		char    *fn;
229		{
230		static int      nfids;
221	–	int     olen;
231		register char   *cp;
232
233		ctx->fid = ++nfids;
#	Line 231 | Line 240 | char   *fn;
240		return(MG_OK);
241		}
242		/* get name relative to this context */
243	<	if (mg_file != NULL &&
235	<	(cp = strrchr(mg_file->fname, '/')) != NULL)
236	<	olen = cp - mg_file->fname + 1;
237	<	else
238	<	olen = 0;
239	<	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 342 | Line 348 | mg_load(fn)                    /* load an MGF file */
348		char    *fn;
349		{
350		MG_FCTXT        cntxt;
351	<	int     rval;
351	>	register int    rval;
352
353		if ((rval = mg_open(&cntxt, fn)) != MG_OK) {
354		fprintf(stderr, "%s: %s\n", fn, mg_err[rval]);
355		return(rval);
356		}
357	<	while (mg_read())               /* parse each line */
357	>	while ((rval = mg_read()) > 0) {        /* parse each line */
358	>	if (rval >= MG_MAXLINE-1 && cntxt.inpline[rval-1] != '\n') {
359	>	fprintf(stderr, "%s: %d: %s\n", cntxt.fname,
360	>	cntxt.lineno, mg_err[rval=MG_ELINE]);
361	>	break;
362	>	}
363		if ((rval = mg_parse()) != MG_OK) {
364		fprintf(stderr, "%s: %d: %s:\n%s", cntxt.fname,
365		cntxt.lineno, mg_err[rval],
366		cntxt.inpline);
367		break;
368		}
369	+	}
370		mg_close();
371		return(rval);
372		}
373
374
375	+	int
376	+	mg_defuhand(ac, av)             /* default handler for unknown entities */
377	+	int     ac;
378	+	char    **av;
379	+	{
380	+	if (mg_nunknown++ == 0)         /* report first incident */
381	+	fprintf(stderr, "%s: %d: %s: %s\n", mg_file->fname,
382	+	mg_file->lineno, mg_err[MG_EUNK], av[0]);
383	+	return(MG_OK);
384	+	}
385	+
386	+
387		void
388		mg_clear()                      /* clear parser history */
389		{
#	Line 389 | Line 413 | char   **av;
413		{
414		char    *xfarg[MG_MAXARGC];
415		MG_FCTXT        ictx;
416	<	int     rv;
416	>	XF_SPEC *xf_orig = xf_context;
417	>	register int    rv;
418
419		if (ac < 2)
420		return(MG_EARGC);
#	Line 405 | Line 430 | char   **av;
430		if ((rv = mg_handle(MG_E_XF, ac-1, xfarg)) != MG_OK)
431		return(rv);
432		}
433	<	while (!feof(mg_file->fp)) {
434	<	while (mg_read())
433	>	do {
434	>	while ((rv = mg_read()) > 0) {
435	>	if (rv >= MG_MAXLINE-1 && ictx.inpline[rv-1] != '\n') {
436	>	fprintf(stderr, "%s: %d: %s\n", ictx.fname,
437	>	ictx.lineno, mg_err[MG_ELINE]);
438	>	mg_close();
439	>	return(MG_EINCL);
440	>	}
441		if ((rv = mg_parse()) != MG_OK) {
442		fprintf(stderr, "%s: %d: %s:\n%s", ictx.fname,
443		ictx.lineno, mg_err[rv],
#	Line 414 | Line 445 | char   **av;
445		mg_close();
446		return(MG_EINCL);
447		}
448	+	}
449		if (ac > 2)
450		if ((rv = mg_handle(MG_E_XF, 1, xfarg)) != MG_OK)
451		return(rv);
452	<	}
452	>	} while (xf_context != xf_orig);
453		mg_close();
454		return(MG_OK);
455		}
#	Line 714 | Line 746 | char   **av;
746		static char     *p4ent[5] = {mg_ename[MG_E_POINT],p4[0],p4[1],p4[2]};
747		static char     *n4ent[5] = {mg_ename[MG_E_NORMAL],n4[0],n4[1],n4[2]};
748		static char     *fent[6] = {mg_ename[MG_E_FACE],"_cv1","_cv2","_cv3","_cv4"};
749	+	char    *v1n;
750		register C_VERTEX       *cv1, *cv2;
751		register int    i, j;
752		FVECT   u, v, w;
#	Line 729 | Line 762 | char   **av;
762		if ((cv1 = c_getvert(av[1])) == NULL ||
763		(cv2 = c_getvert(av[3])) == NULL)
764		return(MG_EUNDEF);
765	+	v1n = av[1];
766		if (!isflt(av[2]) || !isflt(av[4]))
767		return(MG_ETYPE);
768		rad1 = atof(av[2]);
#	Line 747 | Line 781 | char   **av;
781		cv = cv1;
782		cv1 = cv2;
783		cv2 = cv;
784	+	v1n = av[3];
785		d = rad1;
786		rad1 = rad2;
787		rad2 = d;
#	Line 780 | Line 815 | char   **av;
815		if ((rv = mg_handle(MG_E_NORMAL, 4, n3ent)) != MG_OK)
816		return(rv);
817		if (rad1 == 0.) {               /* triangles */
818	<	v1ent[3] = av[1];
818	>	v1ent[3] = v1n;
819		if ((rv = mg_handle(MG_E_VERTEX, 4, v1ent)) != MG_OK)
820		return(rv);
821		for (j = 0; j < 3; j++)
#	Line 1004 | Line 1039 | put_cspec()                    /* put out current color spectrum */
1039		newav[2] = wl[1];
1040		sf = (double)C_CNSS / c_ccolor->ssum;
1041		for (i = 0; i < C_CNSS; i++) {
1042	<	sprintf(vbuf[i], "%.6f", sf*c_ccolor->ssamp[i]);
1042	>	sprintf(vbuf[i], "%.4f", sf*c_ccolor->ssamp[i]);
1043		newav[i+3] = vbuf[i];
1044		}
1045		newav[C_CNSS+3] = NULL;

Diff Legend

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