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

Comparing ray/src/gen/xform.c (file contents):
Revision 1.11 by greg, Thu Dec 13 11:51:17 1990 UTC vs.
Revision 2.18 by gwlarson, Fri Jun 4 15:51:04 1999 UTC

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

Diff Legend

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

Comparing ray/src/gen/xform.c (file contents): Revision 1.11 by greg, Thu Dec 13 11:51:17 1990 UTC vs. Revision 2.18 by gwlarson, Fri Jun 4 15:51:04 1999 UTC

Diff Legend

Comparing ray/src/gen/xform.c (file contents):
Revision 1.11 by greg, Thu Dec 13 11:51:17 1990 UTC vs.
Revision 2.18 by gwlarson, Fri Jun 4 15:51:04 1999 UTC