[ViewVC] Diff of: radiance/ray/src/gen/xform.c

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

Diff Legend

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

Comparing ray/src/gen/xform.c (file contents): Revision 1.3 by greg, Sat Apr 22 14:51:02 1989 UTC vs. Revision 2.29 by schorsch, Thu Jul 3 22:41:44 2003 UTC

Diff Legend

Comparing ray/src/gen/xform.c (file contents):
Revision 1.3 by greg, Sat Apr 22 14:51:02 1989 UTC vs.
Revision 2.29 by schorsch, Thu Jul 3 22:41:44 2003 UTC