ViewVC Help

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

root/radiance/ray/src/gen/xform.c

Comparing ray/src/gen/xform.c (file contents):
Revision 1.6 by greg, Wed Oct 4 13:09:54 1989 UTC vs.
Revision 2.48 by greg, Wed Jul 9 23:14:58 2014 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1986 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		*  xform.c - program to transform object files.
6		*              Transformations must preserve aspect ratio.
#	Line 12 | Line 9 | static char SCCSid[] = "$SunId$ LBL";
9		*     11/6/86          Finally added error checking!
10		*/
11
15	–	#include  <stdio.h>
16	–
12		#include  <ctype.h>
13
14	+	#include  "platform.h"
15	+	#include  "paths.h"
16	+	#include  "rtprocess.h" /* win_popen() */
17	+	#include  "rtio.h"
18	+	#include  "rtmath.h"
19	+	#include  "object.h"
20	+	#include  "otypes.h"
21
22	<	typedef struct {
23	<	char  *funame;                  /* function name */
24	<	int  (*funp)();                 /* pointer to function */
25	<	}  FUN;
22	>	#ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
23	>	#undef getc
24	>	#define getc    getc_unlocked
25	>	#endif
26
27		int  xac;                               /* global xform argument count */
28		char  **xav;                            /* global xform argument pointer */
29		int  xfa;                               /* start of xf arguments */
30
31	<	double  totxform[4][4];                 /* total transformation matrix */
32	<	double  totscale;                       /* total scale factor */
31	<	int  reverse;                           /* boolean true if scene inverted */
31	>	XF  tot;                                /* total transformation */
32	>	int  reverse;                           /* boolean true if scene mirrored */
33
34	<	int  expand = 0;                        /* boolean true to expand commands */
34	>	int  invert;                            /* boolean true to invert surfaces */
35
36	<	char  *idprefix = NULL;                 /* prefix for object identifiers */
36	>	int  expand;                            /* boolean true to expand commands */
37
38	<	extern int  o_source();
38	<	extern int  o_sphere();
39	<	extern int  o_face();
40	<	extern int  o_cone();
41	<	extern int  o_cylinder();
42	<	extern int  o_ring();
43	<	extern int  m_glow();
44	<	extern int  m_spot();
45	<	extern int  m_dielectric();
46	<	extern int  m_interface();
47	<	extern int  text();
48	<	extern int  alias();
49	<	extern int  passargs();
50	<	extern int  addxform();
38	>	char  *newmod;                          /* new modifier for surfaces */
39
40	<	FUN  ofun[] = {
53	<	{ "source", o_source },
54	<	{ "sphere", o_sphere },
55	<	{ "bubble", o_sphere },
56	<	{ "polygon", o_face },
57	<	{ "cone", o_cone },
58	<	{ "cup", o_cone },
59	<	{ "cylinder", o_cylinder },
60	<	{ "tube", o_cylinder },
61	<	{ "ring", o_ring },
62	<	{ "instance", addxform },
63	<	{ "alias", alias },
64	<	{ "antimatter", passargs },
65	<	{ "glow", m_glow },
66	<	{ "spotlight", m_spot },
67	<	{ "dielectric", m_dielectric },
68	<	{ "interface", m_interface },
69	<	{ "colortext", text },
70	<	{ "brighttext", text },
71	<	{ "texfunc", addxform },
72	<	{ "texdata", addxform },
73	<	{ "colorfunc", addxform },
74	<	{ "brightfunc", addxform },
75	<	{ "colorpict", addxform },
76	<	{ "colordata", addxform },
77	<	{ "brightdata", addxform },
78	<	{ "mixfunc", addxform },
79	<	{ "mixdata", addxform },
80	<	{ "mixtext", text },
81	<	{ "light", passargs },
82	<	{ "illum", passargs },
83	<	{ "plastic", passargs },
84	<	{ "metal", passargs },
85	<	{ "trans", passargs },
86	<	{ "glass", passargs },
87	<	{ 0 }                                   /* terminator */
88	<	};
40	>	char  *idprefix;                        /* prefix for object identifiers */
41
42	<	#define  issurface(t)           ((t)<=9)
42	>	FUN  ofun[NUMOTYPE] = INIT_OTYPE;       /* default types and actions */
43
44	<	typedef struct {
93	<	short  nsargs;                  /* # of string arguments */
94	<	char  **sarg;                   /* string arguments */
95	<	short  niargs;                  /* # of integer arguments */
96	<	int  *iarg;                     /* integer arguments */
97	<	short  nfargs;                  /* # of float arguments */
98	<	double  *farg;                  /* float arguments */
99	<	}  FUNARGS;
44	>	short  tinvers[NUMOTYPE];               /* inverse types for surfaces */
45
46	<	#define  MAXSTR         512             /* maximum string length */
46	>	int  nrept = 1;                         /* number of array repetitions */
47
48	<	FUNARGS  *getfargs();
104	<	char  *malloc();
48	>	int stdinused = 0;                      /* stdin has been used by -f option? */
49
50	<	#define  progname  (xav[0])
50	>	char  mainfn[PATH_MAX];                 /* main file name */
51	>	FILE  *mainfp = NULL;                   /* main file pointer */
52
53	+	#define  progname  (xav[0])
54
55	<	main(argc, argv)                /* get transform options and transform file */
56	<	int  argc;
57	<	char  *argv[];
55	>	static int doargf(int ac, char **av, int fi);
56	>	static int doarray(int ac, char **av, int ai);
57	>	static void xform(char *name, FILE *fin);
58	>	static void xfcomm(char *fname, FILE *fin);
59	>	static void xfobject(char *fname, FILE *fin);
60	>	static int addxform(FILE *fin);
61	>	static int alias(FILE *fin);
62	>	void initotypes(void); /* XXX conflict with otypes.h */
63	>	static void openmain(char *iname);
64	>
65	>
66	>	int
67	>	main(           /* get transform options and transform file */
68	>	int  argc,
69	>	char  *argv[]
70	>	)
71		{
72	<	FILE  *fopen();
114	<	FILE  *fp;
72	>	int  mal_prefix = 0;
73		int  a;
74	+	/* check for argument list file */
75	+	for (a = 1; a < argc; a++)
76	+	if (!strcmp(argv[a], "-f"))
77	+	return(doargf(argc, argv, a));
78	+	/* check for regular array */
79	+	for (a = 1; a < argc; a++)
80	+	if (!strcmp(argv[a], "-a"))
81	+	return(doarray(argc, argv, a));
82
83	<	xav = argv;
83	>	initotypes();                   /* initialize */
84	>	invert = 0;
85	>	expand = 1;
86	>	newmod = NULL;
87	>	idprefix = NULL;
88
89		for (a = 1; a < argc; a++) {
90		if (argv[a][0] == '-')
91		switch (argv[a][1]) {
92	+	case 'm':
93	+	if (argv[a][2] | (a+1 >= argc))
94	+	break;
95	+	a++;
96	+	if (newmod == NULL)
97	+	newmod = argv[a];
98	+	continue;
99		case 'n':
100	<	idprefix = argv[++a];
100	>	if (argv[a][2] | (a+1 >= argc))
101	>	break;
102	>	a++;
103	>	if (idprefix == NULL)
104	>	idprefix = argv[a];
105	>	else {
106	>	char    *newp;
107	>	newp = (char *)malloc(strlen(idprefix)+
108	>	strlen(argv[a])+2);
109	>	if (newp == NULL)
110	>	exit(2);
111	>	sprintf(newp, "%s.%s",
112	>	idprefix, argv[a]);
113	>	if (mal_prefix++)
114	>	free(idprefix);
115	>	idprefix = newp;
116	>	}
117		continue;
118	+	case 'c':
119	+	if (argv[a][2])
120	+	break;
121	+	expand = 0;
122	+	continue;
123		case 'e':
124	+	if (argv[a][2])
125	+	break;
126		expand = 1;
127		continue;
128	+	case 'I':
129	+	if (argv[a][2])
130	+	break;
131	+	invert = !invert;
132	+	continue;
133		}
134		break;
135		}
136
137	+	xav = argv;
138		xfa = a;
139
140	<	totscale = 1.0;
135	<	setident4(totxform);
140	>	a += xf(&tot, argc-a, argv+a);
141
142	<	a += xf(totxform, &totscale, argc-a, argv+a);
142	>	if ( (reverse = (tot.sca < 0.0)) )
143	>	tot.sca = -tot.sca;
144	>	if (invert)
145	>	reverse = !reverse;
146
147	<	if (reverse = totscale < 0.0)
148	<	totscale = -totscale;
147	>	if (a < argc && argv[a][0] == '-') {
148	>	fprintf(stderr, "%s: command line error at '%s'\n",
149	>	argv[0], argv[a]);
150	>	exit(1);
151	>	}
152
153		xac = a;
154	<
155	<	putchar('#');                           /* simple header */
154	>	/* simple header */
155	>	putchar('#');
156		for (a = 0; a < xac; a++)
157		printf(" %s", xav[a]);
158		putchar('\n');
159	+	/* transform input */
160	+	if (xac == argc) {
161	+	if (stdinused) {
162	+	fprintf(stderr, "%s: cannot use stdin more than once\n",
163	+	argv[0]);
164	+	exit(1);
165	+	}
166	+	openmain(NULL);
167	+	xform(mainfn, mainfp);
168	+	} else
169	+	for (a = xac; a < argc; a++) {
170	+	openmain(argv[a]);
171	+	xform(mainfn, mainfp);
172	+	}
173
174	<	if (a == argc)
175	<	xform("standard input", stdin);
176	<	else
177	<	for ( ; a < argc; a++) {
178	<	if ((fp = fopen(argv[a], "r")) == NULL) {
179	<	fprintf(stderr, "%s: cannot open \"%s\"\n",
180	<	progname, argv[a]);
181	<	exit(1);
174	>	if (mal_prefix)
175	>	free(idprefix);
176	>	return(0);
177	>	}
178	>
179	>
180	>	int
181	>	doargf(                 /* take argument list from file */
182	>	int ac,
183	>	char  **av,
184	>	int fi
185	>	)
186	>	{
187	>	int  inquote;
188	>	char  *newav[256], **avp;
189	>	char  argbuf[2048];
190	>	char  *newid, newidbuf[128];
191	>	char  *oldid;
192	>	char    *cp;
193	>	FILE    *argfp;
194	>	int  n, i, k, newac, err;
195	>
196	>	if (fi >= ac-1 || (av[fi+1][0] == '-' && av[fi+1][1] != '\0')) {
197	>	fprintf(stderr, "%s: missing file for -f option\n", av[0]);
198	>	exit(1);
199	>	}
200	>	if (av[fi+1][0] == '-' && av[fi+1][1] == '\0') {
201	>	if (stdinused++) {
202	>	fprintf(stderr,
203	>	"%s: cannot use stdin more than once\n",
204	>	av[0]);
205	>	exit(1);
206	>	}
207	>	argfp = stdin;
208	>	n = 100;                /* we just don't know! */
209	>	} else {
210	>	if ((argfp = fopen(av[fi+1], "r")) == NULL) {
211	>	fprintf(stderr,
212	>	"%s: cannot open argument file \"%s\"\n",
213	>	av[0], av[fi+1]);
214	>	exit(1);
215	>	}
216	>	n = 0;                  /* count number of lines in file */
217	>	while (fgetline(argbuf,sizeof(argbuf),argfp) != NULL)
218	>	n += argbuf[0] && argbuf[0] != '#';
219	>	if (!n) {
220	>	fprintf(stderr, "%s: empty argument file \"%s\"\n",
221	>	av[0], av[fi+1]);
222	>	exit(1);
223	>	}
224	>	nrept *= n;
225	>	rewind(argfp);
226	>	}
227	>	err = 0; k = 0;                 /* read each arg list and call main */
228	>	while (fgetline(argbuf,sizeof(argbuf),argfp) != NULL) {
229	>	if (!argbuf[0] || argbuf[0] == '#')
230	>	continue;
231	>	avp = newav+2;
232	>	avp[0] = av[0];
233	>	for (i = 1; i < fi; i++)
234	>	avp[i] = av[i];
235	>	newac = i;
236	>	cp = argbuf;            /* parse new words */
237	>	if (*cp == '!') cp++;
238	>	if (!strncmp(cp, "xform ", 6)) cp += 6;
239	>	inquote = 0;
240	>	for ( ; ; ) {
241	>	skipspaces:
242	>	while (isspace(*cp))    /* nullify spaces */
243	>	*cp++ = '\0';
244	>	if ((*cp == '"') | (*cp == '\''))
245	>	inquote = *cp++;
246	>	if (!*cp)               /* all done? */
247	>	break;
248	>	if (cp[0] == '\\' && cp[1])
249	>	if (*++cp == '\n')
250	>	goto skipspaces;
251	>	avp[newac++] = cp;      /* add argument to list */
252	>	if (inquote) {
253	>	while (*++cp)
254	>	if (*cp == inquote) {
255	>	*cp++ = '\0';
256	>	break;
257	>	}
258	>	} else {
259	>	while (*++cp && !isspace(*cp))
260	>	;
261		}
158	–	xform(argv[a], fp);
159	–	fclose(fp);
262		}
263	+	for (i = fi+2; i < ac; i++)
264	+	avp[newac++] = av[i];
265	+	avp[newac] = NULL;
266	+	newid = newidbuf;
267	+	oldid = NULL;
268	+	for (i = 2; i < newac; i++)
269	+	if (!strcmp(avp[i-1], "-n")) {
270	+	oldid = avp[i];
271	+	if (strlen(oldid)+32 > sizeof(newidbuf)) {
272	+	newid = (char *)malloc(strlen(oldid)+32);
273	+	if (newid == NULL)
274	+	exit(2);
275	+	}
276	+	avp[i] = newid;
277	+	break;
278	+	}
279	+	if (oldid == NULL) {
280	+	newav[0] = av[0];
281	+	newav[1] = "-n";
282	+	newav[2] = newid;
283	+	avp = newav;
284	+	newac += 2;
285	+	}
286	+	if (oldid == NULL)
287	+	sprintf(newid, "i%d", k);
288	+	else
289	+	sprintf(newid, "%s.%d", oldid, k);
290	+	err |= main(newac, avp);
291	+	if (newid != newidbuf)
292	+	free(newid);
293	+	k++;
294	+	}
295	+	fclose(argfp);
296	+	return(err);
297	+	}
298
299	<	exit(0);
299	>
300	>	int
301	>	doarray(                        /* make array */
302	>	int  ac,
303	>	char  **av,
304	>	int  ai
305	>	)
306	>	{
307	>	char  *newav[256], **avp;
308	>	char  newid[128], repts[32];
309	>	char  *oldid = NULL;
310	>	int  n, i, err;
311	>
312	>	if (ai >= ac-1 || (n = atoi(av[ai+1])) <= 0) {
313	>	fprintf(stderr, "%s: missing count for -a option\n", av[0]);
314	>	exit(1);
315	>	}
316	>	nrept *= n;
317	>	avp = newav+2;
318	>	avp[0] = av[0];
319	>	for (i = 1; i < ac; i++)
320	>	if (!strcmp(av[i-1], "-n")) {
321	>	oldid = av[i];
322	>	avp[i] = newid;
323	>	} else
324	>	avp[i] = av[i];
325	>	avp[ai] = "-i";
326	>	avp[ai+1] = repts;
327	>	avp[i] = NULL;
328	>	if (oldid == NULL) {
329	>	newav[0] = av[0];
330	>	newav[1] = "-n";
331	>	newav[2] = newid;
332	>	avp = newav;
333	>	ac += 2;
334	>	}
335	>	err = 0;
336	>	for (i = 0; i < n; i++) {
337	>	if (oldid == NULL)
338	>	sprintf(newid, "a%d", i);
339	>	else
340	>	sprintf(newid, "%s.%d", oldid, i);
341	>	sprintf(repts, "%d", i);
342	>	err |= main(ac, avp);
343	>	}
344	>	return(err);
345		}
346
347
348	<	xform(name, fin)                        /* transform stream by totxform */
349	<	char  *name;
350	<	register FILE  *fin;
348	>	void
349	>	xform(                  /* transform stream by tot.xfm */
350	>	char  *name,
351	>	FILE  *fin
352	>	)
353		{
354	<	register int  c;
354	>	int  nobjs = 0;
355	>	int  c;
356
357		while ((c = getc(fin)) != EOF) {
358		if (isspace(c))                         /* blank */
#	Line 181 | Line 366 | register FILE  *fin;
366		} while (c != '\n');
367		} else if (c == '!') {                  /* command */
368		ungetc(c, fin);
369	<	if (expand)
370	<	xfcomm(name, fin);
186	<	else {
187	<	putchar('\n');
188	<	while ((c = getc(fin)) != EOF && c != '\n')
189	<	putchar(c);
190	<	printf(" | %s -e", xav[0]);
191	<	for (c = 1; c < xac; c++)
192	<	printf(" %s", xav[c]);
193	<	putchar('\n');
194	<	}
369	>	xfcomm(name, fin);
370	>	nobjs++;
371		} else {                                /* object */
372		ungetc(c, fin);
373		xfobject(name, fin);
374	+	nobjs++;
375		}
376		}
377	+	if (nobjs == 0)
378	+	fprintf(stderr, "%s: (%s): warning - empty file\n",
379	+	progname, name);
380		}
381
382
383	<	xfcomm(fname, fin)                              /* expand a command */
384	<	FILE  *fin;
383	>	void
384	>	xfcomm(                 /* transform a command */
385	>	char  *fname,
386	>	FILE  *fin
387	>	)
388		{
206	–	FILE  *popen();
207	–	char  *fgets();
389		FILE  *pin;
390	<	char  buf[512];
390	>	char  buf[2048];
391	>	int  i;
392
393	<	fgets(buf, sizeof(buf), fin);
394	<	if (buf[strlen(buf)-1] == '\n')
395	<	buf[strlen(buf)-1] = '\0';
396	<	if ((pin = popen(buf+1, "r")) == NULL) {
397	<	fprintf(stderr, "%s: (%s): cannot execute \"%s\"\n",
398	<	progname, fname, buf);
399	<	exit(1);
393	>	fgetline(buf, sizeof(buf), fin);
394	>	if (expand) {
395	>	if ((pin = popen(buf+1, "r")) == NULL) {
396	>	fprintf(stderr, "%s: (%s): cannot execute \"%s\"\n",
397	>	progname, fname, buf);
398	>	exit(1);
399	>	}
400	>	xform(buf, pin);
401	>	pclose(pin);
402	>	} else {
403	>	printf("\n%s", buf);
404	>	if (xac > 1) {
405	>	printf(" | %s -e", xav[0]);     /* expand next time */
406	>	for (i = 1; i < xac; i++)
407	>	if (i >= xfa || strcmp(xav[i], "-c"))
408	>	printf(" %s", xav[i]);
409	>	}
410	>	putchar('\n');
411		}
219	–	xform(buf, pin);
220	–	pclose(pin);
412		}
413
414
415	<	xfobject(fname, fin)                            /* transform an object */
416	<	char  *fname;
417	<	FILE  *fin;
415	>	void
416	>	xfobject(                               /* transform an object */
417	>	char  *fname,
418	>	FILE  *fin
419	>	)
420		{
421	<	char  stmp[MAXSTR];
421	>	char  typ[16], nam[MAXSTR];
422		int  fn;
423	<
424	<	fscanf(fin, "%s", stmp);        /* modifier */
425	<	printf("\n%s ", stmp);
426	<	fscanf(fin, "%s", stmp);        /* object type */
427	<	if ((fn = otype(stmp)) < 0) {
423	>	/* modifier and type */
424	>	strcpy(typ, "EOF");
425	>	fgetword(nam, sizeof(nam), fin);
426	>	fgetword(typ, sizeof(typ), fin);
427	>	if ((fn = otype(typ)) < 0) {
428		fprintf(stderr, "%s: (%s): unknown object type \"%s\"\n",
429	<	progname, fname, stmp);
429	>	progname, fname, typ);
430		exit(1);
431		}
432	<	printf("%s ", stmp);
433	<	fscanf(fin, "%s", stmp);        /* object name */
434	<	if (idprefix != NULL && issurface(fn))
435	<	printf("%s.%s\n", idprefix, stmp);
436	<	else
437	<	printf("%s\n", stmp);
438	<	/* transform arguments */
432	>	putchar('\n');
433	>	if (ismodifier(fn)) {
434	>	fputword(nam, stdout);
435	>	printf(" %s ", typ);
436	>	} else {
437	>	fputword(newmod != NULL ? newmod : nam, stdout);
438	>	printf(" %s ", invert ? ofun[tinvers[fn]].funame : typ);
439	>	}
440	>	/* object name */
441	>	fgetword(nam, sizeof(nam), fin);
442	>	if (idprefix == NULL || ismodifier(fn))
443	>	fputword(nam, stdout);
444	>	else {
445	>	char    nnam[MAXSTR];
446	>	sprintf(nnam, "%s.%s", idprefix, nam);
447	>	fputword(nnam, stdout);
448	>	}
449	>	putchar('\n');
450	>	/* transform arguments */
451		if ((*ofun[fn].funp)(fin) < 0) {
452		fprintf(stderr, "%s: (%s): bad %s \"%s\"\n",
453	<	progname, fname, ofun[fn].funame, stmp);
453	>	progname, fname, ofun[fn].funame, nam);
454		exit(1);
455		}
456		}
457
458
459	<	passargs(fin)                   /* pass on arguments unchanged */
460	<	FILE  *fin;
459	>	int
460	>	o_default(                      /* pass on arguments unchanged */
461	>	FILE  *fin
462	>	)
463		{
464	<	register int  i;
465	<	register FUNARGS  *fa;
464	>	int  i;
465	>	FUNARGS  fa;
466
467	<	if ((fa = getfargs(fin)) == NULL)
467	>	if (readfargs(&fa, fin) != 1)
468		return(-1);
469		/* string arguments */
470	<	printf("%d", fa->nsargs);
471	<	for (i = 0; i < fa->nsargs; i++)
472	<	printf(" %s", fa->sarg[i]);
470	>	printf("%d", fa.nsargs);
471	>	for (i = 0; i < fa.nsargs; i++) {
472	>	fputc(' ', stdout);
473	>	fputword(fa.sarg[i], stdout);
474	>	}
475		printf("\n");
476	+	#ifdef  IARGS
477		/* integer arguments */
478	<	printf("%d", fa->niargs);
479	<	for (i = 0; i < fa->niargs; i++)
480	<	printf(" %d", fa->iarg[i]);
478	>	printf("%d", fa.niargs);
479	>	for (i = 0; i < fa.niargs; i++)
480	>	printf(" %d", fa.iarg[i]);
481		printf("\n");
482	+	#else
483	+	printf("0\n");
484	+	#endif
485		/* float arguments */
486	<	printf("%d", fa->nfargs);
487	<	for (i = 0; i < fa->nfargs; i++)
488	<	printf(" %18.12g", fa->farg[i]);
486	>	printf("%d", fa.nfargs);
487	>	for (i = 0; i < fa.nfargs; i++)
488	>	printf(" %18.12g", fa.farg[i]);
489		printf("\n");
490	<	freefargs(fa);
490	>	freefargs(&fa);
491		return(0);
492		}
493
494
495	<	addxform(fin)                   /* add xf arguments to strings */
496	<	FILE  *fin;
495	>	int
496	>	addxform(                       /* add xf arguments to strings */
497	>	FILE  *fin
498	>	)
499		{
500	<	register int  i;
501	<	register FUNARGS  *fa;
500	>	int  i;
501	>	int  resetarr = 0;
502	>	FUNARGS  fa;
503
504	<	if ((fa = getfargs(fin)) == NULL)
504	>	if (readfargs(&fa, fin) != 1)
505		return(-1);
506		/* string arguments */
507	<	printf("%d", fa->nsargs + xac-xfa);
508	<	for (i = 0; i < fa->nsargs; i++)
509	<	printf(" %s", fa->sarg[i]);
507	>	if (xac > xfa && strcmp(xav[xfa], "-i"))
508	>	resetarr = 2;
509	>	printf("%d", fa.nsargs + resetarr + xac-xfa);
510	>	for (i = 0; i < fa.nsargs; i++) {
511	>	fputc(' ', stdout);
512	>	fputword(fa.sarg[i], stdout);
513	>	}
514	>	if (resetarr)
515	>	printf(" -i 1");
516		for (i = xfa; i < xac; i++)     /* add xf arguments */
517		printf(" %s", xav[i]);
518		printf("\n");
519	+	#ifdef  IARGS
520		/* integer arguments */
521	<	printf("%d", fa->niargs);
522	<	for (i = 0; i < fa->niargs; i++)
523	<	printf(" %d", fa->iarg[i]);
521	>	printf("%d", fa.niargs);
522	>	for (i = 0; i < fa.niargs; i++)
523	>	printf(" %d", fa.iarg[i]);
524		printf("\n");
525	+	#else
526	+	printf("0\n");
527	+	#endif
528		/* float arguments */
529	<	printf("%d", fa->nfargs);
530	<	for (i = 0; i < fa->nfargs; i++)
531	<	printf(" %18.12g", fa->farg[i]);
529	>	printf("%d", fa.nfargs);
530	>	for (i = 0; i < fa.nfargs; i++)
531	>	printf(" %18.12g", fa.farg[i]);
532		printf("\n");
533	<	freefargs(fa);
533	>	freefargs(&fa);
534		return(0);
535		}
536
537
538		int
539	<	otype(ofname)                   /* get object function number from its name */
540	<	register char  *ofname;
539	>	alias(                  /* transfer alias */
540	>	FILE  *fin
541	>	)
542		{
543	<	register int  i;
543	>	char  aliasnm[MAXSTR];
544
545	<	for (i = 0; ofun[i].funame != NULL; i++)
319	<	if (!strcmp(ofun[i].funame, ofname))
320	<	return(i);
321	<
322	<	return(-1);             /* not found */
323	<	}
324	<
325	<
326	<	alias(fin)                      /* transfer alias */
327	<	FILE  *fin;
328	<	{
329	<	char  alias[MAXSTR];
330	<
331	<	if (fscanf(fin, "%s", alias) != 1)
545	>	if (fgetword(aliasnm, MAXSTR, fin) == NULL)
546		return(-1);
547	<	printf("\t%s\n", alias);
547	>	printf("\t%s\n", aliasnm);
548		return(0);
549		}
550
551
552	<	m_glow(fin)                     /* transform arguments for proximity light */
553	<	FILE  *fin;
552	>	int
553	>	m_glow(                 /* transform arguments for proximity light */
554	>	FILE  *fin
555	>	)
556		{
557	<	register FUNARGS  *fa;
557	>	FUNARGS  fa;
558
559	<	if ((fa = getfargs(fin)) == NULL)
559	>	if (readfargs(&fa, fin) != 1)
560		return(-1);
561	<	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 4)
561	>	if (fa.nsargs != 0  || fa.nfargs != 4)
562		return(-1);
563		printf("0\n0\n4");
564		printf(" %18.12g %18.12g %18.12g",
565	<	fa->farg[0], fa->farg[1], fa->farg[2]);
566	<	printf(" %18.12g\n", fa->farg[3] * totscale);
567	<	freefargs(fa);
565	>	fa.farg[0], fa.farg[1], fa.farg[2]);
566	>	printf(" %18.12g\n", fa.farg[3] * tot.sca);
567	>	freefargs(&fa);
568		return(0);
569		}
570
571
572	<	m_spot(fin)                     /* transform arguments for spotlight */
573	<	FILE  *fin;
572	>	int
573	>	m_spot(                 /* transform arguments for spotlight */
574	>	FILE  *fin
575	>	)
576		{
577	<	double  v[3];
578	<	register FUNARGS  *fa;
577	>	FVECT  v;
578	>	FUNARGS  fa;
579
580	<	if ((fa = getfargs(fin)) == NULL)
580	>	if (readfargs(&fa, fin) != 1)
581		return(-1);
582	<	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 7)
582	>	if (fa.nsargs != 0  || fa.nfargs != 7)
583		return(-1);
584		printf("0\n0\n7");
585		printf(" %18.12g %18.12g %18.12g %18.12g\n",
586	<	fa->farg[0], fa->farg[1], fa->farg[2], fa->farg[3]);
587	<	multv3(v, fa->farg+4, totxform);
586	>	fa.farg[0], fa.farg[1], fa.farg[2], fa.farg[3]);
587	>	multv3(v, fa.farg+4, tot.xfm);
588		printf("\t%18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
589	<	freefargs(fa);
589	>	freefargs(&fa);
590		return(0);
591		}
592
593
594	<	m_dielectric(fin)               /* transform arguments for dielectric */
595	<	FILE  *fin;
594	>	int
595	>	m_mist(         /* transform arguments for mist */
596	>	FILE  *fin
597	>	)
598		{
599	<	double  pow();
600	<	register FUNARGS  *fa;
599	>	FUNARGS  fa;
600	>	int     i;
601
602	<	if ((fa = getfargs(fin)) == NULL)
602	>	if (readfargs(&fa, fin) != 1)
603		return(-1);
604	<	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 5)
604	>	if (fa.nfargs > 7)
605		return(-1);
606	+	printf("%d", fa.nsargs);
607	+	if (idprefix == NULL)
608	+	for (i = 0; i < fa.nsargs; i++)
609	+	printf(" %s", fa.sarg[i]);
610	+	else
611	+	for (i = 0; i < fa.nsargs; i++) {
612	+	char    sname[256], *sp;
613	+	char    *cp1, *cp2 = sname;
614	+	/* add idprefix */
615	+	for (sp = fa.sarg[i]; *sp; sp = cp1) {
616	+	for (cp1 = idprefix; *cp1; )
617	+	*cp2++ = *cp1++;
618	+	*cp2++ = '.';
619	+	for (cp1 = sp; *cp1 &&
620	+	(*cp2++ = *cp1++) != '>'; )
621	+	;
622	+	}
623	+	*cp2 = '\0';
624	+	printf(" %s", sname);
625	+	}
626	+	printf("\n0\n%d", fa.nfargs);
627	+	if (fa.nfargs > 2)
628	+	printf(" %12.6g %12.6g %12.6g", fa.farg[0]/tot.sca,
629	+	fa.farg[1]/tot.sca, fa.farg[2]/tot.sca);
630	+	for (i = 3; i < fa.nfargs; i++)
631	+	printf(" %12.6g", fa.farg[i]);
632	+	printf("\n");
633	+	freefargs(&fa);
634	+	return(0);
635	+	}
636	+
637	+
638	+	int
639	+	m_dielectric(           /* transform arguments for dielectric */
640	+	FILE  *fin
641	+	)
642	+	{
643	+	FUNARGS  fa;
644	+
645	+	if (readfargs(&fa, fin) != 1)
646	+	return(-1);
647	+	if (fa.nsargs != 0  || fa.nfargs != 5)
648	+	return(-1);
649		printf("0\n0\n5");
650	<	printf(" %18.12g %18.12g %18.12g",
651	<	pow(fa->farg[0], 1.0/totscale),
652	<	pow(fa->farg[1], 1.0/totscale),
653	<	pow(fa->farg[2], 1.0/totscale));
654	<	printf(" %18.12g %18.12g\n", fa->farg[3], fa->farg[4]);
655	<	freefargs(fa);
650	>	printf(" %12.6g %12.6g %12.6g",
651	>	pow(fa.farg[0], 1.0/tot.sca),
652	>	pow(fa.farg[1], 1.0/tot.sca),
653	>	pow(fa.farg[2], 1.0/tot.sca));
654	>	printf(" %12.6g %12.6g\n", fa.farg[3], fa.farg[4]);
655	>	freefargs(&fa);
656		return(0);
657		}
658
659
660	<	m_interface(fin)                /* transform arguments for interface */
661	<	FILE  *fin;
660	>	int
661	>	m_interface(            /* transform arguments for interface */
662	>	FILE  *fin
663	>	)
664		{
665	<	double  pow();
401	<	register FUNARGS  *fa;
665	>	FUNARGS  fa;
666
667	<	if ((fa = getfargs(fin)) == NULL)
667	>	if (readfargs(&fa, fin) != 1)
668		return(-1);
669	<	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 8)
669	>	if (fa.nsargs != 0  || fa.nfargs != 8)
670		return(-1);
671		printf("0\n0\n8\n");
672	<	printf("%18.12g %18.12g %18.12g",
673	<	pow(fa->farg[0], 1.0/totscale),
674	<	pow(fa->farg[1], 1.0/totscale),
675	<	pow(fa->farg[2], 1.0/totscale));
676	<	printf(" %18.12g\n", fa->farg[3]);
677	<	printf("%18.12g %18.12g %18.12g",
678	<	pow(fa->farg[4], 1.0/totscale),
679	<	pow(fa->farg[5], 1.0/totscale),
680	<	pow(fa->farg[6], 1.0/totscale));
681	<	printf(" %18.12g\n", fa->farg[7]);
682	<	freefargs(fa);
672	>	printf("%12.6g %12.6g %12.6g",
673	>	pow(fa.farg[0], 1.0/tot.sca),
674	>	pow(fa.farg[1], 1.0/tot.sca),
675	>	pow(fa.farg[2], 1.0/tot.sca));
676	>	printf(" %12.6g\n", fa.farg[3]);
677	>	printf("%12.6g %12.6g %12.6g",
678	>	pow(fa.farg[4], 1.0/tot.sca),
679	>	pow(fa.farg[5], 1.0/tot.sca),
680	>	pow(fa.farg[6], 1.0/tot.sca));
681	>	printf(" %12.6g\n", fa.farg[7]);
682	>	freefargs(&fa);
683		return(0);
684		}
685
686
687	<	text(fin)                       /* transform text arguments */
688	<	FILE  *fin;
687	>	int
688	>	text(                   /* transform text arguments */
689	>	FILE  *fin
690	>	)
691		{
692		int  i;
693	<	double  v[3];
694	<	register FUNARGS  *fa;
693	>	FVECT  v;
694	>	FUNARGS  fa;
695
696	<	if ((fa = getfargs(fin)) == NULL)
696	>	if (readfargs(&fa, fin) != 1)
697		return(-1);
698	<	if (fa->niargs != 0 || (fa->nfargs != 9 &&
433	<	fa->nfargs != 11 && fa->nfargs != 15))
698	>	if (fa.nfargs < 9)
699		return(-1);
700		/* string arguments */
701	<	printf("%d", fa->nsargs);
702	<	for (i = 0; i < fa->nsargs; i++)
703	<	printf(" %s", fa->sarg[i]);
704	<	printf("\n0\n%d\n", fa->nfargs);
701	>	printf("%d", fa.nsargs);
702	>	for (i = 0; i < fa.nsargs; i++) {
703	>	fputc(' ', stdout);
704	>	fputword(fa.sarg[i], stdout);
705	>	}
706	>	printf("\n0\n%d\n", fa.nfargs);
707		/* anchor point */
708	<	multp3(v, fa->farg, totxform);
708	>	multp3(v, fa.farg, tot.xfm);
709		printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
710		/* right vector */
711	<	multv3(v, fa->farg+3, totxform);
711	>	multv3(v, fa.farg+3, tot.xfm);
712		printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
713		/* down vector */
714	<	multv3(v, fa->farg+6, totxform);
715	<	printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
716	<	/* forground and background */
717	<	if (fa->nfargs == 11)
718	<	printf(" %18.12g %18.12g\n", fa->farg[9], fa->farg[10]);
719	<	else if (fa->nfargs == 15) {
720	<	printf(" %18.12g %18.12g %18.12g\n",
454	<	fa->farg[9], fa->farg[10], fa->farg[11]);
455	<	printf(" %18.12g %18.12g %18.12g\n",
456	<	fa->farg[12], fa->farg[13], fa->farg[14]);
714	>	multv3(v, fa.farg+6, tot.xfm);
715	>	printf(" %18.12g %18.12g %18.12g", v[0], v[1], v[2]);
716	>	/* remaining arguments */
717	>	for (i = 9; i < fa.nfargs; i++) {
718	>	if (i%3 == 0)
719	>	putchar('\n');
720	>	printf(" %18.12g", fa.farg[i]);
721		}
722	<	freefargs(fa);
722	>	putchar('\n');
723	>	freefargs(&fa);
724		return(0);
725		}
726
727
728	<	o_source(fin)                   /* transform source arguments */
729	<	FILE  *fin;
728	>	int
729	>	o_source(                       /* transform source arguments */
730	>	FILE  *fin
731	>	)
732		{
733	<	double  dv[3];
734	<	register FUNARGS  *fa;
733	>	FVECT  dv;
734	>	FUNARGS  fa;
735
736	<	if ((fa = getfargs(fin)) == NULL)
736	>	if (readfargs(&fa, fin) != 1)
737		return(-1);
738	<	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 4)
738	>	if (fa.nsargs != 0  || fa.nfargs != 4)
739		return(-1);
740		/* transform direction vector */
741	<	multv3(dv, fa->farg, totxform);
741	>	multv3(dv, fa.farg, tot.xfm);
742		/* output */
743		printf("0\n0\n4");
744		printf(" %18.12g %18.12g %18.12g %18.12g\n",
745	<	dv[0], dv[1], dv[2], fa->farg[3]);
746	<	freefargs(fa);
745	>	dv[0], dv[1], dv[2], fa.farg[3]);
746	>	freefargs(&fa);
747		return(0);
748		}
749
750
751	<	o_sphere(fin)                   /* transform sphere arguments */
752	<	FILE  *fin;
751	>	int
752	>	o_sphere(                       /* transform sphere arguments */
753	>	FILE  *fin
754	>	)
755		{
756	<	double  cent[3], rad;
757	<	register FUNARGS  *fa;
756	>	FVECT  cent;
757	>	double  rad;
758	>	FUNARGS  fa;
759
760	<	if ((fa = getfargs(fin)) == NULL)
760	>	if (readfargs(&fa, fin) != 1)
761		return(-1);
762	<	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 4)
762	>	if (fa.nsargs != 0  || fa.nfargs != 4)
763		return(-1);
764
765	<	multp3(cent, fa->farg, totxform);       /* transform center */
765	>	multp3(cent, fa.farg, tot.xfm); /* transform center */
766
767	<	rad = fa->farg[3] * totscale;           /* scale radius */
767	>	rad = fa.farg[3] * tot.sca;             /* scale radius */
768
769		printf("0\n0\n4");
770		printf(" %18.12g %18.12g %18.12g %18.12g\n",
771		cent[0], cent[1], cent[2], rad);
772	<	freefargs(fa);
772	>	freefargs(&fa);
773		return(0);
774		}
775
776
777	<	o_face(fin)                     /* transform face arguments */
778	<	FILE  *fin;
777	>	int
778	>	o_face(                 /* transform face arguments */
779	>	FILE  *fin
780	>	)
781		{
782	<	double  p[3];
783	<	register int  i;
784	<	register FUNARGS  *fa;
782	>	FVECT  p;
783	>	int  i;
784	>	FUNARGS  fa;
785
786	<	if ((fa = getfargs(fin)) == NULL)
786	>	if (readfargs(&fa, fin) != 1)
787		return(-1);
788	<	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs % 3)
788	>	if (fa.nsargs != 0  || fa.nfargs % 3)
789		return(-1);
790
791	<	printf("0\n0\n%d\n", fa->nfargs);
791	>	printf("0\n0\n%d\n", fa.nfargs);
792
793	<	for (i = 0; i < fa->nfargs; i += 3) {
793	>	for (i = 0; i < fa.nfargs; i += 3) {
794		if (reverse)
795	<	multp3(p, fa->farg+(fa->nfargs-i-3), totxform);
795	>	multp3(p, fa.farg+(fa.nfargs-i-3), tot.xfm);
796		else
797	<	multp3(p, fa->farg+i, totxform);
797	>	multp3(p, fa.farg+i, tot.xfm);
798		printf(" %18.12g %18.12g %18.12g\n", p[0], p[1], p[2]);
799		}
800	<	freefargs(fa);
800	>	freefargs(&fa);
801		return(0);
802		}
803
804
805	<	o_cone(fin)                     /* transform cone and cup arguments */
806	<	FILE  *fin;
805	>	int
806	>	o_cone(                 /* transform cone and cup arguments */
807	>	FILE  *fin
808	>	)
809		{
810	<	double  p0[3], p1[3], r0, r1;
811	<	register FUNARGS  *fa;
810	>	FVECT  p0, p1;
811	>	double  r0, r1;
812	>	FUNARGS  fa;
813
814	<	if ((fa = getfargs(fin)) == NULL)
814	>	if (readfargs(&fa, fin) != 1)
815		return(-1);
816	<	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 8)
816	>	if (fa.nsargs != 0  || fa.nfargs != 8)
817		return(-1);
818
819		printf("0\n0\n8\n");
820
821	<	multp3(p0, fa->farg, totxform);
822	<	multp3(p1, fa->farg+3, totxform);
823	<	r0 = fa->farg[6] * totscale;
824	<	r1 = fa->farg[7] * totscale;
821	>	multp3(p0, fa.farg, tot.xfm);
822	>	multp3(p1, fa.farg+3, tot.xfm);
823	>	r0 = fa.farg[6] * tot.sca;
824	>	r1 = fa.farg[7] * tot.sca;
825		printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
826		printf(" %18.12g %18.12g %18.12g\n", p1[0], p1[1], p1[2]);
827		printf(" %18.12g %18.12g\n", r0, r1);
828
829	<	freefargs(fa);
829	>	freefargs(&fa);
830		return(0);
831		}
832
833
834	<	o_cylinder(fin)                 /* transform cylinder and tube arguments */
835	<	FILE  *fin;
834	>	int
835	>	o_cylinder(                     /* transform cylinder and tube arguments */
836	>	FILE  *fin
837	>	)
838		{
839	<	double  p0[3], p1[3], rad;
840	<	register FUNARGS  *fa;
839	>	FVECT  p0, p1;
840	>	double  rad;
841	>	FUNARGS  fa;
842
843	<	if ((fa = getfargs(fin)) == NULL)
843	>	if (readfargs(&fa, fin) != 1)
844		return(-1);
845	<	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 7)
845	>	if (fa.nsargs != 0  || fa.nfargs != 7)
846		return(-1);
847
848		printf("0\n0\n7\n");
849
850	<	multp3(p0, fa->farg, totxform);
851	<	multp3(p1, fa->farg+3, totxform);
852	<	rad = fa->farg[6] * totscale;
850	>	multp3(p0, fa.farg, tot.xfm);
851	>	multp3(p1, fa.farg+3, tot.xfm);
852	>	rad = fa.farg[6] * tot.sca;
853		printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
854		printf(" %18.12g %18.12g %18.12g\n", p1[0], p1[1], p1[2]);
855		printf(" %18.12g\n", rad);
856	<	freefargs(fa);
856	>	freefargs(&fa);
857		return(0);
858		}
859
860
861	<	o_ring(fin)                     /* transform ring arguments */
862	<	FILE  *fin;
861	>	int
862	>	o_ring(                 /* transform ring arguments */
863	>	FILE  *fin
864	>	)
865		{
866	<	double  p0[3], pd[3], r0, r1;
867	<	register FUNARGS  *fa;
866	>	FVECT  p0, pd;
867	>	double  r0, r1;
868	>	FUNARGS  fa;
869
870	<	if ((fa = getfargs(fin)) == NULL)
870	>	if (readfargs(&fa, fin) != 1)
871		return(-1);
872	<	if (fa->nsargs != 0 || fa->niargs != 0 || fa->nfargs != 8)
872	>	if (fa.nsargs != 0  || fa.nfargs != 8)
873		return(-1);
874
875		printf("0\n0\n8\n");
876
877	<	multp3(p0, fa->farg, totxform);
878	<	multv3(pd, fa->farg+3, totxform);
879	<	r0 = fa->farg[6] * totscale;
880	<	r1 = fa->farg[7] * totscale;
877	>	multp3(p0, fa.farg, tot.xfm);
878	>	multv3(pd, fa.farg+3, tot.xfm);
879	>	if (invert) {
880	>	pd[0] = -pd[0];
881	>	pd[1] = -pd[1];
882	>	pd[2] = -pd[2];
883	>	}
884	>	r0 = fa.farg[6] * tot.sca;
885	>	r1 = fa.farg[7] * tot.sca;
886		printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
887		printf(" %18.12g %18.12g %18.12g\n", pd[0], pd[1], pd[2]);
888		printf(" %18.12g %18.12g\n", r0, r1);
889	<	freefargs(fa);
889	>	freefargs(&fa);
890		return(0);
891		}
892
893
894	<	FUNARGS *
895	<	getfargs(fp)            /* get function arguments from stream */
610	<	FILE  *fp;
894	>	void
895	>	initotypes(void)                        /* initialize ofun[] array */
896		{
897	<	char  *strcpy();
613	<	char  sbuf[MAXSTR];
614	<	int  n;
615	<	register FUNARGS  *fa;
616	<	register int  i;
897	>	int  i;
898
899	<	if ((fa = (FUNARGS *)malloc((unsigned)sizeof(FUNARGS))) == NULL)
900	<	goto memerr;
901	<	if (fscanf(fp, "%d", &n) != 1 || n < 0)
902	<	return(NULL);
903	<	if (fa->nsargs = n) {
904	<	fa->sarg = (char **)malloc((unsigned)fa->nsargs*sizeof(char *));
905	<	if (fa->sarg == NULL)
906	<	goto memerr;
907	<	for (i = 0; i < fa->nsargs; i++) {
908	<	if (fscanf(fp, "%s", sbuf) != 1)
909	<	return(NULL);
910	<	if ((fa->sarg[i] = malloc((unsigned)strlen(sbuf)+1)) == NULL)
911	<	goto memerr;
912	<	strcpy(fa->sarg[i], sbuf);
913	<	}
914	<	} else
915	<	fa->sarg = NULL;
916	<	if (fscanf(fp, "%d", &n) != 1 || n < 0)
917	<	return(NULL);
918	<	if (fa->niargs = n) {
919	<	fa->iarg = (int *)malloc((unsigned)fa->niargs*sizeof(int));
920	<	if (fa->iarg == NULL)
921	<	goto memerr;
922	<	for (i = 0; i < fa->niargs; i++)
923	<	if (fscanf(fp, "%d", &fa->iarg[i]) != 1)
924	<	return(NULL);
925	<	} else
926	<	fa->iarg = NULL;
927	<	if (fscanf(fp, "%d", &n) != 1 || n < 0)
928	<	return(NULL);
929	<	if (fa->nfargs = n) {
930	<	fa->farg = (double *)malloc((unsigned)fa->nfargs*sizeof(double));
931	<	if (fa->farg == NULL)
932	<	goto memerr;
933	<	for (i = 0; i < fa->nfargs; i++)
934	<	if (fscanf(fp, "%lf", &fa->farg[i]) != 1)
935	<	return(NULL);
936	<	} else
937	<	fa->farg = NULL;
657	<	return(fa);
658	<	memerr:
659	<	fprintf(stderr, "%s: out of memory in getfargs\n", progname);
660	<	exit(1);
899	>	if (ofun[OBJ_SOURCE].funp == o_source)
900	>	return;                 /* done already */
901	>	/* functions get new transform */
902	>	for (i = 0; i < NUMOTYPE; i++)
903	>	if (hasfunc(i))
904	>	ofun[i].funp = addxform;
905	>	/* special cases */
906	>	ofun[OBJ_SOURCE].funp = o_source;
907	>	ofun[OBJ_SPHERE].funp =
908	>	ofun[OBJ_BUBBLE].funp = o_sphere;
909	>	ofun[OBJ_FACE].funp = o_face;
910	>	ofun[OBJ_CONE].funp =
911	>	ofun[OBJ_CUP].funp = o_cone;
912	>	ofun[OBJ_CYLINDER].funp =
913	>	ofun[OBJ_TUBE].funp = o_cylinder;
914	>	ofun[OBJ_RING].funp = o_ring;
915	>	ofun[OBJ_INSTANCE].funp =
916	>	ofun[OBJ_MESH].funp = addxform;
917	>	ofun[MAT_GLOW].funp = m_glow;
918	>	ofun[MAT_SPOT].funp = m_spot;
919	>	ofun[MAT_DIELECTRIC].funp = m_dielectric;
920	>	ofun[MAT_INTERFACE].funp = m_interface;
921	>	ofun[MAT_MIST].funp = m_mist;
922	>	ofun[PAT_CTEXT].funp =
923	>	ofun[PAT_BTEXT].funp =
924	>	ofun[MIX_TEXT].funp = text;
925	>	ofun[MOD_ALIAS].funp = alias;
926	>	/* surface inverses */
927	>	tinvers[OBJ_FACE] = OBJ_FACE;
928	>	tinvers[OBJ_SOURCE] = OBJ_SOURCE;
929	>	tinvers[OBJ_CONE] = OBJ_CUP;
930	>	tinvers[OBJ_CUP] = OBJ_CONE;
931	>	tinvers[OBJ_SPHERE] = OBJ_BUBBLE;
932	>	tinvers[OBJ_BUBBLE] = OBJ_SPHERE;
933	>	tinvers[OBJ_RING] = OBJ_RING;
934	>	tinvers[OBJ_CYLINDER] = OBJ_TUBE;
935	>	tinvers[OBJ_TUBE] = OBJ_CYLINDER;
936	>	tinvers[OBJ_INSTANCE] = OBJ_INSTANCE;   /* oh, well */
937	>	tinvers[OBJ_MESH] = OBJ_MESH;           /* ditto */
938		}
939
940
941	<	freefargs(fa)                   /* free memory associated with fa */
942	<	register FUNARGS  *fa;
941	>	#ifdef  OLDXFORM
942	>	void
943	>	openmain(
944	>	char  *fname
945	>	)
946		{
947	<	register int  i;
947	>	if (fname == NULL) {
948	>	strcpy(mainfn, "standard input");
949	>	mainfp = stdin;
950	>	return;
951	>	}
952	>	if (mainfp != NULL) {
953	>	if (!strcmp(fname, mainfn)) {
954	>	rewind(mainfp);
955	>	return;
956	>	}
957	>	fclose(mainfp);
958	>	}
959	>	if ((mainfp = fopen(fname, "r")) == NULL) {
960	>	fprintf(stderr, "%s: cannot open file \"%s\"\n",
961	>	progname, fname);
962	>	exit(1);
963	>	}
964	>	strcpy(mainfn, fname);
965	>	}
966	>	#else
967	>	void
968	>	openmain(               /* open input, changing directory for file */
969	>	char  *iname
970	>	)
971	>	{
972	>	static char  origdir[PATH_MAX];
973	>	static char  curfn[PATH_MAX];
974	>	static int  diffdir;
975	>	char  *fpath;
976
977	<	for (i = 0; i < fa->nsargs; i++)
978	<	free(fa->sarg[i]);
979	<	if (fa->nsargs)
980	<	free(fa->sarg);
981	<	if (fa->niargs)
982	<	free(fa->iarg);
983	<	if (fa->nfargs)
984	<	free(fa->farg);
985	<	free(fa);
977	>	if (iname == NULL) {                    /* standard input */
978	>	if (mainfp == NULL) {
979	>	int  c;
980	>	strcpy(mainfn, "standard input");
981	>	if (nrept <= 1) {
982	>	mainfp = stdin;
983	>	return;                 /* just read once */
984	>	}
985	>	/* else copy */
986	>	if ((mainfp = tmpfile()) == NULL) {
987	>	fprintf(stderr,
988	>	"%s: cannot create temporary file\n",
989	>	progname);
990	>	exit(1);
991	>	}
992	>	while ((c = getc(stdin)) != EOF)
993	>	putc(c, mainfp);
994	>	}
995	>	rewind(mainfp);                 /* rewind copy */
996	>	return;
997	>	}
998	>	if (mainfp == NULL) {                   /* first call, initialize */
999	>	getcwd(origdir, sizeof(origdir));
1000	>	} else if (!strcmp(iname, curfn)) {     /* just need to rewind? */
1001	>	rewind(mainfp);
1002	>	return;
1003	>	} else {                                /* else close old stream */
1004	>	fclose(mainfp);
1005	>	mainfp = NULL;
1006	>	if (diffdir) {                  /* return to our directory */
1007	>	chdir(origdir);
1008	>	diffdir = 0;
1009	>	}
1010	>	}
1011	>	strcpy(curfn, iname);                   /* remember input name */
1012	>	/* get full path for file */
1013	>	if ((fpath = getpath(iname, getrlibpath(), R_OK)) == NULL) {
1014	>	fprintf(stderr, "%s: cannot find file \"%s\"\n",
1015	>	progname, iname);
1016	>	exit(1);
1017	>	}
1018	>	if (fpath[0] == '.' && ISDIRSEP(fpath[1]))      /* remove leading ./ */
1019	>	fpath += 2;
1020	>	/* record path name */
1021	>	strcpy(mainfn, fpath);
1022	>	if (expand) {                           /* change to local directory */
1023	>	char  *cp = fpath + strlen(fpath);      /* get dir. */
1024	>	while (cp > fpath) {
1025	>	cp--;
1026	>	if (ISDIRSEP(*cp)) {
1027	>	if (cp == fpath)
1028	>	cp++;   /* root special case */
1029	>	break;
1030	>	}
1031	>	}
1032	>	*cp = '\0';
1033	>	if (fpath[0]) {                 /* change to new directory? */
1034	>	if (chdir(fpath) < 0) {
1035	>	fprintf(stderr,
1036	>	"%s: cannot change directory to \"%s\"\n",
1037	>	progname, fpath);
1038	>	exit(1);
1039	>	}
1040	>	diffdir++;
1041	>	}
1042	>	/* get final path component */
1043	>	for (fpath = iname+strlen(iname);
1044	>	fpath > iname && !ISDIRSEP(fpath[-1]); fpath--)
1045	>	;
1046	>	}
1047	>	/* finally, open the file */
1048	>	if ((mainfp = fopen(fpath, "r")) == NULL) {
1049	>	fprintf(stderr, "%s: cannot open file \"%s\"\n",
1050	>	progname, mainfn);
1051	>	exit(1);
1052	>	}
1053		}
1054	+	#endif

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines