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

Comparing ray/src/gen/xform.c (file contents):
Revision 1.9 by greg, Fri Oct 13 19:34:17 1989 UTC vs.
Revision 2.6 by greg, Mon Sep 21 12:15:44 1992 UTC

#	Line 1 \| Line 1
1	<	/* Copyright (c) 1986 Regents of the University of California */
1	>	/* Copyright (c) 1992 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_glow();
44	<	extern int m_spot();
45	<	extern int m_dielectric();
46	<	extern int m_interface();
47	<	extern int text();
48	<	extern int alias();
49	<	extern int passargs();
50	<	extern int addxform();
38	>	#define ALIAS NUMOTYPE /* put alias at end of array */
39
40	<	FUN ofun[] = {
53	<	{ "source", o_source },
54	<	{ "sphere", o_sphere },
55	<	{ "bubble", o_sphere },
56	<	{ "polygon", o_face },
57	<	{ "cone", o_cone },
58	<	{ "cup", o_cone },
59	<	{ "cylinder", o_cylinder },
60	<	{ "tube", o_cylinder },
61	<	{ "ring", o_ring },
62	<	{ "instance", addxform },
63	<	{ "alias", alias },
64	<	{ "antimatter", passargs },
65	<	{ "glow", m_glow },
66	<	{ "spotlight", m_spot },
67	<	{ "dielectric", m_dielectric },
68	<	{ "interface", m_interface },
69	<	{ "colortext", text },
70	<	{ "brighttext", text },
71	<	{ "texfunc", addxform },
72	<	{ "texdata", addxform },
73	<	{ "colorfunc", addxform },
74	<	{ "brightfunc", addxform },
75	<	{ "colorpict", addxform },
76	<	{ "colordata", addxform },
77	<	{ "brightdata", addxform },
78	<	{ "mixfunc", addxform },
79	<	{ "mixdata", addxform },
80	<	{ "mixtext", text },
81	<	{ "light", passargs },
82	<	{ "illum", passargs },
83	<	{ "plastic", passargs },
84	<	{ "metal", passargs },
85	<	{ "trans", passargs },
86	<	{ "glass", passargs },
87	<	{ 0 } /* terminator */
88	<	};
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 {
93	<	short nsargs; /* # of string arguments */
94	<	char *sarg; / string arguments */
95	<	short niargs; /* # of integer arguments */
96	<	int iarg; / integer arguments */
97	<	short nfargs; /* # of float arguments */
98	<	double farg; / float arguments */
99	<	} FUNARGS;
44	>	short tinvers[NUMOTYPE]; /* inverse types for surfaces */
45
46	<	#define MAXSTR 512 /* maximum string length */
46	>	extern char malloc(), fgetword();
47
48	<	FUNARGS *getfargs();
104	<	char *malloc();
48	>	#define progname (xav[0])
49
106	–	#define progname (xav[0])
50
108	–
51		main(argc, argv) /* get transform options and transform file */
52		int argc;
53		char *argv[];
#	Line 118 \| Line 60 \| *char argv[];**
60		if (!strcmp(argv[a], "-a"))
61		return(doarray(argc, argv, a));
62
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;
#	Line 131 \| Line 80 \| *char argv[];**
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		}
#	Line 138 \| Line 92 \| *char argv[];**
92		xav = argv;
93		xfa = a;
94
95	<	totscale = 1.0;
142	<	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
146	–	if (reverse = totscale < 0.0)
147	–	totscale = -totscale;
148	–
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		}
154	–	xac = a;
107
108	<	putchar('#'); /* simple header */
108	>	xac = a;
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 215 \| Line 169 \| int ac, ai;
169		}
170
171
172	<	xform(name, fin) /* transform stream by totxform */
172	>	xform(name, fin) /* transform stream by tot.xfm */
173		char *name;
174		register FILE *fin;
175		{
#	Line 243 \| Line 197 \| *register FILE fin;**
197
198
199		xfcomm(fname, fin) /* transform a command */
200	+	char *fname;
201		FILE *fin;
202		{
203		FILE *popen();
#	Line 261 \| Line 216 \| *FILE fin;**
216		xform(buf, pin);
217		pclose(pin);
218		} else {
219	<	printf("\n%s \| %s -e", buf, xav[0]);
220	<	for (i = 1; i < xac; i++)
221	<	printf(" %s", xav[i]);
219	>	printf("\n%s", buf);
220	>	if (xac > 1) {
221	>	printf(" \| %s -e", xav[0]);
222	>	for (i = 1; i < xac; i++)
223	>	printf(" %s", xav[i]);
224	>	}
225		putchar('\n');
226		}
227		}
#	Line 273 \| Line 231 \| *xfobject(fname, fin) / transform an object /*
231		char *fname;
232		FILE *fin;
233		{
234	<	char stmp[MAXSTR];
234	>	extern char *strcpy();
235	>	char typ[16], nam[MAXSTR];
236		int fn;
237	<
238	<	fscanf(fin, "%s", stmp); /* modifier */
239	<	printf("\n%s ", stmp);
240	<	fscanf(fin, "%s", stmp); /* object type */
241	<	if ((fn = otype(stmp)) < 0) {
237	>	/* modifier and type */
238	>	strcpy(typ, "EOF");
239	>	fgetword(nam, sizeof(nam), fin);
240	>	fgetword(typ, sizeof(typ), fin);
241	>	if ((fn = otype(typ)) < 0) {
242		fprintf(stderr, "%s: (%s): unknown object type \"%s\"\n",
243	<	progname, fname, stmp);
243	>	progname, fname, typ);
244		exit(1);
245		}
246	<	printf("%s ", stmp);
247	<	fscanf(fin, "%s", stmp); /* object name */
289	<	if (idprefix != NULL && issurface(fn))
290	<	printf("%s.%s\n", idprefix, stmp);
246	>	if (ismodifier(fn))
247	>	printf("\n%s %s ", nam, typ);
248		else
249	<	printf("%s\n", stmp);
250	<	/* transform arguments */
249	>	printf("\n%s %s ", newmod != NULL ? newmod : nam,
250	>	invert ? ofun[tinvers[fn]].funame : typ);
251	>	/* object name */
252	>	fgetword(nam, sizeof(nam), fin);
253	>	if (idprefix == NULL \|\| ismodifier(fn))
254	>	printf("%s\n", nam);
255	>	else
256	>	printf("%s.%s\n", idprefix, nam);
257	>	/* transform arguments */
258		if ((*ofun[fn].funp)(fin) < 0) {
259		fprintf(stderr, "%s: (%s): bad %s \"%s\"\n",
260	<	progname, fname, ofun[fn].funame, stmp);
260	>	progname, fname, ofun[fn].funame, nam);
261		exit(1);
262		}
263		}
264
265
266	<	passargs(fin) /* pass on arguments unchanged */
266	>	o_default(fin) /* pass on arguments unchanged */
267		FILE *fin;
268		{
269		register int i;
270	<	register FUNARGS *fa;
270	>	FUNARGS fa;
271
272	<	if ((fa = getfargs(fin)) == NULL)
272	>	if (readfargs(&fa, fin) != 1)
273		return(-1);
274		/* string arguments */
275	<	printf("%d", fa->nsargs);
276	<	for (i = 0; i < fa->nsargs; i++)
277	<	printf(" %s", fa->sarg[i]);
275	>	printf("%d", fa.nsargs);
276	>	for (i = 0; i < fa.nsargs; i++)
277	>	printf(" %s", fa.sarg[i]);
278		printf("\n");
279	+	#ifdef IARGS
280		/* integer arguments */
281	<	printf("%d", fa->niargs);
282	<	for (i = 0; i < fa->niargs; i++)
283	<	printf(" %d", fa->iarg[i]);
281	>	printf("%d", fa.niargs);
282	>	for (i = 0; i < fa.niargs; i++)
283	>	printf(" %d", fa.iarg[i]);
284		printf("\n");
285	+	#else
286	+	printf("0\n");
287	+	#endif
288		/* float arguments */
289	<	printf("%d", fa->nfargs);
290	<	for (i = 0; i < fa->nfargs; i++)
291	<	printf(" %18.12g", fa->farg[i]);
289	>	printf("%d", fa.nfargs);
290	>	for (i = 0; i < fa.nfargs; i++)
291	>	printf(" %18.12g", fa.farg[i]);
292		printf("\n");
293	<	freefargs(fa);
293	>	freefargs(&fa);
294		return(0);
295		}
296
#	Line 331 \| Line 299 \| *addxform(fin) / add xf arguments to strings /*
299		FILE *fin;
300		{
301		register int i;
302	<	register FUNARGS *fa;
302	>	int resetarr = 0;
303	>	FUNARGS fa;
304
305	<	if ((fa = getfargs(fin)) == NULL)
305	>	if (readfargs(&fa, fin) != 1)
306		return(-1);
307		/* string arguments */
308	<	printf("%d", fa->nsargs + xac-xfa);
309	<	for (i = 0; i < fa->nsargs; i++)
310	<	printf(" %s", fa->sarg[i]);
308	>	if (xac > xfa && strcmp(xav[xfa], "-i"))
309	>	resetarr = 2;
310	>	printf("%d", fa.nsargs + resetarr + xac-xfa);
311	>	for (i = 0; i < fa.nsargs; i++)
312	>	printf(" %s", fa.sarg[i]);
313	>	if (resetarr)
314	>	printf(" -i 1");
315		for (i = xfa; i < xac; i++) /* add xf arguments */
316		printf(" %s", xav[i]);
317		printf("\n");
318	+	#ifdef IARGS
319		/* integer arguments */
320	<	printf("%d", fa->niargs);
321	<	for (i = 0; i < fa->niargs; i++)
322	<	printf(" %d", fa->iarg[i]);
320	>	printf("%d", fa.niargs);
321	>	for (i = 0; i < fa.niargs; i++)
322	>	printf(" %d", fa.iarg[i]);
323		printf("\n");
324	+	#else
325	+	printf("0\n");
326	+	#endif
327		/* float arguments */
328	<	printf("%d", fa->nfargs);
329	<	for (i = 0; i < fa->nfargs; i++)
330	<	printf(" %18.12g", fa->farg[i]);
328	>	printf("%d", fa.nfargs);
329	>	for (i = 0; i < fa.nfargs; i++)
330	>	printf(" %18.12g", fa.farg[i]);
331		printf("\n");
332	<	freefargs(fa);
332	>	freefargs(&fa);
333		return(0);
334		}
335
#	Line 363 \| Line 340 \| *register char ofname;**
340		{
341		register int i;
342
343	<	for (i = 0; ofun[i].funame != NULL; i++)
343	>	for (i = 0; i < NUMTYPES; i++)
344		if (!strcmp(ofun[i].funame, ofname))
345		return(i);
346
#	Line 374 \| Line 351 \| *register char ofname;**
351		alias(fin) /* transfer alias */
352		FILE *fin;
353		{
354	<	char alias[MAXSTR];
354	>	char aliasnm[MAXSTR];
355
356	<	if (fscanf(fin, "%s", alias) != 1)
356	>	if (fgetword(aliasnm, MAXSTR, fin) == NULL)
357		return(-1);
358	<	printf("\t%s\n", alias);
358	>	printf("\t%s\n", aliasnm);
359		return(0);
360		}
361
#	Line 386 \| Line 363 \| *FILE fin;**
363		m_glow(fin) /* transform arguments for proximity light */
364		FILE *fin;
365		{
366	<	register FUNARGS *fa;
366	>	FUNARGS fa;
367
368	<	if ((fa = getfargs(fin)) == NULL)
368	>	if (readfargs(&fa, fin) != 1)
369		return(-1);
370	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 4)
370	>	if (fa.nsargs != 0 \|\| fa.nfargs != 4)
371		return(-1);
372		printf("0\n0\n4");
373		printf(" %18.12g %18.12g %18.12g",
374	<	fa->farg[0], fa->farg[1], fa->farg[2]);
375	<	printf(" %18.12g\n", fa->farg[3] * totscale);
376	<	freefargs(fa);
374	>	fa.farg[0], fa.farg[1], fa.farg[2]);
375	>	printf(" %18.12g\n", fa.farg[3] * tot.sca);
376	>	freefargs(&fa);
377		return(0);
378		}
379
#	Line 404 \| Line 381 \| *FILE fin;**
381		m_spot(fin) /* transform arguments for spotlight */
382		FILE *fin;
383		{
384	<	double v[3];
385	<	register FUNARGS *fa;
384	>	FVECT v;
385	>	FUNARGS fa;
386
387	<	if ((fa = getfargs(fin)) == NULL)
387	>	if (readfargs(&fa, fin) != 1)
388		return(-1);
389	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 7)
389	>	if (fa.nsargs != 0 \|\| fa.nfargs != 7)
390		return(-1);
391		printf("0\n0\n7");
392		printf(" %18.12g %18.12g %18.12g %18.12g\n",
393	<	fa->farg[0], fa->farg[1], fa->farg[2], fa->farg[3]);
394	<	multv3(v, fa->farg+4, totxform);
393	>	fa.farg[0], fa.farg[1], fa.farg[2], fa.farg[3]);
394	>	multv3(v, fa.farg+4, tot.xfm);
395		printf("\t%18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
396	<	freefargs(fa);
396	>	freefargs(&fa);
397		return(0);
398		}
399
#	Line 424 \| Line 401 \| *FILE fin;**
401		m_dielectric(fin) /* transform arguments for dielectric */
402		FILE *fin;
403		{
404	<	double pow();
405	<	register FUNARGS *fa;
404	>	double pow();
405	>	FUNARGS fa;
406
407	<	if ((fa = getfargs(fin)) == NULL)
407	>	if (readfargs(&fa, fin) != 1)
408		return(-1);
409	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 5)
409	>	if (fa.nsargs != 0 \|\| fa.nfargs != 5)
410		return(-1);
411		printf("0\n0\n5");
412		printf(" %18.12g %18.12g %18.12g",
413	<	pow(fa->farg[0], 1.0/totscale),
414	<	pow(fa->farg[1], 1.0/totscale),
415	<	pow(fa->farg[2], 1.0/totscale));
416	<	printf(" %18.12g %18.12g\n", fa->farg[3], fa->farg[4]);
417	<	freefargs(fa);
413	>	pow(fa.farg[0], 1.0/tot.sca),
414	>	pow(fa.farg[1], 1.0/tot.sca),
415	>	pow(fa.farg[2], 1.0/tot.sca));
416	>	printf(" %18.12g %18.12g\n", fa.farg[3], fa.farg[4]);
417	>	freefargs(&fa);
418		return(0);
419		}
420
#	Line 445 \| Line 422 \| *FILE fin;**
422		m_interface(fin) /* transform arguments for interface */
423		FILE *fin;
424		{
425	<	double pow();
426	<	register FUNARGS *fa;
425	>	double pow();
426	>	FUNARGS fa;
427
428	<	if ((fa = getfargs(fin)) == NULL)
428	>	if (readfargs(&fa, fin) != 1)
429		return(-1);
430	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 8)
430	>	if (fa.nsargs != 0 \|\| fa.nfargs != 8)
431		return(-1);
432		printf("0\n0\n8\n");
433		printf("%18.12g %18.12g %18.12g",
434	<	pow(fa->farg[0], 1.0/totscale),
435	<	pow(fa->farg[1], 1.0/totscale),
436	<	pow(fa->farg[2], 1.0/totscale));
437	<	printf(" %18.12g\n", fa->farg[3]);
434	>	pow(fa.farg[0], 1.0/tot.sca),
435	>	pow(fa.farg[1], 1.0/tot.sca),
436	>	pow(fa.farg[2], 1.0/tot.sca));
437	>	printf(" %18.12g\n", fa.farg[3]);
438		printf("%18.12g %18.12g %18.12g",
439	<	pow(fa->farg[4], 1.0/totscale),
440	<	pow(fa->farg[5], 1.0/totscale),
441	<	pow(fa->farg[6], 1.0/totscale));
442	<	printf(" %18.12g\n", fa->farg[7]);
443	<	freefargs(fa);
439	>	pow(fa.farg[4], 1.0/tot.sca),
440	>	pow(fa.farg[5], 1.0/tot.sca),
441	>	pow(fa.farg[6], 1.0/tot.sca));
442	>	printf(" %18.12g\n", fa.farg[7]);
443	>	freefargs(&fa);
444		return(0);
445		}
446
#	Line 472 \| Line 449 \| *text(fin) / transform text arguments /*
449		FILE *fin;
450		{
451		int i;
452	<	double v[3];
453	<	register FUNARGS *fa;
452	>	FVECT v;
453	>	FUNARGS fa;
454
455	<	if ((fa = getfargs(fin)) == NULL)
455	>	if (readfargs(&fa, fin) != 1)
456		return(-1);
457	<	if (fa->niargs != 0 \|\| (fa->nfargs != 9 &&
481	<	fa->nfargs != 11 && fa->nfargs != 15))
457	>	if (fa.nfargs < 9)
458		return(-1);
459		/* string arguments */
460	<	printf("%d", fa->nsargs);
461	<	for (i = 0; i < fa->nsargs; i++)
462	<	printf(" %s", fa->sarg[i]);
463	<	printf("\n0\n%d\n", fa->nfargs);
460	>	printf("%d", fa.nsargs);
461	>	for (i = 0; i < fa.nsargs; i++)
462	>	printf(" %s", fa.sarg[i]);
463	>	printf("\n0\n%d\n", fa.nfargs);
464		/* anchor point */
465	<	multp3(v, fa->farg, totxform);
465	>	multp3(v, fa.farg, tot.xfm);
466		printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
467		/* right vector */
468	<	multv3(v, fa->farg+3, totxform);
468	>	multv3(v, fa.farg+3, tot.xfm);
469		printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
470		/* down vector */
471	<	multv3(v, fa->farg+6, totxform);
472	<	printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
473	<	/* forground and background */
474	<	if (fa->nfargs == 11)
475	<	printf(" %18.12g %18.12g\n", fa->farg[9], fa->farg[10]);
476	<	else if (fa->nfargs == 15) {
477	<	printf(" %18.12g %18.12g %18.12g\n",
502	<	fa->farg[9], fa->farg[10], fa->farg[11]);
503	<	printf(" %18.12g %18.12g %18.12g\n",
504	<	fa->farg[12], fa->farg[13], fa->farg[14]);
471	>	multv3(v, fa.farg+6, tot.xfm);
472	>	printf(" %18.12g %18.12g %18.12g", v[0], v[1], v[2]);
473	>	/* remaining arguments */
474	>	for (i = 9; i < fa.nfargs; i++) {
475	>	if (i%3 == 0)
476	>	putchar('\n');
477	>	printf(" %18.12g", fa.farg[i]);
478		}
479	<	freefargs(fa);
479	>	putchar('\n');
480	>	freefargs(&fa);
481		return(0);
482		}
483
#	Line 511 \| Line 485 \| *FILE fin;**
485		o_source(fin) /* transform source arguments */
486		FILE *fin;
487		{
488	<	double dv[3];
489	<	register FUNARGS *fa;
488	>	FVECT dv;
489	>	FUNARGS fa;
490
491	<	if ((fa = getfargs(fin)) == NULL)
491	>	if (readfargs(&fa, fin) != 1)
492		return(-1);
493	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 4)
493	>	if (fa.nsargs != 0 \|\| fa.nfargs != 4)
494		return(-1);
495		/* transform direction vector */
496	<	multv3(dv, fa->farg, totxform);
496	>	multv3(dv, fa.farg, tot.xfm);
497		/* output */
498		printf("0\n0\n4");
499		printf(" %18.12g %18.12g %18.12g %18.12g\n",
500	<	dv[0], dv[1], dv[2], fa->farg[3]);
501	<	freefargs(fa);
500	>	dv[0], dv[1], dv[2], fa.farg[3]);
501	>	freefargs(&fa);
502		return(0);
503		}
504
#	Line 532 \| Line 506 \| *FILE fin;**
506		o_sphere(fin) /* transform sphere arguments */
507		FILE *fin;
508		{
509	<	double cent[3], rad;
510	<	register FUNARGS *fa;
509	>	FVECT cent;
510	>	double rad;
511	>	FUNARGS fa;
512
513	<	if ((fa = getfargs(fin)) == NULL)
513	>	if (readfargs(&fa, fin) != 1)
514		return(-1);
515	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 4)
515	>	if (fa.nsargs != 0 \|\| fa.nfargs != 4)
516		return(-1);
517
518	<	multp3(cent, fa->farg, totxform); /* transform center */
518	>	multp3(cent, fa.farg, tot.xfm); /* transform center */
519
520	<	rad = fa->farg[3] * totscale; /* scale radius */
520	>	rad = fa.farg[3] * tot.sca; /* scale radius */
521
522		printf("0\n0\n4");
523		printf(" %18.12g %18.12g %18.12g %18.12g\n",
524		cent[0], cent[1], cent[2], rad);
525	<	freefargs(fa);
525	>	freefargs(&fa);
526		return(0);
527		}
528
#	Line 555 \| Line 530 \| *FILE fin;**
530		o_face(fin) /* transform face arguments */
531		FILE *fin;
532		{
533	<	double p[3];
533	>	FVECT p;
534		register int i;
535	<	register FUNARGS *fa;
535	>	FUNARGS fa;
536
537	<	if ((fa = getfargs(fin)) == NULL)
537	>	if (readfargs(&fa, fin) != 1)
538		return(-1);
539	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs % 3)
539	>	if (fa.nsargs != 0 \|\| fa.nfargs % 3)
540		return(-1);
541
542	<	printf("0\n0\n%d\n", fa->nfargs);
542	>	printf("0\n0\n%d\n", fa.nfargs);
543
544	<	for (i = 0; i < fa->nfargs; i += 3) {
544	>	for (i = 0; i < fa.nfargs; i += 3) {
545		if (reverse)
546	<	multp3(p, fa->farg+(fa->nfargs-i-3), totxform);
546	>	multp3(p, fa.farg+(fa.nfargs-i-3), tot.xfm);
547		else
548	<	multp3(p, fa->farg+i, totxform);
548	>	multp3(p, fa.farg+i, tot.xfm);
549		printf(" %18.12g %18.12g %18.12g\n", p[0], p[1], p[2]);
550		}
551	<	freefargs(fa);
551	>	freefargs(&fa);
552		return(0);
553		}
554
#	Line 581 \| Line 556 \| *FILE fin;**
556		o_cone(fin) /* transform cone and cup arguments */
557		FILE *fin;
558		{
559	<	double p0[3], p1[3], r0, r1;
560	<	register FUNARGS *fa;
559	>	FVECT p0, p1;
560	>	double r0, r1;
561	>	FUNARGS fa;
562
563	<	if ((fa = getfargs(fin)) == NULL)
563	>	if (readfargs(&fa, fin) != 1)
564		return(-1);
565	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 8)
565	>	if (fa.nsargs != 0 \|\| fa.nfargs != 8)
566		return(-1);
567
568		printf("0\n0\n8\n");
569
570	<	multp3(p0, fa->farg, totxform);
571	<	multp3(p1, fa->farg+3, totxform);
572	<	r0 = fa->farg[6] * totscale;
573	<	r1 = fa->farg[7] * totscale;
570	>	multp3(p0, fa.farg, tot.xfm);
571	>	multp3(p1, fa.farg+3, tot.xfm);
572	>	r0 = fa.farg[6] * tot.sca;
573	>	r1 = fa.farg[7] * tot.sca;
574		printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
575		printf(" %18.12g %18.12g %18.12g\n", p1[0], p1[1], p1[2]);
576		printf(" %18.12g %18.12g\n", r0, r1);
577
578	<	freefargs(fa);
578	>	freefargs(&fa);
579		return(0);
580		}
581
#	Line 607 \| Line 583 \| *FILE fin;**
583		o_cylinder(fin) /* transform cylinder and tube arguments */
584		FILE *fin;
585		{
586	<	double p0[3], p1[3], rad;
587	<	register FUNARGS *fa;
586	>	FVECT p0, p1;
587	>	double rad;
588	>	FUNARGS fa;
589
590	<	if ((fa = getfargs(fin)) == NULL)
590	>	if (readfargs(&fa, fin) != 1)
591		return(-1);
592	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 7)
592	>	if (fa.nsargs != 0 \|\| fa.nfargs != 7)
593		return(-1);
594
595		printf("0\n0\n7\n");
596
597	<	multp3(p0, fa->farg, totxform);
598	<	multp3(p1, fa->farg+3, totxform);
599	<	rad = fa->farg[6] * totscale;
597	>	multp3(p0, fa.farg, tot.xfm);
598	>	multp3(p1, fa.farg+3, tot.xfm);
599	>	rad = fa.farg[6] * tot.sca;
600		printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
601		printf(" %18.12g %18.12g %18.12g\n", p1[0], p1[1], p1[2]);
602		printf(" %18.12g\n", rad);
603	<	freefargs(fa);
603	>	freefargs(&fa);
604		return(0);
605		}
606
#	Line 631 \| Line 608 \| *FILE fin;**
608		o_ring(fin) /* transform ring arguments */
609		FILE *fin;
610		{
611	<	double p0[3], pd[3], r0, r1;
612	<	register FUNARGS *fa;
611	>	FVECT p0, pd;
612	>	double r0, r1;
613	>	FUNARGS fa;
614
615	<	if ((fa = getfargs(fin)) == NULL)
615	>	if (readfargs(&fa, fin) != 1)
616		return(-1);
617	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 8)
617	>	if (fa.nsargs != 0 \|\| fa.nfargs != 8)
618		return(-1);
619
620		printf("0\n0\n8\n");
621
622	<	multp3(p0, fa->farg, totxform);
623	<	multv3(pd, fa->farg+3, totxform);
624	<	r0 = fa->farg[6] * totscale;
625	<	r1 = fa->farg[7] * totscale;
622	>	multp3(p0, fa.farg, tot.xfm);
623	>	multv3(pd, fa.farg+3, tot.xfm);
624	>	if (invert) {
625	>	pd[0] = -pd[0];
626	>	pd[1] = -pd[1];
627	>	pd[2] = -pd[2];
628	>	}
629	>	r0 = fa.farg[6] * tot.sca;
630	>	r1 = fa.farg[7] * tot.sca;
631		printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
632		printf(" %18.12g %18.12g %18.12g\n", pd[0], pd[1], pd[2]);
633		printf(" %18.12g %18.12g\n", r0, r1);
634	<	freefargs(fa);
634	>	freefargs(&fa);
635		return(0);
636		}
637
638
639	<	FUNARGS *
657	<	getfargs(fp) /* get function arguments from stream */
658	<	FILE *fp;
639	>	initotypes() /* initialize ofun[] array */
640		{
641	<	char *strcpy();
642	<	char sbuf[MAXSTR];
643	<	int n;
644	<	register FUNARGS *fa;
641	>	extern int o_source();
642	>	extern int o_sphere();
643	>	extern int o_face();
644	>	extern int o_cone();
645	>	extern int o_cylinder();
646	>	extern int o_ring();
647	>	extern int m_glow();
648	>	extern int m_spot();
649	>	extern int m_dielectric();
650	>	extern int m_interface();
651	>	extern int text();
652	>	extern int alias();
653	>	extern int passargs();
654	>	extern int addxform();
655		register int i;
656
657	<	if ((fa = (FUNARGS *)malloc((unsigned)sizeof(FUNARGS))) == NULL)
658	<	goto memerr;
659	<	if (fscanf(fp, "%d", &n) != 1 \|\| n < 0)
660	<	return(NULL);
661	<	if (fa->nsargs = n) {
662	<	fa->sarg = (char *)malloc((unsigned)fa->nsargssizeof(char *));
663	<	if (fa->sarg == NULL)
664	<	goto memerr;
665	<	for (i = 0; i < fa->nsargs; i++) {
666	<	if (fscanf(fp, "%s", sbuf) != 1)
667	<	return(NULL);
668	<	if ((fa->sarg[i] = malloc((unsigned)strlen(sbuf)+1)) == NULL)
669	<	goto memerr;
670	<	strcpy(fa->sarg[i], sbuf);
671	<	}
672	<	} else
673	<	fa->sarg = NULL;
674	<	if (fscanf(fp, "%d", &n) != 1 \|\| n < 0)
675	<	return(NULL);
676	<	if (fa->niargs = n) {
677	<	fa->iarg = (int )malloc((unsigned)fa->niargssizeof(int));
678	<	if (fa->iarg == NULL)
679	<	goto memerr;
680	<	for (i = 0; i < fa->niargs; i++)
681	<	if (fscanf(fp, "%d", &fa->iarg[i]) != 1)
682	<	return(NULL);
683	<	} else
684	<	fa->iarg = NULL;
685	<	if (fscanf(fp, "%d", &n) != 1 \|\| n < 0)
686	<	return(NULL);
687	<	if (fa->nfargs = n) {
688	<	fa->farg = (double )malloc((unsigned)fa->nfargssizeof(double));
689	<	if (fa->farg == NULL)
690	<	goto memerr;
691	<	for (i = 0; i < fa->nfargs; i++)
692	<	if (fscanf(fp, "%lf", &fa->farg[i]) != 1)
693	<	return(NULL);
694	<	} else
704	<	fa->farg = NULL;
705	<	return(fa);
706	<	memerr:
707	<	fprintf(stderr, "%s: out of memory in getfargs\n", progname);
708	<	exit(1);
709	<	}
710	<
711	<
712	<	freefargs(fa) /* free memory associated with fa */
713	<	register FUNARGS *fa;
714	<	{
715	<	register int i;
716	<
717	<	for (i = 0; i < fa->nsargs; i++)
718	<	free(fa->sarg[i]);
719	<	if (fa->nsargs)
720	<	free(fa->sarg);
721	<	if (fa->niargs)
722	<	free(fa->iarg);
723	<	if (fa->nfargs)
724	<	free(fa->farg);
725	<	free(fa);
657	>	if (ofun[OBJ_SOURCE].funp == o_source)
658	>	return; /* done already */
659	>	/* alias is additional */
660	>	ofun[ALIAS].funame = ALIASID;
661	>	ofun[ALIAS].flags = 0;
662	>	/* functions get new transform */
663	>	for (i = 0; i < NUMTYPES; i++)
664	>	if (hasfunc(i))
665	>	ofun[i].funp = addxform;
666	>	/* special cases */
667	>	ofun[OBJ_SOURCE].funp = o_source;
668	>	ofun[OBJ_SPHERE].funp =
669	>	ofun[OBJ_BUBBLE].funp = o_sphere;
670	>	ofun[OBJ_FACE].funp = o_face;
671	>	ofun[OBJ_CONE].funp =
672	>	ofun[OBJ_CUP].funp = o_cone;
673	>	ofun[OBJ_CYLINDER].funp =
674	>	ofun[OBJ_TUBE].funp = o_cylinder;
675	>	ofun[OBJ_RING].funp = o_ring;
676	>	ofun[OBJ_INSTANCE].funp = addxform;
677	>	ofun[MAT_GLOW].funp = m_glow;
678	>	ofun[MAT_SPOT].funp = m_spot;
679	>	ofun[MAT_DIELECTRIC].funp = m_dielectric;
680	>	ofun[MAT_INTERFACE].funp = m_interface;
681	>	ofun[PAT_CTEXT].funp =
682	>	ofun[PAT_BTEXT].funp =
683	>	ofun[MIX_TEXT].funp = text;
684	>	ofun[ALIAS].funp = alias;
685	>	/* surface inverses */
686	>	tinvers[OBJ_SOURCE] = OBJ_SOURCE;
687	>	tinvers[OBJ_CONE] = OBJ_CUP;
688	>	tinvers[OBJ_CUP] = OBJ_CONE;
689	>	tinvers[OBJ_SPHERE] = OBJ_BUBBLE;
690	>	tinvers[OBJ_BUBBLE] = OBJ_SPHERE;
691	>	tinvers[OBJ_RING] = OBJ_RING;
692	>	tinvers[OBJ_CYLINDER] = OBJ_TUBE;
693	>	tinvers[OBJ_TUBE] = OBJ_CYLINDER;
694	>	tinvers[OBJ_INSTANCE] = OBJ_INSTANCE; /* oh, well */
695		}

Diff Legend

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

Comparing ray/src/gen/xform.c (file contents): Revision 1.9 by greg, Fri Oct 13 19:34:17 1989 UTC vs. Revision 2.6 by greg, Mon Sep 21 12:15:44 1992 UTC

Diff Legend

Comparing ray/src/gen/xform.c (file contents):
Revision 1.9 by greg, Fri Oct 13 19:34:17 1989 UTC vs.
Revision 2.6 by greg, Mon Sep 21 12:15:44 1992 UTC