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