[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.27 by greg, Fri Jun 27 22:27:45 2003 UTC

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