ViewVC Help

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

root/Development/ray/src/meta/expand.c

Comparing ray/src/meta/expand.c (file contents):
Revision 1.1 by greg, Sat Feb 22 02:07:26 2003 UTC vs.
Revision 1.3 by schorsch, Mon Jul 21 22:30:18 2003 UTC

#	Line 26 | Line 26 | static const char      RCSid[] = "$Id$";
26
27		static short  *xlist;                   /* pointer to expansion list */
28
29	+	static void exfile(FILE  *fp);
30	+	static void exprim(PRIMITIVE  *p);
31	+	static void sendmstr(register PRIMITIVE  *p);
32	+	static void sendvstr(register PRIMITIVE *p);
33	+	static void include(int  code, char  *fname);
34	+	static void polyfill(PRIMITIVE  *p);
35	+	static void polyedge(PRIMITIVE  *p, int  x1, int y1, int x2, int y2);
36
37
38	<	expand(infp, exlist)            /* expand requested commands */
39	<
40	<	FILE  *infp;
41	<	short  *exlist;
42	<
38	>	void
39	>	expand(         /* expand requested commands */
40	>	FILE  *infp,
41	>	short  *exlist
42	>	)
43		{
44		static PRIMITIVE  pincl = {PINCL, 02, -1, -1, -1, -1, VINPUT};
45		static short  vcloaded = FALSE;
#	Line 54 | Line 61 | short  *exlist;
61
62
63
64	<	static
65	<	exfile(fp)                      /* expand the given file */
66	<
67	<	register FILE  *fp;
61	<
64	>	static void
65	>	exfile(                 /* expand the given file */
66	>	register FILE  *fp
67	>	)
68		{
69		PRIMITIVE  curp;
70
#	Line 72 | Line 78 | register FILE  *fp;
78
79
80
81	<	static
82	<	exprim(p)                       /* expand primitive */
83	<
84	<	register PRIMITIVE  *p;
79	<
81	>	static void
82	>	exprim(                 /* expand primitive */
83	>	register PRIMITIVE  *p
84	>	)
85		{
86		int  xflag = xlist[comndx(p->com)];
87		/* 1==expand, 0==pass, -1==discard */
88	<	if (xflag != -1)
88	>	if (xflag != -1) {
89		if (xflag == 1)
90		switch (p->com)  {
91
#	Line 121 | Line 126 | register PRIMITIVE  *p;
126		segprim(p);
127		else
128		writep(p, stdout);
129	<
129	>	}
130		}
131
132
133
134
135	<	static
136	<	sendmstr(p)                     /* expand a matrix string */
137	<
138	<	register PRIMITIVE  *p;
134	<
135	>	static void
136	>	sendmstr(                       /* expand a matrix string */
137	>	register PRIMITIVE  *p
138	>	)
139		{
140		PRIMITIVE  pout;
141		int  cheight, cwidth, cthick, ccol;
#	Line 161 | Line 165 | register PRIMITIVE  *p;
165
166
167
168	<	static
169	<	sendvstr(p)                     /* expand a vector string */
170	<
171	<	register PRIMITIVE      *p;
168	<
168	>	static void
169	>	sendvstr(                       /* expand a vector string */
170	>	register PRIMITIVE      *p
171	>	)
172		{
173		PRIMITIVE  pout;
174		int  xadv, yadv;
#	Line 233 | Line 236 | register PRIMITIVE     *p;
236
237
238
239	<	static
240	<	include(code, fname)                    /* load an include file */
241	<
242	<	int  code;
243	<	char  *fname;
241	<
239	>	static void
240	>	include(                        /* load an include file */
241	>	int  code,
242	>	char  *fname
243	>	)
244		{
245		register FILE  *fp;
246
247		if (fname == NULL)
248		error(USER, "missing include file name in include");
249
250	<	if (code == 2 || (fp = fopen(fname, "r")) == NULL)
250	>	if (code == 2 || (fp = fopen(fname, "r")) == NULL) {
251		if (code != 0)
252		fp = mfopen(fname, "r");
253		else {
254		sprintf(errmsg, "cannot open user include file \"%s\"", fname);
255		error(USER, errmsg);
256		}
257	+	}
258
259		exfile(fp);
260		fclose(fp);
#	Line 260 | Line 263 | char  *fname;
263
264
265
266	<	static
267	<	polyfill(p)                     /* expand polygon fill command */
268	<
269	<	PRIMITIVE  *p;
267	<
266	>	static void
267	>	polyfill(                       /* expand polygon fill command */
268	>	PRIMITIVE  *p
269	>	)
270		{
271		char  *nextscan();
272		int  firstx, firsty, lastx, lasty, x, y;
#	Line 291 | Line 293 | PRIMITIVE  *p;
293
294
295
296	<	static
297	<	polyedge(p, x1, y1, x2, y2)             /* expand edge of polygon */
298	<
299	<	PRIMITIVE  *p;
300	<	int  x1, y1, x2, y2;
299	<
296	>	static void
297	>	polyedge(               /* expand edge of polygon */
298	>	PRIMITIVE  *p,
299	>	int  x1, int y1, int x2, int y2
300	>	)
301		{
302		int  reverse;
303		PRIMITIVE  pin, pout;

Diff Legend

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