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

Comparing ray/src/gen/xform.c (file contents):
Revision 1.12 by greg, Sat Dec 15 14:58:03 1990 UTC vs.
Revision 2.22 by gwlarson, Fri Jun 4 17:24:56 1999 UTC

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

Diff Legend

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

Comparing ray/src/gen/xform.c (file contents): Revision 1.12 by greg, Sat Dec 15 14:58:03 1990 UTC vs. Revision 2.22 by gwlarson, Fri Jun 4 17:24:56 1999 UTC

Diff Legend

Comparing ray/src/gen/xform.c (file contents):
Revision 1.12 by greg, Sat Dec 15 14:58:03 1990 UTC vs.
Revision 2.22 by gwlarson, Fri Jun 4 17:24:56 1999 UTC