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