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

Comparing ray/src/gen/xform.c (file contents):
Revision 1.10 by greg, Wed Jan 24 09:16:03 1990 UTC vs.
Revision 2.9 by greg, Fri Oct 27 08:56:18 1995 UTC

#	Line 1 \| Line 1
1	<	/* Copyright (c) 1986 Regents of the University of California */
1	>	/* Copyright (c) 1995 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]);
#	Line 216 \| 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		{
176	+	int nobjs = 0;
177		register int c;
178
179		while ((c = getc(fin)) != EOF) {
#	Line 235 \| Line 189 \| *register FILE fin;**
189		} else if (c == '!') { /* command */
190		ungetc(c, fin);
191		xfcomm(name, fin);
192	+	nobjs++;
193		} else { /* object */
194		ungetc(c, fin);
195		xfobject(name, fin);
196	+	nobjs++;
197		}
198		}
199	+	if (nobjs == 0)
200	+	fprintf(stderr, "%s: (%s): warning - empty file\n",
201	+	progname, name);
202		}
203
204
205		xfcomm(fname, fin) /* transform a command */
206	+	char *fname;
207		FILE *fin;
208		{
209		FILE *popen();
#	Line 254 \| Line 214 \| *FILE fin;**
214
215		fgetline(buf, sizeof(buf), fin);
216		if (expand) {
217	<	if (xac > 2) {
218	<	if ((pin = popen(buf+1, "r")) == NULL) {
219	<	fprintf(stderr,
220	<	"%s: (%s): cannot execute \"%s\"\n",
261	<	progname, fname, buf);
262	<	exit(1);
263	<	}
264	<	xform(buf, pin);
265	<	pclose(pin);
266	<	} else {
267	<	fflush(stdout);
268	<	system(buf+1);
217	>	if ((pin = popen(buf+1, "r")) == NULL) {
218	>	fprintf(stderr, "%s: (%s): cannot execute \"%s\"\n",
219	>	progname, fname, buf);
220	>	exit(1);
221		}
222	+	xform(buf, pin);
223	+	pclose(pin);
224		} else {
225		printf("\n%s", buf);
226		if (xac > 1) {
#	Line 283 \| Line 237 \| *xfobject(fname, fin) / transform an object /*
237		char *fname;
238		FILE *fin;
239		{
240	<	char stmp[MAXSTR];
240	>	extern char *strcpy();
241	>	char typ[16], nam[MAXSTR];
242		int fn;
243	<
244	<	fscanf(fin, "%s", stmp); /* modifier */
245	<	printf("\n%s ", stmp);
246	<	fscanf(fin, "%s", stmp); /* object type */
247	<	if ((fn = otype(stmp)) < 0) {
243	>	/* modifier and type */
244	>	strcpy(typ, "EOF");
245	>	fgetword(nam, sizeof(nam), fin);
246	>	fgetword(typ, sizeof(typ), fin);
247	>	if ((fn = otype(typ)) < 0) {
248		fprintf(stderr, "%s: (%s): unknown object type \"%s\"\n",
249	<	progname, fname, stmp);
249	>	progname, fname, typ);
250		exit(1);
251		}
252	<	printf("%s ", stmp);
253	<	fscanf(fin, "%s", stmp); /* object name */
299	<	if (idprefix != NULL && issurface(fn))
300	<	printf("%s.%s\n", idprefix, stmp);
252	>	if (ismodifier(fn))
253	>	printf("\n%s %s ", nam, typ);
254		else
255	<	printf("%s\n", stmp);
256	<	/* transform arguments */
255	>	printf("\n%s %s ", newmod != NULL ? newmod : nam,
256	>	invert ? ofun[tinvers[fn]].funame : typ);
257	>	/* object name */
258	>	fgetword(nam, sizeof(nam), fin);
259	>	if (idprefix == NULL \|\| ismodifier(fn))
260	>	printf("%s\n", nam);
261	>	else
262	>	printf("%s.%s\n", idprefix, nam);
263	>	/* transform arguments */
264		if ((*ofun[fn].funp)(fin) < 0) {
265		fprintf(stderr, "%s: (%s): bad %s \"%s\"\n",
266	<	progname, fname, ofun[fn].funame, stmp);
266	>	progname, fname, ofun[fn].funame, nam);
267		exit(1);
268		}
269		}
270
271
272	<	passargs(fin) /* pass on arguments unchanged */
272	>	o_default(fin) /* pass on arguments unchanged */
273		FILE *fin;
274		{
275		register int i;
276	<	register FUNARGS *fa;
276	>	FUNARGS fa;
277
278	<	if ((fa = getfargs(fin)) == NULL)
278	>	if (readfargs(&fa, fin) != 1)
279		return(-1);
280		/* string arguments */
281	<	printf("%d", fa->nsargs);
282	<	for (i = 0; i < fa->nsargs; i++)
283	<	printf(" %s", fa->sarg[i]);
281	>	printf("%d", fa.nsargs);
282	>	for (i = 0; i < fa.nsargs; i++)
283	>	printf(" %s", fa.sarg[i]);
284		printf("\n");
285	+	#ifdef IARGS
286		/* integer arguments */
287	<	printf("%d", fa->niargs);
288	<	for (i = 0; i < fa->niargs; i++)
289	<	printf(" %d", fa->iarg[i]);
287	>	printf("%d", fa.niargs);
288	>	for (i = 0; i < fa.niargs; i++)
289	>	printf(" %d", fa.iarg[i]);
290		printf("\n");
291	+	#else
292	+	printf("0\n");
293	+	#endif
294		/* float arguments */
295	<	printf("%d", fa->nfargs);
296	<	for (i = 0; i < fa->nfargs; i++)
297	<	printf(" %18.12g", fa->farg[i]);
295	>	printf("%d", fa.nfargs);
296	>	for (i = 0; i < fa.nfargs; i++)
297	>	printf(" %18.12g", fa.farg[i]);
298		printf("\n");
299	<	freefargs(fa);
299	>	freefargs(&fa);
300		return(0);
301		}
302
#	Line 341 \| Line 305 \| *addxform(fin) / add xf arguments to strings /*
305		FILE *fin;
306		{
307		register int i;
308	<	register FUNARGS *fa;
308	>	int resetarr = 0;
309	>	FUNARGS fa;
310
311	<	if ((fa = getfargs(fin)) == NULL)
311	>	if (readfargs(&fa, fin) != 1)
312		return(-1);
313		/* string arguments */
314	<	printf("%d", fa->nsargs + xac-xfa);
315	<	for (i = 0; i < fa->nsargs; i++)
316	<	printf(" %s", fa->sarg[i]);
314	>	if (xac > xfa && strcmp(xav[xfa], "-i"))
315	>	resetarr = 2;
316	>	printf("%d", fa.nsargs + resetarr + xac-xfa);
317	>	for (i = 0; i < fa.nsargs; i++)
318	>	printf(" %s", fa.sarg[i]);
319	>	if (resetarr)
320	>	printf(" -i 1");
321		for (i = xfa; i < xac; i++) /* add xf arguments */
322		printf(" %s", xav[i]);
323		printf("\n");
324	+	#ifdef IARGS
325		/* integer arguments */
326	<	printf("%d", fa->niargs);
327	<	for (i = 0; i < fa->niargs; i++)
328	<	printf(" %d", fa->iarg[i]);
326	>	printf("%d", fa.niargs);
327	>	for (i = 0; i < fa.niargs; i++)
328	>	printf(" %d", fa.iarg[i]);
329		printf("\n");
330	+	#else
331	+	printf("0\n");
332	+	#endif
333		/* float arguments */
334	<	printf("%d", fa->nfargs);
335	<	for (i = 0; i < fa->nfargs; i++)
336	<	printf(" %18.12g", fa->farg[i]);
334	>	printf("%d", fa.nfargs);
335	>	for (i = 0; i < fa.nfargs; i++)
336	>	printf(" %18.12g", fa.farg[i]);
337		printf("\n");
338	<	freefargs(fa);
338	>	freefargs(&fa);
339		return(0);
340		}
341
#	Line 373 \| Line 346 \| *register char ofname;**
346		{
347		register int i;
348
349	<	for (i = 0; ofun[i].funame != NULL; i++)
349	>	for (i = 0; i < NUMTYPES; i++)
350		if (!strcmp(ofun[i].funame, ofname))
351		return(i);
352
#	Line 384 \| Line 357 \| *register char ofname;**
357		alias(fin) /* transfer alias */
358		FILE *fin;
359		{
360	<	char alias[MAXSTR];
360	>	char aliasnm[MAXSTR];
361
362	<	if (fscanf(fin, "%s", alias) != 1)
362	>	if (fgetword(aliasnm, MAXSTR, fin) == NULL)
363		return(-1);
364	<	printf("\t%s\n", alias);
364	>	printf("\t%s\n", aliasnm);
365		return(0);
366		}
367
#	Line 396 \| Line 369 \| *FILE fin;**
369		m_glow(fin) /* transform arguments for proximity light */
370		FILE *fin;
371		{
372	<	register FUNARGS *fa;
372	>	FUNARGS fa;
373
374	<	if ((fa = getfargs(fin)) == NULL)
374	>	if (readfargs(&fa, fin) != 1)
375		return(-1);
376	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 4)
376	>	if (fa.nsargs != 0 \|\| fa.nfargs != 4)
377		return(-1);
378		printf("0\n0\n4");
379		printf(" %18.12g %18.12g %18.12g",
380	<	fa->farg[0], fa->farg[1], fa->farg[2]);
381	<	printf(" %18.12g\n", fa->farg[3] * totscale);
382	<	freefargs(fa);
380	>	fa.farg[0], fa.farg[1], fa.farg[2]);
381	>	printf(" %18.12g\n", fa.farg[3] * tot.sca);
382	>	freefargs(&fa);
383		return(0);
384		}
385
#	Line 414 \| Line 387 \| *FILE fin;**
387		m_spot(fin) /* transform arguments for spotlight */
388		FILE *fin;
389		{
390	<	double v[3];
391	<	register FUNARGS *fa;
390	>	FVECT v;
391	>	FUNARGS fa;
392
393	<	if ((fa = getfargs(fin)) == NULL)
393	>	if (readfargs(&fa, fin) != 1)
394		return(-1);
395	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 7)
395	>	if (fa.nsargs != 0 \|\| fa.nfargs != 7)
396		return(-1);
397		printf("0\n0\n7");
398		printf(" %18.12g %18.12g %18.12g %18.12g\n",
399	<	fa->farg[0], fa->farg[1], fa->farg[2], fa->farg[3]);
400	<	multv3(v, fa->farg+4, totxform);
399	>	fa.farg[0], fa.farg[1], fa.farg[2], fa.farg[3]);
400	>	multv3(v, fa.farg+4, tot.xfm);
401		printf("\t%18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
402	<	freefargs(fa);
402	>	freefargs(&fa);
403		return(0);
404		}
405
#	Line 434 \| Line 407 \| *FILE fin;**
407		m_dielectric(fin) /* transform arguments for dielectric */
408		FILE *fin;
409		{
410	<	double pow();
438	<	register FUNARGS *fa;
410	>	FUNARGS fa;
411
412	<	if ((fa = getfargs(fin)) == NULL)
412	>	if (readfargs(&fa, fin) != 1)
413		return(-1);
414	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 5)
414	>	if (fa.nsargs != 0 \|\| fa.nfargs != 5)
415		return(-1);
416		printf("0\n0\n5");
417		printf(" %18.12g %18.12g %18.12g",
418	<	pow(fa->farg[0], 1.0/totscale),
419	<	pow(fa->farg[1], 1.0/totscale),
420	<	pow(fa->farg[2], 1.0/totscale));
421	<	printf(" %18.12g %18.12g\n", fa->farg[3], fa->farg[4]);
422	<	freefargs(fa);
418	>	pow(fa.farg[0], 1.0/tot.sca),
419	>	pow(fa.farg[1], 1.0/tot.sca),
420	>	pow(fa.farg[2], 1.0/tot.sca));
421	>	printf(" %18.12g %18.12g\n", fa.farg[3], fa.farg[4]);
422	>	freefargs(&fa);
423		return(0);
424		}
425
#	Line 455 \| Line 427 \| *FILE fin;**
427		m_interface(fin) /* transform arguments for interface */
428		FILE *fin;
429		{
430	<	double pow();
459	<	register FUNARGS *fa;
430	>	FUNARGS fa;
431
432	<	if ((fa = getfargs(fin)) == NULL)
432	>	if (readfargs(&fa, fin) != 1)
433		return(-1);
434	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 8)
434	>	if (fa.nsargs != 0 \|\| fa.nfargs != 8)
435		return(-1);
436		printf("0\n0\n8\n");
437		printf("%18.12g %18.12g %18.12g",
438	<	pow(fa->farg[0], 1.0/totscale),
439	<	pow(fa->farg[1], 1.0/totscale),
440	<	pow(fa->farg[2], 1.0/totscale));
441	<	printf(" %18.12g\n", fa->farg[3]);
438	>	pow(fa.farg[0], 1.0/tot.sca),
439	>	pow(fa.farg[1], 1.0/tot.sca),
440	>	pow(fa.farg[2], 1.0/tot.sca));
441	>	printf(" %18.12g\n", fa.farg[3]);
442		printf("%18.12g %18.12g %18.12g",
443	<	pow(fa->farg[4], 1.0/totscale),
444	<	pow(fa->farg[5], 1.0/totscale),
445	<	pow(fa->farg[6], 1.0/totscale));
446	<	printf(" %18.12g\n", fa->farg[7]);
447	<	freefargs(fa);
443	>	pow(fa.farg[4], 1.0/tot.sca),
444	>	pow(fa.farg[5], 1.0/tot.sca),
445	>	pow(fa.farg[6], 1.0/tot.sca));
446	>	printf(" %18.12g\n", fa.farg[7]);
447	>	freefargs(&fa);
448		return(0);
449		}
450
#	Line 482 \| Line 453 \| *text(fin) / transform text arguments /*
453		FILE *fin;
454		{
455		int i;
456	<	double v[3];
457	<	register FUNARGS *fa;
456	>	FVECT v;
457	>	FUNARGS fa;
458
459	<	if ((fa = getfargs(fin)) == NULL)
459	>	if (readfargs(&fa, fin) != 1)
460		return(-1);
461	<	if (fa->niargs != 0 \|\| (fa->nfargs != 9 &&
491	<	fa->nfargs != 11 && fa->nfargs != 15))
461	>	if (fa.nfargs < 9)
462		return(-1);
463		/* string arguments */
464	<	printf("%d", fa->nsargs);
465	<	for (i = 0; i < fa->nsargs; i++)
466	<	printf(" %s", fa->sarg[i]);
467	<	printf("\n0\n%d\n", fa->nfargs);
464	>	printf("%d", fa.nsargs);
465	>	for (i = 0; i < fa.nsargs; i++)
466	>	printf(" %s", fa.sarg[i]);
467	>	printf("\n0\n%d\n", fa.nfargs);
468		/* anchor point */
469	<	multp3(v, fa->farg, totxform);
469	>	multp3(v, fa.farg, tot.xfm);
470		printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
471		/* right vector */
472	<	multv3(v, fa->farg+3, totxform);
472	>	multv3(v, fa.farg+3, tot.xfm);
473		printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
474		/* down vector */
475	<	multv3(v, fa->farg+6, totxform);
476	<	printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
477	<	/* forground and background */
478	<	if (fa->nfargs == 11)
479	<	printf(" %18.12g %18.12g\n", fa->farg[9], fa->farg[10]);
480	<	else if (fa->nfargs == 15) {
481	<	printf(" %18.12g %18.12g %18.12g\n",
512	<	fa->farg[9], fa->farg[10], fa->farg[11]);
513	<	printf(" %18.12g %18.12g %18.12g\n",
514	<	fa->farg[12], fa->farg[13], fa->farg[14]);
475	>	multv3(v, fa.farg+6, tot.xfm);
476	>	printf(" %18.12g %18.12g %18.12g", v[0], v[1], v[2]);
477	>	/* remaining arguments */
478	>	for (i = 9; i < fa.nfargs; i++) {
479	>	if (i%3 == 0)
480	>	putchar('\n');
481	>	printf(" %18.12g", fa.farg[i]);
482		}
483	<	freefargs(fa);
483	>	putchar('\n');
484	>	freefargs(&fa);
485		return(0);
486		}
487
#	Line 521 \| Line 489 \| *FILE fin;**
489		o_source(fin) /* transform source arguments */
490		FILE *fin;
491		{
492	<	double dv[3];
493	<	register FUNARGS *fa;
492	>	FVECT dv;
493	>	FUNARGS fa;
494
495	<	if ((fa = getfargs(fin)) == NULL)
495	>	if (readfargs(&fa, fin) != 1)
496		return(-1);
497	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 4)
497	>	if (fa.nsargs != 0 \|\| fa.nfargs != 4)
498		return(-1);
499		/* transform direction vector */
500	<	multv3(dv, fa->farg, totxform);
500	>	multv3(dv, fa.farg, tot.xfm);
501		/* output */
502		printf("0\n0\n4");
503		printf(" %18.12g %18.12g %18.12g %18.12g\n",
504	<	dv[0], dv[1], dv[2], fa->farg[3]);
505	<	freefargs(fa);
504	>	dv[0], dv[1], dv[2], fa.farg[3]);
505	>	freefargs(&fa);
506		return(0);
507		}
508
#	Line 542 \| Line 510 \| *FILE fin;**
510		o_sphere(fin) /* transform sphere arguments */
511		FILE *fin;
512		{
513	<	double cent[3], rad;
514	<	register FUNARGS *fa;
513	>	FVECT cent;
514	>	double rad;
515	>	FUNARGS fa;
516
517	<	if ((fa = getfargs(fin)) == NULL)
517	>	if (readfargs(&fa, fin) != 1)
518		return(-1);
519	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 4)
519	>	if (fa.nsargs != 0 \|\| fa.nfargs != 4)
520		return(-1);
521
522	<	multp3(cent, fa->farg, totxform); /* transform center */
522	>	multp3(cent, fa.farg, tot.xfm); /* transform center */
523
524	<	rad = fa->farg[3] * totscale; /* scale radius */
524	>	rad = fa.farg[3] * tot.sca; /* scale radius */
525
526		printf("0\n0\n4");
527		printf(" %18.12g %18.12g %18.12g %18.12g\n",
528		cent[0], cent[1], cent[2], rad);
529	<	freefargs(fa);
529	>	freefargs(&fa);
530		return(0);
531		}
532
#	Line 565 \| Line 534 \| *FILE fin;**
534		o_face(fin) /* transform face arguments */
535		FILE *fin;
536		{
537	<	double p[3];
537	>	FVECT p;
538		register int i;
539	<	register FUNARGS *fa;
539	>	FUNARGS fa;
540
541	<	if ((fa = getfargs(fin)) == NULL)
541	>	if (readfargs(&fa, fin) != 1)
542		return(-1);
543	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs % 3)
543	>	if (fa.nsargs != 0 \|\| fa.nfargs % 3)
544		return(-1);
545
546	<	printf("0\n0\n%d\n", fa->nfargs);
546	>	printf("0\n0\n%d\n", fa.nfargs);
547
548	<	for (i = 0; i < fa->nfargs; i += 3) {
548	>	for (i = 0; i < fa.nfargs; i += 3) {
549		if (reverse)
550	<	multp3(p, fa->farg+(fa->nfargs-i-3), totxform);
550	>	multp3(p, fa.farg+(fa.nfargs-i-3), tot.xfm);
551		else
552	<	multp3(p, fa->farg+i, totxform);
552	>	multp3(p, fa.farg+i, tot.xfm);
553		printf(" %18.12g %18.12g %18.12g\n", p[0], p[1], p[2]);
554		}
555	<	freefargs(fa);
555	>	freefargs(&fa);
556		return(0);
557		}
558
#	Line 591 \| Line 560 \| *FILE fin;**
560		o_cone(fin) /* transform cone and cup arguments */
561		FILE *fin;
562		{
563	<	double p0[3], p1[3], r0, r1;
564	<	register FUNARGS *fa;
563	>	FVECT p0, p1;
564	>	double r0, r1;
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
572		printf("0\n0\n8\n");
573
574	<	multp3(p0, fa->farg, totxform);
575	<	multp3(p1, fa->farg+3, totxform);
576	<	r0 = fa->farg[6] * totscale;
577	<	r1 = fa->farg[7] * totscale;
574	>	multp3(p0, fa.farg, tot.xfm);
575	>	multp3(p1, fa.farg+3, tot.xfm);
576	>	r0 = fa.farg[6] * tot.sca;
577	>	r1 = fa.farg[7] * tot.sca;
578		printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
579		printf(" %18.12g %18.12g %18.12g\n", p1[0], p1[1], p1[2]);
580		printf(" %18.12g %18.12g\n", r0, r1);
581
582	<	freefargs(fa);
582	>	freefargs(&fa);
583		return(0);
584		}
585
#	Line 617 \| Line 587 \| *FILE fin;**
587		o_cylinder(fin) /* transform cylinder and tube arguments */
588		FILE *fin;
589		{
590	<	double p0[3], p1[3], rad;
591	<	register FUNARGS *fa;
590	>	FVECT p0, p1;
591	>	double rad;
592	>	FUNARGS fa;
593
594	<	if ((fa = getfargs(fin)) == NULL)
594	>	if (readfargs(&fa, fin) != 1)
595		return(-1);
596	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 7)
596	>	if (fa.nsargs != 0 \|\| fa.nfargs != 7)
597		return(-1);
598
599		printf("0\n0\n7\n");
600
601	<	multp3(p0, fa->farg, totxform);
602	<	multp3(p1, fa->farg+3, totxform);
603	<	rad = fa->farg[6] * totscale;
601	>	multp3(p0, fa.farg, tot.xfm);
602	>	multp3(p1, fa.farg+3, tot.xfm);
603	>	rad = fa.farg[6] * tot.sca;
604		printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
605		printf(" %18.12g %18.12g %18.12g\n", p1[0], p1[1], p1[2]);
606		printf(" %18.12g\n", rad);
607	<	freefargs(fa);
607	>	freefargs(&fa);
608		return(0);
609		}
610
#	Line 641 \| Line 612 \| *FILE fin;**
612		o_ring(fin) /* transform ring arguments */
613		FILE *fin;
614		{
615	<	double p0[3], pd[3], r0, r1;
616	<	register FUNARGS *fa;
615	>	FVECT p0, pd;
616	>	double r0, r1;
617	>	FUNARGS fa;
618
619	<	if ((fa = getfargs(fin)) == NULL)
619	>	if (readfargs(&fa, fin) != 1)
620		return(-1);
621	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 8)
621	>	if (fa.nsargs != 0 \|\| fa.nfargs != 8)
622		return(-1);
623
624		printf("0\n0\n8\n");
625
626	<	multp3(p0, fa->farg, totxform);
627	<	multv3(pd, fa->farg+3, totxform);
628	<	r0 = fa->farg[6] * totscale;
629	<	r1 = fa->farg[7] * totscale;
626	>	multp3(p0, fa.farg, tot.xfm);
627	>	multv3(pd, fa.farg+3, tot.xfm);
628	>	if (invert) {
629	>	pd[0] = -pd[0];
630	>	pd[1] = -pd[1];
631	>	pd[2] = -pd[2];
632	>	}
633	>	r0 = fa.farg[6] * tot.sca;
634	>	r1 = fa.farg[7] * tot.sca;
635		printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
636		printf(" %18.12g %18.12g %18.12g\n", pd[0], pd[1], pd[2]);
637		printf(" %18.12g %18.12g\n", r0, r1);
638	<	freefargs(fa);
638	>	freefargs(&fa);
639		return(0);
640		}
641
642
643	<	FUNARGS *
667	<	getfargs(fp) /* get function arguments from stream */
668	<	FILE *fp;
643	>	initotypes() /* initialize ofun[] array */
644		{
670	–	char *strcpy();
671	–	char sbuf[MAXSTR];
672	–	int n;
673	–	register FUNARGS *fa;
645		register int i;
646
647	<	if ((fa = (FUNARGS *)malloc((unsigned)sizeof(FUNARGS))) == NULL)
648	<	goto memerr;
649	<	if (fscanf(fp, "%d", &n) != 1 \|\| n < 0)
650	<	return(NULL);
651	<	if (fa->nsargs = n) {
652	<	fa->sarg = (char *)malloc((unsigned)fa->nsargssizeof(char *));
653	<	if (fa->sarg == NULL)
654	<	goto memerr;
655	<	for (i = 0; i < fa->nsargs; i++) {
656	<	if (fscanf(fp, "%s", sbuf) != 1)
657	<	return(NULL);
658	<	if ((fa->sarg[i] = malloc((unsigned)strlen(sbuf)+1)) == NULL)
659	<	goto memerr;
660	<	strcpy(fa->sarg[i], sbuf);
661	<	}
662	<	} else
663	<	fa->sarg = NULL;
664	<	if (fscanf(fp, "%d", &n) != 1 \|\| n < 0)
665	<	return(NULL);
666	<	if (fa->niargs = n) {
667	<	fa->iarg = (int )malloc((unsigned)fa->niargssizeof(int));
668	<	if (fa->iarg == NULL)
669	<	goto memerr;
670	<	for (i = 0; i < fa->niargs; i++)
671	<	if (fscanf(fp, "%d", &fa->iarg[i]) != 1)
672	<	return(NULL);
673	<	} else
674	<	fa->iarg = NULL;
675	<	if (fscanf(fp, "%d", &n) != 1 \|\| n < 0)
676	<	return(NULL);
677	<	if (fa->nfargs = n) {
678	<	fa->farg = (double )malloc((unsigned)fa->nfargssizeof(double));
679	<	if (fa->farg == NULL)
680	<	goto memerr;
681	<	for (i = 0; i < fa->nfargs; i++)
682	<	if (fscanf(fp, "%lf", &fa->farg[i]) != 1)
683	<	return(NULL);
684	<	} else
685	<	fa->farg = NULL;
715	<	return(fa);
716	<	memerr:
717	<	fprintf(stderr, "%s: out of memory in getfargs\n", progname);
718	<	exit(1);
719	<	}
720	<
721	<
722	<	freefargs(fa) /* free memory associated with fa */
723	<	register FUNARGS *fa;
724	<	{
725	<	register int i;
726	<
727	<	for (i = 0; i < fa->nsargs; i++)
728	<	free(fa->sarg[i]);
729	<	if (fa->nsargs)
730	<	free(fa->sarg);
731	<	if (fa->niargs)
732	<	free(fa->iarg);
733	<	if (fa->nfargs)
734	<	free(fa->farg);
735	<	free(fa);
647	>	if (ofun[OBJ_SOURCE].funp == o_source)
648	>	return; /* done already */
649	>	/* alias is additional */
650	>	ofun[ALIAS].funame = ALIASID;
651	>	ofun[ALIAS].flags = 0;
652	>	/* functions get new transform */
653	>	for (i = 0; i < NUMTYPES; i++)
654	>	if (hasfunc(i))
655	>	ofun[i].funp = addxform;
656	>	/* special cases */
657	>	ofun[OBJ_SOURCE].funp = o_source;
658	>	ofun[OBJ_SPHERE].funp =
659	>	ofun[OBJ_BUBBLE].funp = o_sphere;
660	>	ofun[OBJ_FACE].funp = o_face;
661	>	ofun[OBJ_CONE].funp =
662	>	ofun[OBJ_CUP].funp = o_cone;
663	>	ofun[OBJ_CYLINDER].funp =
664	>	ofun[OBJ_TUBE].funp = o_cylinder;
665	>	ofun[OBJ_RING].funp = o_ring;
666	>	ofun[OBJ_INSTANCE].funp = addxform;
667	>	ofun[MAT_GLOW].funp = m_glow;
668	>	ofun[MAT_SPOT].funp = m_spot;
669	>	ofun[MAT_DIELECTRIC].funp = m_dielectric;
670	>	ofun[MAT_INTERFACE].funp = m_interface;
671	>	ofun[PAT_CTEXT].funp =
672	>	ofun[PAT_BTEXT].funp =
673	>	ofun[MIX_TEXT].funp = text;
674	>	ofun[ALIAS].funp = alias;
675	>	/* surface inverses */
676	>	tinvers[OBJ_FACE] = OBJ_FACE;
677	>	tinvers[OBJ_SOURCE] = OBJ_SOURCE;
678	>	tinvers[OBJ_CONE] = OBJ_CUP;
679	>	tinvers[OBJ_CUP] = OBJ_CONE;
680	>	tinvers[OBJ_SPHERE] = OBJ_BUBBLE;
681	>	tinvers[OBJ_BUBBLE] = OBJ_SPHERE;
682	>	tinvers[OBJ_RING] = OBJ_RING;
683	>	tinvers[OBJ_CYLINDER] = OBJ_TUBE;
684	>	tinvers[OBJ_TUBE] = OBJ_CYLINDER;
685	>	tinvers[OBJ_INSTANCE] = OBJ_INSTANCE; /* oh, well */
686		}

Diff Legend

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

Comparing ray/src/gen/xform.c (file contents): Revision 1.10 by greg, Wed Jan 24 09:16:03 1990 UTC vs. Revision 2.9 by greg, Fri Oct 27 08:56:18 1995 UTC

Diff Legend

Comparing ray/src/gen/xform.c (file contents):
Revision 1.10 by greg, Wed Jan 24 09:16:03 1990 UTC vs.
Revision 2.9 by greg, Fri Oct 27 08:56:18 1995 UTC