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

Comparing ray/src/gen/xform.c (file contents):
Revision 1.4 by greg, Wed Jun 7 08:40:59 1989 UTC vs.
Revision 2.5 by greg, Thu Jun 25 11:49:46 1992 UTC

#	Line 1 \| Line 1
1	<	/* Copyright (c) 1986 Regents of the University of California */
1	>	/* Copyright (c) 1991 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 <ctype.h>
18
19	+	#include "object.h"
20
21	<	typedef struct {
21	<	char funame; / function name */
22	<	int (funp)(); / pointer to function */
23	<	} FUN;
21	>	#include "otypes.h"
22
23		int xac; /* global xform argument count */
24		char *xav; / global xform argument pointer */
25		int xfa; /* start of xf arguments */
26
27	<	double totxform[4][4]; /* total transformation matrix */
28	<	double totscale; /* total scale factor */
31	<	int reverse; /* boolean true if scene inverted */
27	>	XF tot; /* total transformation */
28	>	int reverse; /* boolean true if scene mirrored */
29
30	+	int invert = 0; /* boolean true to invert surfaces */
31	+
32		int expand = 0; /* boolean true to expand commands */
33
34	+	char newmod = NULL; / new modifier for surfaces */
35	+
36		char idprefix = NULL; / prefix for object identifiers */
37
38	<	extern int o_source();
38	<	extern int o_sphere();
39	<	extern int o_face();
40	<	extern int o_cone();
41	<	extern int o_cylinder();
42	<	extern int o_ring();
43	<	extern int m_dielectric();
44	<	extern int m_interface();
45	<	extern int text();
46	<	extern int alias();
47	<	extern int passargs();
48	<	extern int addxform();
38	>	#define ALIAS NUMOTYPE /* put alias at end of array */
39
40	<	FUN ofun[] = {
51	<	{ "source", o_source },
52	<	{ "sphere", o_sphere },
53	<	{ "bubble", o_sphere },
54	<	{ "polygon", o_face },
55	<	{ "cone", o_cone },
56	<	{ "cup", o_cone },
57	<	{ "cylinder", o_cylinder },
58	<	{ "tube", o_cylinder },
59	<	{ "ring", o_ring },
60	<	{ "instance", addxform },
61	<	{ "alias", alias },
62	<	{ "antimatter", passargs },
63	<	{ "dielectric", m_dielectric },
64	<	{ "interface", m_interface },
65	<	{ "colortext", text },
66	<	{ "brighttext", text },
67	<	{ "texfunc", addxform },
68	<	{ "texdata", addxform },
69	<	{ "colorfunc", addxform },
70	<	{ "brightfunc", addxform },
71	<	{ "colorpict", addxform },
72	<	{ "colordata", addxform },
73	<	{ "brightdata", addxform },
74	<	{ "mixfunc", addxform },
75	<	{ "mixdata", addxform },
76	<	{ "mixtext", text },
77	<	{ "light", passargs },
78	<	{ "illum", passargs },
79	<	{ "glow", passargs },
80	<	{ "plastic", passargs },
81	<	{ "metal", passargs },
82	<	{ "trans", passargs },
83	<	{ "glass", passargs },
84	<	{ 0 } /* terminator */
85	<	};
40	>	#define NUMTYPES (NUMOTYPE+1) /* total number of object types */
41
42	<	#define issurface(t) ((t)<=9)
42	>	FUN ofun[NUMTYPES] = INIT_OTYPE; /* default types and actions */
43
44	<	typedef struct {
90	<	short nsargs; /* # of string arguments */
91	<	char *sarg; / string arguments */
92	<	short niargs; /* # of integer arguments */
93	<	int iarg; / integer arguments */
94	<	short nfargs; /* # of float arguments */
95	<	double farg; / float arguments */
96	<	} FUNARGS;
44	>	short tinvers[NUMOTYPE]; /* inverse types for surfaces */
45
46	<	#define MAXSTR 512 /* maximum string length */
46	>	extern char malloc(), fgetword();
47
100	–	FUNARGS *getfargs();
101	–	char *malloc();
102	–
48		#define progname (xav[0])
49
50
#	Line 110 \| Line 55 \| *char argv[];**
55		FILE *fopen();
56		FILE *fp;
57		int a;
58	+	/* check for array */
59	+	for (a = 1; a < argc; a++)
60	+	if (!strcmp(argv[a], "-a"))
61	+	return(doarray(argc, argv, a));
62
63	<	xav = argv;
63	>	initotypes();
64
65		for (a = 1; a < argc; a++) {
66		if (argv[a][0] == '-')
67		switch (argv[a][1]) {
68	+	case 'm':
69	+	if (argv[a][2] \|\| a+1 >= argc)
70	+	break;
71	+	newmod = argv[++a];
72	+	continue;
73		case 'n':
74	+	if (argv[a][2] \|\| a+1 >= argc)
75	+	break;
76		idprefix = argv[++a];
77		continue;
78		case 'e':
79	+	if (argv[a][2])
80	+	break;
81		expand = 1;
82		continue;
83	+	case 'I':
84	+	if (argv[a][2])
85	+	break;
86	+	invert = 1;
87	+	continue;
88		}
89		break;
90		}
91
92	+	xav = argv;
93		xfa = a;
94
95	<	totscale = 1.0;
132	<	setident4(totxform);
95	>	a += xf(&tot, argc-a, argv+a);
96
97	<	a += xf(totxform, &totscale, argc-a, argv+a);
97	>	if (reverse = tot.sca < 0.0)
98	>	tot.sca = -tot.sca;
99	>	if (invert)
100	>	reverse = !reverse;
101
102	<	if (reverse = totscale < 0.0)
103	<	totscale = -totscale;
102	>	if (a < argc && argv[a][0] == '-') {
103	>	fprintf(stderr, "%s: command line error at '%s'\n",
104	>	argv[0], argv[a]);
105	>	exit(1);
106	>	}
107
108		xac = a;
109	<
110	<	putchar('#'); /* simple header */
109	>	/* simple header */
110	>	putchar('#');
111		for (a = 0; a < xac; a++)
112		printf(" %s", xav[a]);
113		putchar('\n');
114	<
115	<	if (a == argc)
114	>	/* transform input */
115	>	if (xac == argc)
116		xform("standard input", stdin);
117		else
118	<	for ( ; a < argc; a++) {
118	>	for (a = xac; a < argc; a++) {
119		if ((fp = fopen(argv[a], "r")) == NULL) {
120		fprintf(stderr, "%s: cannot open \"%s\"\n",
121		progname, argv[a]);
#	Line 156 \| Line 125 \| *char argv[];**
125		fclose(fp);
126		}
127
128	<	exit(0);
128	>	return(0);
129		}
130
131
132	<	xform(name, fin) /* transform stream by totxform */
132	>	doarray(ac, av, ai) /* make array */
133	>	char **av;
134	>	int ac, ai;
135	>	{
136	>	char newav[256], *avp;
137	>	char newid[128], repts[32];
138	>	char *oldid = NULL;
139	>	int i, err;
140	>
141	>	avp = newav+2;
142	>	avp[0] = av[0];
143	>	for (i = 1; i < ac; i++)
144	>	if (!strcmp(av[i-1], "-n")) {
145	>	oldid = av[i];
146	>	avp[i] = newid;
147	>	} else
148	>	avp[i] = av[i];
149	>	avp[ai] = "-i";
150	>	avp[ai+1] = repts;
151	>	avp[i] = NULL;
152	>	if (oldid == NULL) {
153	>	newav[0] = av[0];
154	>	newav[1] = "-n";
155	>	newav[2] = newid;
156	>	avp = newav;
157	>	ac += 2;
158	>	}
159	>	err = 0;
160	>	for (i = 0; i < atoi(av[ai+1]); i++) {
161	>	if (oldid == NULL)
162	>	sprintf(newid, "a%d", i);
163	>	else
164	>	sprintf(newid, "%s.%d", oldid, i);
165	>	sprintf(repts, "%d", i);
166	>	err \|= main(ac, avp);
167	>	}
168	>	return(err);
169	>	}
170	>
171	>
172	>	xform(name, fin) /* transform stream by tot.xfm */
173		char *name;
174		register FILE *fin;
175		{
#	Line 178 \| Line 187 \| *register FILE fin;**
187		} while (c != '\n');
188		} else if (c == '!') { /* command */
189		ungetc(c, fin);
190	<	if (expand)
182	<	xfcomm(name, fin);
183	<	else {
184	<	putchar('\n');
185	<	while ((c = getc(fin)) != EOF && c != '\n')
186	<	putchar(c);
187	<	printf(" \|");
188	<	for (c = 0; c < xac; c++)
189	<	printf(" %s", xav[c]);
190	<	putchar('\n');
191	<	}
190	>	xfcomm(name, fin);
191		} else { /* object */
192		ungetc(c, fin);
193		xfobject(name, fin);
#	Line 197 \| Line 196 \| *register FILE fin;**
196		}
197
198
199	<	xfcomm(fname, fin) /* expand a command */
199	>	xfcomm(fname, fin) /* transform a command */
200		FILE *fin;
201		{
202		FILE *popen();
203	<	char *fgets();
203	>	char *fgetline();
204		FILE *pin;
205		char buf[512];
206	+	int i;
207
208	<	fgets(buf, sizeof(buf), fin);
209	<	if (buf[strlen(buf)-1] == '\n')
210	<	buf[strlen(buf)-1] = '\0';
211	<	if ((pin = popen(buf+1, "r")) == NULL) {
212	<	fprintf(stderr, "%s: (%s): cannot execute \"%s\"\n",
213	<	progname, fname, buf);
214	<	exit(1);
208	>	fgetline(buf, sizeof(buf), fin);
209	>	if (expand) {
210	>	if ((pin = popen(buf+1, "r")) == NULL) {
211	>	fprintf(stderr, "%s: (%s): cannot execute \"%s\"\n",
212	>	progname, fname, buf);
213	>	exit(1);
214	>	}
215	>	xform(buf, pin);
216	>	pclose(pin);
217	>	} else {
218	>	printf("\n%s", buf);
219	>	if (xac > 1) {
220	>	printf(" \| %s -e", xav[0]);
221	>	for (i = 1; i < xac; i++)
222	>	printf(" %s", xav[i]);
223	>	}
224	>	putchar('\n');
225		}
216	–	xform(buf, pin);
217	–	pclose(pin);
226		}
227
228
#	Line 222 \| Line 230 \| *xfobject(fname, fin) / transform an object /*
230		char *fname;
231		FILE *fin;
232		{
233	<	char stmp[MAXSTR];
233	>	extern char *strcpy();
234	>	char typ[16], nam[MAXSTR];
235		int fn;
236	<
237	<	fscanf(fin, "%s", stmp); /* modifier */
238	<	printf("\n%s ", stmp);
239	<	fscanf(fin, "%s", stmp); /* object type */
240	<	if ((fn = otype(stmp)) < 0) {
236	>	/* modifier and type */
237	>	strcpy(typ, "EOF");
238	>	fgetword(nam, sizeof(nam), fin);
239	>	fgetword(typ, sizeof(typ), fin);
240	>	if ((fn = otype(typ)) < 0) {
241		fprintf(stderr, "%s: (%s): unknown object type \"%s\"\n",
242	<	progname, fname, stmp);
242	>	progname, fname, typ);
243		exit(1);
244		}
245	<	printf("%s ", stmp);
246	<	fscanf(fin, "%s", stmp); /* object name */
238	<	if (idprefix != NULL && issurface(fn))
239	<	printf("%s.%s\n", idprefix, stmp);
245	>	if (ismodifier(fn))
246	>	printf("\n%s %s ", nam, typ);
247		else
248	<	printf("%s\n", stmp);
249	<	/* transform arguments */
248	>	printf("\n%s %s ", newmod != NULL ? newmod : nam,
249	>	invert ? ofun[tinvers[fn]].funame : typ);
250	>	/* object name */
251	>	fgetword(nam, sizeof(nam), fin);
252	>	if (idprefix == NULL \|\| ismodifier(fn))
253	>	printf("%s\n", nam);
254	>	else
255	>	printf("%s.%s\n", idprefix, nam);
256	>	/* transform arguments */
257		if ((*ofun[fn].funp)(fin) < 0) {
258		fprintf(stderr, "%s: (%s): bad %s \"%s\"\n",
259	<	progname, fname, ofun[fn].funame, stmp);
259	>	progname, fname, ofun[fn].funame, nam);
260		exit(1);
261		}
262		}
263
264
265	<	passargs(fin) /* pass on arguments unchanged */
265	>	o_default(fin) /* pass on arguments unchanged */
266		FILE *fin;
267		{
268		register int i;
269	<	register FUNARGS *fa;
269	>	FUNARGS fa;
270
271	<	if ((fa = getfargs(fin)) == NULL)
271	>	if (readfargs(&fa, fin) != 1)
272		return(-1);
273		/* string arguments */
274	<	printf("%d", fa->nsargs);
275	<	for (i = 0; i < fa->nsargs; i++)
276	<	printf(" %s", fa->sarg[i]);
274	>	printf("%d", fa.nsargs);
275	>	for (i = 0; i < fa.nsargs; i++)
276	>	printf(" %s", fa.sarg[i]);
277		printf("\n");
278	+	#ifdef IARGS
279		/* integer arguments */
280	<	printf("%d", fa->niargs);
281	<	for (i = 0; i < fa->niargs; i++)
282	<	printf(" %d", fa->iarg[i]);
280	>	printf("%d", fa.niargs);
281	>	for (i = 0; i < fa.niargs; i++)
282	>	printf(" %d", fa.iarg[i]);
283		printf("\n");
284	+	#else
285	+	printf("0\n");
286	+	#endif
287		/* float arguments */
288	<	printf("%d", fa->nfargs);
289	<	for (i = 0; i < fa->nfargs; i++)
290	<	printf(" %18.12g", fa->farg[i]);
288	>	printf("%d", fa.nfargs);
289	>	for (i = 0; i < fa.nfargs; i++)
290	>	printf(" %18.12g", fa.farg[i]);
291		printf("\n");
292	<	freefargs(fa);
292	>	freefargs(&fa);
293		return(0);
294		}
295
#	Line 280 \| Line 298 \| *addxform(fin) / add xf arguments to strings /*
298		FILE *fin;
299		{
300		register int i;
301	<	register FUNARGS *fa;
301	>	int resetarr = 0;
302	>	FUNARGS fa;
303
304	<	if ((fa = getfargs(fin)) == NULL)
304	>	if (readfargs(&fa, fin) != 1)
305		return(-1);
306		/* string arguments */
307	<	printf("%d", fa->nsargs + xac-xfa);
308	<	for (i = 0; i < fa->nsargs; i++)
309	<	printf(" %s", fa->sarg[i]);
307	>	if (xac > xfa && strcmp(xav[xfa], "-i"))
308	>	resetarr = 2;
309	>	printf("%d", fa.nsargs + resetarr + xac-xfa);
310	>	for (i = 0; i < fa.nsargs; i++)
311	>	printf(" %s", fa.sarg[i]);
312	>	if (resetarr)
313	>	printf(" -i 1");
314		for (i = xfa; i < xac; i++) /* add xf arguments */
315		printf(" %s", xav[i]);
316		printf("\n");
317	+	#ifdef IARGS
318		/* integer arguments */
319	<	printf("%d", fa->niargs);
320	<	for (i = 0; i < fa->niargs; i++)
321	<	printf(" %d", fa->iarg[i]);
319	>	printf("%d", fa.niargs);
320	>	for (i = 0; i < fa.niargs; i++)
321	>	printf(" %d", fa.iarg[i]);
322		printf("\n");
323	+	#else
324	+	printf("0\n");
325	+	#endif
326		/* float arguments */
327	<	printf("%d", fa->nfargs);
328	<	for (i = 0; i < fa->nfargs; i++)
329	<	printf(" %18.12g", fa->farg[i]);
327	>	printf("%d", fa.nfargs);
328	>	for (i = 0; i < fa.nfargs; i++)
329	>	printf(" %18.12g", fa.farg[i]);
330		printf("\n");
331	<	freefargs(fa);
331	>	freefargs(&fa);
332		return(0);
333		}
334
#	Line 312 \| Line 339 \| *register char ofname;**
339		{
340		register int i;
341
342	<	for (i = 0; ofun[i].funame != NULL; i++)
342	>	for (i = 0; i < NUMTYPES; i++)
343		if (!strcmp(ofun[i].funame, ofname))
344		return(i);
345
#	Line 323 \| Line 350 \| *register char ofname;**
350		alias(fin) /* transfer alias */
351		FILE *fin;
352		{
353	<	char alias[MAXSTR];
353	>	char aliasnm[MAXSTR];
354
355	<	if (fscanf(fin, "%s", alias) != 1)
355	>	if (fgetword(aliasnm, MAXSTR, fin) == NULL)
356		return(-1);
357	<	printf("\t%s\n", alias);
357	>	printf("\t%s\n", aliasnm);
358		return(0);
359		}
360
361
362	+	m_glow(fin) /* transform arguments for proximity light */
363	+	FILE *fin;
364	+	{
365	+	FUNARGS fa;
366	+
367	+	if (readfargs(&fa, fin) != 1)
368	+	return(-1);
369	+	if (fa.nsargs != 0 \|\| fa.nfargs != 4)
370	+	return(-1);
371	+	printf("0\n0\n4");
372	+	printf(" %18.12g %18.12g %18.12g",
373	+	fa.farg[0], fa.farg[1], fa.farg[2]);
374	+	printf(" %18.12g\n", fa.farg[3] * tot.sca);
375	+	freefargs(&fa);
376	+	return(0);
377	+	}
378	+
379	+
380	+	m_spot(fin) /* transform arguments for spotlight */
381	+	FILE *fin;
382	+	{
383	+	FVECT v;
384	+	FUNARGS fa;
385	+
386	+	if (readfargs(&fa, fin) != 1)
387	+	return(-1);
388	+	if (fa.nsargs != 0 \|\| fa.nfargs != 7)
389	+	return(-1);
390	+	printf("0\n0\n7");
391	+	printf(" %18.12g %18.12g %18.12g %18.12g\n",
392	+	fa.farg[0], fa.farg[1], fa.farg[2], fa.farg[3]);
393	+	multv3(v, fa.farg+4, tot.xfm);
394	+	printf("\t%18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
395	+	freefargs(&fa);
396	+	return(0);
397	+	}
398	+
399	+
400		m_dielectric(fin) /* transform arguments for dielectric */
401		FILE *fin;
402		{
403		double pow();
404	<	register FUNARGS *fa;
404	>	FUNARGS fa;
405
406	<	if ((fa = getfargs(fin)) == NULL)
406	>	if (readfargs(&fa, fin) != 1)
407		return(-1);
408	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 5)
408	>	if (fa.nsargs != 0 \|\| fa.nfargs != 5)
409		return(-1);
410		printf("0\n0\n5");
411		printf(" %18.12g %18.12g %18.12g",
412	<	pow(fa->farg[0], 1.0/totscale),
413	<	pow(fa->farg[1], 1.0/totscale),
414	<	pow(fa->farg[2], 1.0/totscale));
415	<	printf(" %18.12g %18.12g\n", fa->farg[3], fa->farg[4]);
416	<	freefargs(fa);
412	>	pow(fa.farg[0], 1.0/tot.sca),
413	>	pow(fa.farg[1], 1.0/tot.sca),
414	>	pow(fa.farg[2], 1.0/tot.sca));
415	>	printf(" %18.12g %18.12g\n", fa.farg[3], fa.farg[4]);
416	>	freefargs(&fa);
417		return(0);
418		}
419
#	Line 357 \| Line 422 \| *m_interface(fin) / transform arguments for interface**
422		FILE *fin;
423		{
424		double pow();
425	<	register FUNARGS *fa;
425	>	FUNARGS fa;
426
427	<	if ((fa = getfargs(fin)) == NULL)
427	>	if (readfargs(&fa, fin) != 1)
428		return(-1);
429	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 8)
429	>	if (fa.nsargs != 0 \|\| fa.nfargs != 8)
430		return(-1);
431		printf("0\n0\n8\n");
432		printf("%18.12g %18.12g %18.12g",
433	<	pow(fa->farg[0], 1.0/totscale),
434	<	pow(fa->farg[1], 1.0/totscale),
435	<	pow(fa->farg[2], 1.0/totscale));
436	<	printf(" %18.12g\n", fa->farg[3]);
433	>	pow(fa.farg[0], 1.0/tot.sca),
434	>	pow(fa.farg[1], 1.0/tot.sca),
435	>	pow(fa.farg[2], 1.0/tot.sca));
436	>	printf(" %18.12g\n", fa.farg[3]);
437		printf("%18.12g %18.12g %18.12g",
438	<	pow(fa->farg[4], 1.0/totscale),
439	<	pow(fa->farg[5], 1.0/totscale),
440	<	pow(fa->farg[6], 1.0/totscale));
441	<	printf(" %18.12g\n", fa->farg[7]);
442	<	freefargs(fa);
438	>	pow(fa.farg[4], 1.0/tot.sca),
439	>	pow(fa.farg[5], 1.0/tot.sca),
440	>	pow(fa.farg[6], 1.0/tot.sca));
441	>	printf(" %18.12g\n", fa.farg[7]);
442	>	freefargs(&fa);
443		return(0);
444		}
445
#	Line 383 \| Line 448 \| *text(fin) / transform text arguments /*
448		FILE *fin;
449		{
450		int i;
451	<	double v[3];
452	<	register FUNARGS *fa;
451	>	FVECT v;
452	>	FUNARGS fa;
453
454	<	if ((fa = getfargs(fin)) == NULL)
454	>	if (readfargs(&fa, fin) != 1)
455		return(-1);
456	<	if (fa->niargs != 0 \|\| (fa->nfargs != 9 &&
392	<	fa->nfargs != 11 && fa->nfargs != 15))
456	>	if (fa.nfargs < 9)
457		return(-1);
458		/* string arguments */
459	<	printf("%d", fa->nsargs);
460	<	for (i = 0; i < fa->nsargs; i++)
461	<	printf(" %s", fa->sarg[i]);
462	<	printf("\n0\n%d\n", fa->nfargs);
459	>	printf("%d", fa.nsargs);
460	>	for (i = 0; i < fa.nsargs; i++)
461	>	printf(" %s", fa.sarg[i]);
462	>	printf("\n0\n%d\n", fa.nfargs);
463		/* anchor point */
464	<	multp3(v, fa->farg, totxform);
464	>	multp3(v, fa.farg, tot.xfm);
465		printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
466		/* right vector */
467	<	multv3(v, fa->farg+3, totxform);
467	>	multv3(v, fa.farg+3, tot.xfm);
468		printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
469		/* down vector */
470	<	multv3(v, fa->farg+6, totxform);
471	<	printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
472	<	/* forground and background */
473	<	if (fa->nfargs == 11)
474	<	printf(" %18.12g %18.12g\n", fa->farg[9], fa->farg[10]);
475	<	else if (fa->nfargs == 15) {
476	<	printf(" %18.12g %18.12g %18.12g\n",
413	<	fa->farg[9], fa->farg[10], fa->farg[11]);
414	<	printf(" %18.12g %18.12g %18.12g\n",
415	<	fa->farg[12], fa->farg[13], fa->farg[14]);
470	>	multv3(v, fa.farg+6, tot.xfm);
471	>	printf(" %18.12g %18.12g %18.12g", v[0], v[1], v[2]);
472	>	/* remaining arguments */
473	>	for (i = 9; i < fa.nfargs; i++) {
474	>	if (i%3 == 0)
475	>	putchar('\n');
476	>	printf(" %18.12g", fa.farg[i]);
477		}
478	<	freefargs(fa);
478	>	putchar('\n');
479	>	freefargs(&fa);
480		return(0);
481		}
482
#	Line 422 \| Line 484 \| *FILE fin;**
484		o_source(fin) /* transform source arguments */
485		FILE *fin;
486		{
487	<	double dv[3];
488	<	register FUNARGS *fa;
487	>	FVECT dv;
488	>	FUNARGS fa;
489
490	<	if ((fa = getfargs(fin)) == NULL)
490	>	if (readfargs(&fa, fin) != 1)
491		return(-1);
492	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 4)
492	>	if (fa.nsargs != 0 \|\| fa.nfargs != 4)
493		return(-1);
494		/* transform direction vector */
495	<	multv3(dv, fa->farg, totxform);
495	>	multv3(dv, fa.farg, tot.xfm);
496		/* output */
497		printf("0\n0\n4");
498		printf(" %18.12g %18.12g %18.12g %18.12g\n",
499	<	dv[0], dv[1], dv[2], fa->farg[3]);
500	<	freefargs(fa);
499	>	dv[0], dv[1], dv[2], fa.farg[3]);
500	>	freefargs(&fa);
501		return(0);
502		}
503
#	Line 443 \| Line 505 \| *FILE fin;**
505		o_sphere(fin) /* transform sphere arguments */
506		FILE *fin;
507		{
508	<	double cent[3], rad;
509	<	register FUNARGS *fa;
508	>	FVECT cent;
509	>	double rad;
510	>	FUNARGS fa;
511
512	<	if ((fa = getfargs(fin)) == NULL)
512	>	if (readfargs(&fa, fin) != 1)
513		return(-1);
514	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 4)
514	>	if (fa.nsargs != 0 \|\| fa.nfargs != 4)
515		return(-1);
516
517	<	multp3(cent, fa->farg, totxform); /* transform center */
517	>	multp3(cent, fa.farg, tot.xfm); /* transform center */
518
519	<	rad = fa->farg[3] * totscale; /* scale radius */
519	>	rad = fa.farg[3] * tot.sca; /* scale radius */
520
521		printf("0\n0\n4");
522		printf(" %18.12g %18.12g %18.12g %18.12g\n",
523		cent[0], cent[1], cent[2], rad);
524	<	freefargs(fa);
524	>	freefargs(&fa);
525		return(0);
526		}
527
#	Line 466 \| Line 529 \| *FILE fin;**
529		o_face(fin) /* transform face arguments */
530		FILE *fin;
531		{
532	<	double p[3];
532	>	FVECT p;
533		register int i;
534	<	register FUNARGS *fa;
534	>	FUNARGS fa;
535
536	<	if ((fa = getfargs(fin)) == NULL)
536	>	if (readfargs(&fa, fin) != 1)
537		return(-1);
538	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs % 3)
538	>	if (fa.nsargs != 0 \|\| fa.nfargs % 3)
539		return(-1);
540
541	<	printf("0\n0\n%d\n", fa->nfargs);
541	>	printf("0\n0\n%d\n", fa.nfargs);
542
543	<	for (i = 0; i < fa->nfargs; i += 3) {
543	>	for (i = 0; i < fa.nfargs; i += 3) {
544		if (reverse)
545	<	multp3(p, fa->farg+(fa->nfargs-i-3), totxform);
545	>	multp3(p, fa.farg+(fa.nfargs-i-3), tot.xfm);
546		else
547	<	multp3(p, fa->farg+i, totxform);
547	>	multp3(p, fa.farg+i, tot.xfm);
548		printf(" %18.12g %18.12g %18.12g\n", p[0], p[1], p[2]);
549		}
550	<	freefargs(fa);
550	>	freefargs(&fa);
551		return(0);
552		}
553
#	Line 492 \| Line 555 \| *FILE fin;**
555		o_cone(fin) /* transform cone and cup arguments */
556		FILE *fin;
557		{
558	<	double p0[3], p1[3], r0, r1;
559	<	register FUNARGS *fa;
558	>	FVECT p0, p1;
559	>	double r0, r1;
560	>	FUNARGS fa;
561
562	<	if ((fa = getfargs(fin)) == NULL)
562	>	if (readfargs(&fa, fin) != 1)
563		return(-1);
564	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 8)
564	>	if (fa.nsargs != 0 \|\| fa.nfargs != 8)
565		return(-1);
566
567		printf("0\n0\n8\n");
568
569	<	multp3(p0, fa->farg, totxform);
570	<	multp3(p1, fa->farg+3, totxform);
571	<	r0 = fa->farg[6] * totscale;
572	<	r1 = fa->farg[7] * totscale;
569	>	multp3(p0, fa.farg, tot.xfm);
570	>	multp3(p1, fa.farg+3, tot.xfm);
571	>	r0 = fa.farg[6] * tot.sca;
572	>	r1 = fa.farg[7] * tot.sca;
573		printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
574		printf(" %18.12g %18.12g %18.12g\n", p1[0], p1[1], p1[2]);
575		printf(" %18.12g %18.12g\n", r0, r1);
576
577	<	freefargs(fa);
577	>	freefargs(&fa);
578		return(0);
579		}
580
#	Line 518 \| Line 582 \| *FILE fin;**
582		o_cylinder(fin) /* transform cylinder and tube arguments */
583		FILE *fin;
584		{
585	<	double p0[3], p1[3], rad;
586	<	register FUNARGS *fa;
585	>	FVECT p0, p1;
586	>	double rad;
587	>	FUNARGS fa;
588
589	<	if ((fa = getfargs(fin)) == NULL)
589	>	if (readfargs(&fa, fin) != 1)
590		return(-1);
591	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 7)
591	>	if (fa.nsargs != 0 \|\| fa.nfargs != 7)
592		return(-1);
593
594		printf("0\n0\n7\n");
595
596	<	multp3(p0, fa->farg, totxform);
597	<	multp3(p1, fa->farg+3, totxform);
598	<	rad = fa->farg[6] * totscale;
596	>	multp3(p0, fa.farg, tot.xfm);
597	>	multp3(p1, fa.farg+3, tot.xfm);
598	>	rad = fa.farg[6] * tot.sca;
599		printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
600		printf(" %18.12g %18.12g %18.12g\n", p1[0], p1[1], p1[2]);
601		printf(" %18.12g\n", rad);
602	<	freefargs(fa);
602	>	freefargs(&fa);
603		return(0);
604		}
605
#	Line 542 \| Line 607 \| *FILE fin;**
607		o_ring(fin) /* transform ring arguments */
608		FILE *fin;
609		{
610	<	double p0[3], pd[3], r0, r1;
611	<	register FUNARGS *fa;
610	>	FVECT p0, pd;
611	>	double r0, r1;
612	>	FUNARGS fa;
613
614	<	if ((fa = getfargs(fin)) == NULL)
614	>	if (readfargs(&fa, fin) != 1)
615		return(-1);
616	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 8)
616	>	if (fa.nsargs != 0 \|\| fa.nfargs != 8)
617		return(-1);
618
619		printf("0\n0\n8\n");
620
621	<	multp3(p0, fa->farg, totxform);
622	<	multv3(pd, fa->farg+3, totxform);
623	<	r0 = fa->farg[6] * totscale;
624	<	r1 = fa->farg[7] * totscale;
621	>	multp3(p0, fa.farg, tot.xfm);
622	>	multv3(pd, fa.farg+3, tot.xfm);
623	>	if (invert) {
624	>	pd[0] = -pd[0];
625	>	pd[1] = -pd[1];
626	>	pd[2] = -pd[2];
627	>	}
628	>	r0 = fa.farg[6] * tot.sca;
629	>	r1 = fa.farg[7] * tot.sca;
630		printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
631		printf(" %18.12g %18.12g %18.12g\n", pd[0], pd[1], pd[2]);
632		printf(" %18.12g %18.12g\n", r0, r1);
633	<	freefargs(fa);
633	>	freefargs(&fa);
634		return(0);
635		}
636
637
638	<	FUNARGS *
568	<	getfargs(fp) /* get function arguments from stream */
569	<	FILE *fp;
638	>	initotypes() /* initialize ofun[] array */
639		{
640	<	char *strcpy();
641	<	char sbuf[MAXSTR];
642	<	int n;
643	<	register FUNARGS *fa;
640	>	extern int o_source();
641	>	extern int o_sphere();
642	>	extern int o_face();
643	>	extern int o_cone();
644	>	extern int o_cylinder();
645	>	extern int o_ring();
646	>	extern int m_glow();
647	>	extern int m_spot();
648	>	extern int m_dielectric();
649	>	extern int m_interface();
650	>	extern int text();
651	>	extern int alias();
652	>	extern int passargs();
653	>	extern int addxform();
654		register int i;
655
656	<	if ((fa = (FUNARGS *)malloc((unsigned)sizeof(FUNARGS))) == NULL)
657	<	goto memerr;
658	<	if (fscanf(fp, "%d", &n) != 1 \|\| n < 0)
659	<	return(NULL);
660	<	if (fa->nsargs = n) {
661	<	fa->sarg = (char *)malloc((unsigned)fa->nsargssizeof(char *));
662	<	if (fa->sarg == NULL)
663	<	goto memerr;
664	<	for (i = 0; i < fa->nsargs; i++) {
665	<	if (fscanf(fp, "%s", sbuf) != 1)
666	<	return(NULL);
667	<	if ((fa->sarg[i] = malloc((unsigned)strlen(sbuf)+1)) == NULL)
668	<	goto memerr;
669	<	strcpy(fa->sarg[i], sbuf);
670	<	}
671	<	} else
672	<	fa->sarg = NULL;
673	<	if (fscanf(fp, "%d", &n) != 1 \|\| n < 0)
674	<	return(NULL);
675	<	if (fa->niargs = n) {
676	<	fa->iarg = (int )malloc((unsigned)fa->niargssizeof(int));
677	<	if (fa->iarg == NULL)
678	<	goto memerr;
679	<	for (i = 0; i < fa->niargs; i++)
680	<	if (fscanf(fp, "%d", &fa->iarg[i]) != 1)
681	<	return(NULL);
682	<	} else
683	<	fa->iarg = NULL;
684	<	if (fscanf(fp, "%d", &n) != 1 \|\| n < 0)
685	<	return(NULL);
686	<	if (fa->nfargs = n) {
687	<	fa->farg = (double )malloc((unsigned)fa->nfargssizeof(double));
688	<	if (fa->farg == NULL)
689	<	goto memerr;
690	<	for (i = 0; i < fa->nfargs; i++)
691	<	if (fscanf(fp, "%lf", &fa->farg[i]) != 1)
692	<	return(NULL);
693	<	} else
615	<	fa->farg = NULL;
616	<	return(fa);
617	<	memerr:
618	<	fprintf(stderr, "%s: out of memory in getfargs\n", progname);
619	<	exit(1);
620	<	}
621	<
622	<
623	<	freefargs(fa) /* free memory associated with fa */
624	<	register FUNARGS *fa;
625	<	{
626	<	register int i;
627	<
628	<	for (i = 0; i < fa->nsargs; i++)
629	<	free(fa->sarg[i]);
630	<	if (fa->nsargs)
631	<	free(fa->sarg);
632	<	if (fa->niargs)
633	<	free(fa->iarg);
634	<	if (fa->nfargs)
635	<	free(fa->farg);
636	<	free(fa);
656	>	if (ofun[OBJ_SOURCE].funp == o_source)
657	>	return; /* done already */
658	>	/* alias is additional */
659	>	ofun[ALIAS].funame = ALIASID;
660	>	ofun[ALIAS].flags = 0;
661	>	/* functions get new transform */
662	>	for (i = 0; i < NUMTYPES; i++)
663	>	if (hasfunc(i))
664	>	ofun[i].funp = addxform;
665	>	/* special cases */
666	>	ofun[OBJ_SOURCE].funp = o_source;
667	>	ofun[OBJ_SPHERE].funp =
668	>	ofun[OBJ_BUBBLE].funp = o_sphere;
669	>	ofun[OBJ_FACE].funp = o_face;
670	>	ofun[OBJ_CONE].funp =
671	>	ofun[OBJ_CUP].funp = o_cone;
672	>	ofun[OBJ_CYLINDER].funp =
673	>	ofun[OBJ_TUBE].funp = o_cylinder;
674	>	ofun[OBJ_RING].funp = o_ring;
675	>	ofun[OBJ_INSTANCE].funp = addxform;
676	>	ofun[MAT_GLOW].funp = m_glow;
677	>	ofun[MAT_SPOT].funp = m_spot;
678	>	ofun[MAT_DIELECTRIC].funp = m_dielectric;
679	>	ofun[MAT_INTERFACE].funp = m_interface;
680	>	ofun[PAT_CTEXT].funp =
681	>	ofun[PAT_BTEXT].funp =
682	>	ofun[MIX_TEXT].funp = text;
683	>	ofun[ALIAS].funp = alias;
684	>	/* surface inverses */
685	>	tinvers[OBJ_SOURCE] = OBJ_SOURCE;
686	>	tinvers[OBJ_CONE] = OBJ_CUP;
687	>	tinvers[OBJ_CUP] = OBJ_CONE;
688	>	tinvers[OBJ_SPHERE] = OBJ_BUBBLE;
689	>	tinvers[OBJ_BUBBLE] = OBJ_SPHERE;
690	>	tinvers[OBJ_RING] = OBJ_RING;
691	>	tinvers[OBJ_CYLINDER] = OBJ_TUBE;
692	>	tinvers[OBJ_TUBE] = OBJ_CYLINDER;
693	>	tinvers[OBJ_INSTANCE] = OBJ_INSTANCE; /* oh, well */
694		}

Diff Legend

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

Comparing ray/src/gen/xform.c (file contents): Revision 1.4 by greg, Wed Jun 7 08:40:59 1989 UTC vs. Revision 2.5 by greg, Thu Jun 25 11:49:46 1992 UTC

Diff Legend

Comparing ray/src/gen/xform.c (file contents):
Revision 1.4 by greg, Wed Jun 7 08:40:59 1989 UTC vs.
Revision 2.5 by greg, Thu Jun 25 11:49:46 1992 UTC