[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.15 by gregl, Fri May 30 18:24:32 1997 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(), 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 */
65		for (a = 1; a < argc; a++)
#	Line 70 \| Line 71 \| *char argv[];**
71		for (a = 1; a < argc; a++) {
72		if (argv[a][0] == '-')
73		switch (argv[a][1]) {
74	+	case 'm':
75	+	if (argv[a][2] \|\| a+1 >= argc)
76	+	break;
77	+	newmod = argv[++a];
78	+	continue;
79		case 'n':
80		if (argv[a][2] \|\| a+1 >= argc)
81		break;
82		idprefix = argv[++a];
83		continue;
84	+	case 'c':
85	+	if (argv[a][2])
86	+	break;
87	+	expand = 0;
88	+	continue;
89		case 'e':
90		if (argv[a][2])
91		break;
92		expand = 1;
93		continue;
94	+	case 'I':
95	+	if (argv[a][2])
96	+	break;
97	+	invert = 1;
98	+	continue;
99		}
100		break;
101		}
#	Line 87 \| Line 103 \| *char argv[];**
103		xav = argv;
104		xfa = a;
105
106	<	totscale = 1.0;
91	<	setident4(totxform);
106	>	a += xf(&tot, argc-a, argv+a);
107
108	<	a += xf(totxform, &totscale, argc-a, argv+a);
108	>	if (reverse = tot.sca < 0.0)
109	>	tot.sca = -tot.sca;
110	>	if (invert)
111	>	reverse = !reverse;
112
95	–	if (reverse = totscale < 0.0)
96	–	totscale = -totscale;
97	–
113		if (a < argc && argv[a][0] == '-') {
114		fprintf(stderr, "%s: command line error at '%s'\n",
115		argv[0], argv[a]);
#	Line 108 \| Line 123 \| *char argv[];**
123		printf(" %s", xav[a]);
124		putchar('\n');
125		/* transform input */
126	<	if (xac == argc)
127	<	xform("standard input", stdin);
128	<	else
126	>	if (xac == argc) {
127	>	openmain(NULL);
128	>	xform(mainfn, mainfp);
129	>	} else
130		for (a = xac; a < argc; a++) {
131	<	if ((fp = fopen(argv[a], "r")) == NULL) {
132	<	fprintf(stderr, "%s: cannot open \"%s\"\n",
117	<	progname, argv[a]);
118	<	exit(1);
119	<	}
120	<	xform(argv[a], fp);
121	<	fclose(fp);
131	>	openmain(argv[a]);
132	>	xform(mainfn, mainfp);
133		}
134
135		return(0);
#	Line 132 \| Line 143 \| int ac, ai;
143		char newav[256], *avp;
144		char newid[128], repts[32];
145		char *oldid = NULL;
146	<	int i, err;
146	>	int n, i, err;
147
148		avp = newav+2;
149		avp[0] = av[0];
#	Line 152 \| Line 163 \| int ac, ai;
163		avp = newav;
164		ac += 2;
165		}
166	+	nrept *= n = atoi(av[ai+1]);
167		err = 0;
168	<	for (i = 0; i < atoi(av[ai+1]); i++) {
168	>	for (i = 0; i < n; i++) {
169		if (oldid == NULL)
170		sprintf(newid, "a%d", i);
171		else
#	Line 165 \| Line 177 \| int ac, ai;
177		}
178
179
180	<	xform(name, fin) /* transform stream by totxform */
180	>	xform(name, fin) /* transform stream by tot.xfm */
181		char *name;
182		register FILE *fin;
183		{
184	+	int nobjs = 0;
185		register int c;
186
187		while ((c = getc(fin)) != EOF) {
#	Line 184 \| Line 197 \| *register FILE fin;**
197		} else if (c == '!') { /* command */
198		ungetc(c, fin);
199		xfcomm(name, fin);
200	+	nobjs++;
201		} else { /* object */
202		ungetc(c, fin);
203		xfobject(name, fin);
204	+	nobjs++;
205		}
206		}
207	+	if (nobjs == 0)
208	+	fprintf(stderr, "%s: (%s): warning - empty file\n",
209	+	progname, name);
210		}
211
212
213		xfcomm(fname, fin) /* transform a command */
214	+	char *fname;
215		FILE *fin;
216		{
217	<	FILE *popen();
218	<	char *fgetline();
217	>	extern FILE *popen();
218	>	extern char *fgetline();
219		FILE *pin;
220		char buf[512];
221		int i;
222
223		fgetline(buf, sizeof(buf), fin);
224		if (expand) {
225	<	if (xac > 2) {
226	<	if ((pin = popen(buf+1, "r")) == NULL) {
227	<	fprintf(stderr,
228	<	"%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);
225	>	if ((pin = popen(buf+1, "r")) == NULL) {
226	>	fprintf(stderr, "%s: (%s): cannot execute \"%s\"\n",
227	>	progname, fname, buf);
228	>	exit(1);
229		}
230	+	xform(buf, pin);
231	+	pclose(pin);
232		} else {
233		printf("\n%s", buf);
234		if (xac > 1) {
235	<	printf(" \| %s -e", xav[0]);
235	>	printf(" \| %s", xav[0]);
236		for (i = 1; i < xac; i++)
237		printf(" %s", xav[i]);
238		}
#	Line 232 \| Line 245 \| *xfobject(fname, fin) / transform an object /*
245		char *fname;
246		FILE *fin;
247		{
248	<	char stmp[MAXSTR];
248	>	extern char *strcpy();
249	>	char typ[16], nam[MAXSTR];
250		int fn;
251	<
252	<	fscanf(fin, "%s", stmp); /* modifier */
253	<	printf("\n%s ", stmp);
254	<	fscanf(fin, "%s", stmp); /* object type */
255	<	if ((fn = otype(stmp)) < 0) {
251	>	/* modifier and type */
252	>	strcpy(typ, "EOF");
253	>	fgetword(nam, sizeof(nam), fin);
254	>	fgetword(typ, sizeof(typ), fin);
255	>	if ((fn = otype(typ)) < 0) {
256		fprintf(stderr, "%s: (%s): unknown object type \"%s\"\n",
257	<	progname, fname, stmp);
257	>	progname, fname, typ);
258		exit(1);
259		}
260	<	printf("%s ", stmp);
261	<	fscanf(fin, "%s", stmp); /* object name */
248	<	if (idprefix != NULL && issurface(fn))
249	<	printf("%s.%s\n", idprefix, stmp);
260	>	if (ismodifier(fn))
261	>	printf("\n%s %s ", nam, typ);
262		else
263	<	printf("%s\n", stmp);
264	<	/* transform arguments */
263	>	printf("\n%s %s ", newmod != NULL ? newmod : nam,
264	>	invert ? ofun[tinvers[fn]].funame : typ);
265	>	/* object name */
266	>	fgetword(nam, sizeof(nam), fin);
267	>	if (idprefix == NULL \|\| ismodifier(fn))
268	>	printf("%s\n", nam);
269	>	else
270	>	printf("%s.%s\n", idprefix, nam);
271	>	/* transform arguments */
272		if ((*ofun[fn].funp)(fin) < 0) {
273		fprintf(stderr, "%s: (%s): bad %s \"%s\"\n",
274	<	progname, fname, ofun[fn].funame, stmp);
274	>	progname, fname, ofun[fn].funame, nam);
275		exit(1);
276		}
277		}
#	Line 262 \| Line 281 \| *o_default(fin) / pass on arguments unchanged /*
281		FILE *fin;
282		{
283		register int i;
284	<	register FUNARGS *fa;
284	>	FUNARGS fa;
285
286	<	if ((fa = getfargs(fin)) == NULL)
286	>	if (readfargs(&fa, fin) != 1)
287		return(-1);
288		/* string arguments */
289	<	printf("%d", fa->nsargs);
290	<	for (i = 0; i < fa->nsargs; i++)
291	<	printf(" %s", fa->sarg[i]);
289	>	printf("%d", fa.nsargs);
290	>	for (i = 0; i < fa.nsargs; i++)
291	>	printf(" %s", fa.sarg[i]);
292		printf("\n");
293	+	#ifdef IARGS
294		/* integer arguments */
295	<	printf("%d", fa->niargs);
296	<	for (i = 0; i < fa->niargs; i++)
297	<	printf(" %d", fa->iarg[i]);
295	>	printf("%d", fa.niargs);
296	>	for (i = 0; i < fa.niargs; i++)
297	>	printf(" %d", fa.iarg[i]);
298		printf("\n");
299	+	#else
300	+	printf("0\n");
301	+	#endif
302		/* float arguments */
303	<	printf("%d", fa->nfargs);
304	<	for (i = 0; i < fa->nfargs; i++)
305	<	printf(" %18.12g", fa->farg[i]);
303	>	printf("%d", fa.nfargs);
304	>	for (i = 0; i < fa.nfargs; i++)
305	>	printf(" %18.12g", fa.farg[i]);
306		printf("\n");
307	<	freefargs(fa);
307	>	freefargs(&fa);
308		return(0);
309		}
310
#	Line 290 \| Line 313 \| *addxform(fin) / add xf arguments to strings /*
313		FILE *fin;
314		{
315		register int i;
316	<	register FUNARGS *fa;
316	>	int resetarr = 0;
317	>	FUNARGS fa;
318
319	<	if ((fa = getfargs(fin)) == NULL)
319	>	if (readfargs(&fa, fin) != 1)
320		return(-1);
321		/* string arguments */
322	<	printf("%d", fa->nsargs + xac-xfa);
323	<	for (i = 0; i < fa->nsargs; i++)
324	<	printf(" %s", fa->sarg[i]);
322	>	if (xac > xfa && strcmp(xav[xfa], "-i"))
323	>	resetarr = 2;
324	>	printf("%d", fa.nsargs + resetarr + xac-xfa);
325	>	for (i = 0; i < fa.nsargs; i++)
326	>	printf(" %s", fa.sarg[i]);
327	>	if (resetarr)
328	>	printf(" -i 1");
329		for (i = xfa; i < xac; i++) /* add xf arguments */
330		printf(" %s", xav[i]);
331		printf("\n");
332	+	#ifdef IARGS
333		/* integer arguments */
334	<	printf("%d", fa->niargs);
335	<	for (i = 0; i < fa->niargs; i++)
336	<	printf(" %d", fa->iarg[i]);
334	>	printf("%d", fa.niargs);
335	>	for (i = 0; i < fa.niargs; i++)
336	>	printf(" %d", fa.iarg[i]);
337		printf("\n");
338	+	#else
339	+	printf("0\n");
340	+	#endif
341		/* float arguments */
342	<	printf("%d", fa->nfargs);
343	<	for (i = 0; i < fa->nfargs; i++)
344	<	printf(" %18.12g", fa->farg[i]);
342	>	printf("%d", fa.nfargs);
343	>	for (i = 0; i < fa.nfargs; i++)
344	>	printf(" %18.12g", fa.farg[i]);
345		printf("\n");
346	<	freefargs(fa);
346	>	freefargs(&fa);
347		return(0);
348		}
349
#	Line 333 \| Line 365 \| *register char ofname;**
365		alias(fin) /* transfer alias */
366		FILE *fin;
367		{
368	<	char alias[MAXSTR];
368	>	char aliasnm[MAXSTR];
369
370	<	if (fscanf(fin, "%s", alias) != 1)
370	>	if (fgetword(aliasnm, MAXSTR, fin) == NULL)
371		return(-1);
372	<	printf("\t%s\n", alias);
372	>	printf("\t%s\n", aliasnm);
373		return(0);
374		}
375
#	Line 345 \| Line 377 \| *FILE fin;**
377		m_glow(fin) /* transform arguments for proximity light */
378		FILE *fin;
379		{
380	<	register FUNARGS *fa;
380	>	FUNARGS fa;
381
382	<	if ((fa = getfargs(fin)) == NULL)
382	>	if (readfargs(&fa, fin) != 1)
383		return(-1);
384	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 4)
384	>	if (fa.nsargs != 0 \|\| fa.nfargs != 4)
385		return(-1);
386		printf("0\n0\n4");
387		printf(" %18.12g %18.12g %18.12g",
388	<	fa->farg[0], fa->farg[1], fa->farg[2]);
389	<	printf(" %18.12g\n", fa->farg[3] * totscale);
390	<	freefargs(fa);
388	>	fa.farg[0], fa.farg[1], fa.farg[2]);
389	>	printf(" %18.12g\n", fa.farg[3] * tot.sca);
390	>	freefargs(&fa);
391		return(0);
392		}
393
#	Line 363 \| Line 395 \| *FILE fin;**
395		m_spot(fin) /* transform arguments for spotlight */
396		FILE *fin;
397		{
398	<	double v[3];
399	<	register FUNARGS *fa;
398	>	FVECT v;
399	>	FUNARGS fa;
400
401	<	if ((fa = getfargs(fin)) == NULL)
401	>	if (readfargs(&fa, fin) != 1)
402		return(-1);
403	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 7)
403	>	if (fa.nsargs != 0 \|\| fa.nfargs != 7)
404		return(-1);
405		printf("0\n0\n7");
406		printf(" %18.12g %18.12g %18.12g %18.12g\n",
407	<	fa->farg[0], fa->farg[1], fa->farg[2], fa->farg[3]);
408	<	multv3(v, fa->farg+4, totxform);
407	>	fa.farg[0], fa.farg[1], fa.farg[2], fa.farg[3]);
408	>	multv3(v, fa.farg+4, tot.xfm);
409		printf("\t%18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
410	<	freefargs(fa);
410	>	freefargs(&fa);
411		return(0);
412		}
413
414
415	+	m_mist(fin) /* transform arguments for mist */
416	+	FILE *fin;
417	+	{
418	+	FUNARGS fa;
419	+	int i;
420	+
421	+	if (readfargs(&fa, fin) != 1)
422	+	return(-1);
423	+	if (fa.nfargs > 7)
424	+	return(-1);
425	+	printf("%d", fa.nsargs);
426	+	if (idprefix == NULL)
427	+	for (i = 0; i < fa.nsargs; i++)
428	+	printf(" %s", fa.sarg[i]);
429	+	else
430	+	for (i = 0; i < fa.nsargs; i++) {
431	+	char sname[256], *sp;
432	+	register char cp1, cp2 = sname;
433	+	/* add idprefix */
434	+	for (sp = fa.sarg[i]; *sp; sp = cp1) {
435	+	for (cp1 = idprefix; *cp1; )
436	+	cp2++ = cp1++;
437	+	*cp2++ = '.';
438	+	for (cp1 = sp; *cp1 &&
439	+	(cp2++ = cp1++) != '>'; )
440	+	;
441	+	}
442	+	*cp2 = '\0';
443	+	printf(" %s", sname);
444	+	}
445	+	printf("\n0\n%d", fa.nfargs);
446	+	if (fa.nfargs > 2)
447	+	printf(" %12.6g %12.6g %12.6g", fa.farg[0]/tot.sca,
448	+	fa.farg[1]/tot.sca, fa.farg[2]/tot.sca);
449	+	for (i = 3; i < fa.nfargs; i++)
450	+	printf(" %12.6g", fa.farg[i]);
451	+	printf("\n");
452	+	freefargs(&fa);
453	+	return(0);
454	+	}
455	+
456	+
457		m_dielectric(fin) /* transform arguments for dielectric */
458		FILE *fin;
459		{
460	<	double pow();
387	<	register FUNARGS *fa;
460	>	FUNARGS fa;
461
462	<	if ((fa = getfargs(fin)) == NULL)
462	>	if (readfargs(&fa, fin) != 1)
463		return(-1);
464	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 5)
464	>	if (fa.nsargs != 0 \|\| fa.nfargs != 5)
465		return(-1);
466		printf("0\n0\n5");
467	<	printf(" %18.12g %18.12g %18.12g",
468	<	pow(fa->farg[0], 1.0/totscale),
469	<	pow(fa->farg[1], 1.0/totscale),
470	<	pow(fa->farg[2], 1.0/totscale));
471	<	printf(" %18.12g %18.12g\n", fa->farg[3], fa->farg[4]);
472	<	freefargs(fa);
467	>	printf(" %12.6g %12.6g %12.6g",
468	>	pow(fa.farg[0], 1.0/tot.sca),
469	>	pow(fa.farg[1], 1.0/tot.sca),
470	>	pow(fa.farg[2], 1.0/tot.sca));
471	>	printf(" %12.6g %12.6g\n", fa.farg[3], fa.farg[4]);
472	>	freefargs(&fa);
473		return(0);
474		}
475
#	Line 404 \| Line 477 \| *FILE fin;**
477		m_interface(fin) /* transform arguments for interface */
478		FILE *fin;
479		{
480	<	double pow();
408	<	register FUNARGS *fa;
480	>	FUNARGS fa;
481
482	<	if ((fa = getfargs(fin)) == NULL)
482	>	if (readfargs(&fa, fin) != 1)
483		return(-1);
484	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 8)
484	>	if (fa.nsargs != 0 \|\| fa.nfargs != 8)
485		return(-1);
486		printf("0\n0\n8\n");
487	<	printf("%18.12g %18.12g %18.12g",
488	<	pow(fa->farg[0], 1.0/totscale),
489	<	pow(fa->farg[1], 1.0/totscale),
490	<	pow(fa->farg[2], 1.0/totscale));
491	<	printf(" %18.12g\n", fa->farg[3]);
492	<	printf("%18.12g %18.12g %18.12g",
493	<	pow(fa->farg[4], 1.0/totscale),
494	<	pow(fa->farg[5], 1.0/totscale),
495	<	pow(fa->farg[6], 1.0/totscale));
496	<	printf(" %18.12g\n", fa->farg[7]);
497	<	freefargs(fa);
487	>	printf("%12.6g %12.6g %12.6g",
488	>	pow(fa.farg[0], 1.0/tot.sca),
489	>	pow(fa.farg[1], 1.0/tot.sca),
490	>	pow(fa.farg[2], 1.0/tot.sca));
491	>	printf(" %12.6g\n", fa.farg[3]);
492	>	printf("%12.6g %12.6g %12.6g",
493	>	pow(fa.farg[4], 1.0/tot.sca),
494	>	pow(fa.farg[5], 1.0/tot.sca),
495	>	pow(fa.farg[6], 1.0/tot.sca));
496	>	printf(" %12.6g\n", fa.farg[7]);
497	>	freefargs(&fa);
498		return(0);
499		}
500
#	Line 431 \| Line 503 \| *text(fin) / transform text arguments /*
503		FILE *fin;
504		{
505		int i;
506	<	double v[3];
507	<	register FUNARGS *fa;
506	>	FVECT v;
507	>	FUNARGS fa;
508
509	<	if ((fa = getfargs(fin)) == NULL)
509	>	if (readfargs(&fa, fin) != 1)
510		return(-1);
511	<	if (fa->niargs != 0 \|\| (fa->nfargs != 9 &&
440	<	fa->nfargs != 11 && fa->nfargs != 15))
511	>	if (fa.nfargs < 9)
512		return(-1);
513		/* string arguments */
514	<	printf("%d", fa->nsargs);
515	<	for (i = 0; i < fa->nsargs; i++)
516	<	printf(" %s", fa->sarg[i]);
517	<	printf("\n0\n%d\n", fa->nfargs);
514	>	printf("%d", fa.nsargs);
515	>	for (i = 0; i < fa.nsargs; i++)
516	>	printf(" %s", fa.sarg[i]);
517	>	printf("\n0\n%d\n", fa.nfargs);
518		/* anchor point */
519	<	multp3(v, fa->farg, totxform);
519	>	multp3(v, fa.farg, tot.xfm);
520		printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
521		/* right vector */
522	<	multv3(v, fa->farg+3, totxform);
522	>	multv3(v, fa.farg+3, tot.xfm);
523		printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
524		/* down vector */
525	<	multv3(v, fa->farg+6, totxform);
526	<	printf(" %18.12g %18.12g %18.12g\n", v[0], v[1], v[2]);
527	<	/* forground and background */
528	<	if (fa->nfargs == 11)
529	<	printf(" %18.12g %18.12g\n", fa->farg[9], fa->farg[10]);
530	<	else if (fa->nfargs == 15) {
531	<	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]);
525	>	multv3(v, fa.farg+6, tot.xfm);
526	>	printf(" %18.12g %18.12g %18.12g", v[0], v[1], v[2]);
527	>	/* remaining arguments */
528	>	for (i = 9; i < fa.nfargs; i++) {
529	>	if (i%3 == 0)
530	>	putchar('\n');
531	>	printf(" %18.12g", fa.farg[i]);
532		}
533	<	freefargs(fa);
533	>	putchar('\n');
534	>	freefargs(&fa);
535		return(0);
536		}
537
#	Line 470 \| Line 539 \| *FILE fin;**
539		o_source(fin) /* transform source arguments */
540		FILE *fin;
541		{
542	<	double dv[3];
543	<	register FUNARGS *fa;
542	>	FVECT dv;
543	>	FUNARGS fa;
544
545	<	if ((fa = getfargs(fin)) == NULL)
545	>	if (readfargs(&fa, fin) != 1)
546		return(-1);
547	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 4)
547	>	if (fa.nsargs != 0 \|\| fa.nfargs != 4)
548		return(-1);
549		/* transform direction vector */
550	<	multv3(dv, fa->farg, totxform);
550	>	multv3(dv, fa.farg, tot.xfm);
551		/* output */
552		printf("0\n0\n4");
553		printf(" %18.12g %18.12g %18.12g %18.12g\n",
554	<	dv[0], dv[1], dv[2], fa->farg[3]);
555	<	freefargs(fa);
554	>	dv[0], dv[1], dv[2], fa.farg[3]);
555	>	freefargs(&fa);
556		return(0);
557		}
558
#	Line 491 \| Line 560 \| *FILE fin;**
560		o_sphere(fin) /* transform sphere arguments */
561		FILE *fin;
562		{
563	<	double cent[3], rad;
564	<	register FUNARGS *fa;
563	>	FVECT cent;
564	>	double rad;
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 != 4)
569	>	if (fa.nsargs != 0 \|\| fa.nfargs != 4)
570		return(-1);
571
572	<	multp3(cent, fa->farg, totxform); /* transform center */
572	>	multp3(cent, fa.farg, tot.xfm); /* transform center */
573
574	<	rad = fa->farg[3] * totscale; /* scale radius */
574	>	rad = fa.farg[3] * tot.sca; /* scale radius */
575
576		printf("0\n0\n4");
577		printf(" %18.12g %18.12g %18.12g %18.12g\n",
578		cent[0], cent[1], cent[2], rad);
579	<	freefargs(fa);
579	>	freefargs(&fa);
580		return(0);
581		}
582
#	Line 514 \| Line 584 \| *FILE fin;**
584		o_face(fin) /* transform face arguments */
585		FILE *fin;
586		{
587	<	double p[3];
587	>	FVECT p;
588		register int i;
589	<	register FUNARGS *fa;
589	>	FUNARGS fa;
590
591	<	if ((fa = getfargs(fin)) == NULL)
591	>	if (readfargs(&fa, fin) != 1)
592		return(-1);
593	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs % 3)
593	>	if (fa.nsargs != 0 \|\| fa.nfargs % 3)
594		return(-1);
595
596	<	printf("0\n0\n%d\n", fa->nfargs);
596	>	printf("0\n0\n%d\n", fa.nfargs);
597
598	<	for (i = 0; i < fa->nfargs; i += 3) {
598	>	for (i = 0; i < fa.nfargs; i += 3) {
599		if (reverse)
600	<	multp3(p, fa->farg+(fa->nfargs-i-3), totxform);
600	>	multp3(p, fa.farg+(fa.nfargs-i-3), tot.xfm);
601		else
602	<	multp3(p, fa->farg+i, totxform);
602	>	multp3(p, fa.farg+i, tot.xfm);
603		printf(" %18.12g %18.12g %18.12g\n", p[0], p[1], p[2]);
604		}
605	<	freefargs(fa);
605	>	freefargs(&fa);
606		return(0);
607		}
608
#	Line 540 \| Line 610 \| *FILE fin;**
610		o_cone(fin) /* transform cone and cup arguments */
611		FILE *fin;
612		{
613	<	double p0[3], p1[3], r0, r1;
614	<	register FUNARGS *fa;
613	>	FVECT p0, p1;
614	>	double r0, r1;
615	>	FUNARGS fa;
616
617	<	if ((fa = getfargs(fin)) == NULL)
617	>	if (readfargs(&fa, fin) != 1)
618		return(-1);
619	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 8)
619	>	if (fa.nsargs != 0 \|\| fa.nfargs != 8)
620		return(-1);
621
622		printf("0\n0\n8\n");
623
624	<	multp3(p0, fa->farg, totxform);
625	<	multp3(p1, fa->farg+3, totxform);
626	<	r0 = fa->farg[6] * totscale;
627	<	r1 = fa->farg[7] * totscale;
624	>	multp3(p0, fa.farg, tot.xfm);
625	>	multp3(p1, fa.farg+3, tot.xfm);
626	>	r0 = fa.farg[6] * tot.sca;
627	>	r1 = fa.farg[7] * tot.sca;
628		printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
629		printf(" %18.12g %18.12g %18.12g\n", p1[0], p1[1], p1[2]);
630		printf(" %18.12g %18.12g\n", r0, r1);
631
632	<	freefargs(fa);
632	>	freefargs(&fa);
633		return(0);
634		}
635
#	Line 566 \| Line 637 \| *FILE fin;**
637		o_cylinder(fin) /* transform cylinder and tube arguments */
638		FILE *fin;
639		{
640	<	double p0[3], p1[3], rad;
641	<	register FUNARGS *fa;
640	>	FVECT p0, p1;
641	>	double rad;
642	>	FUNARGS fa;
643
644	<	if ((fa = getfargs(fin)) == NULL)
644	>	if (readfargs(&fa, fin) != 1)
645		return(-1);
646	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 7)
646	>	if (fa.nsargs != 0 \|\| fa.nfargs != 7)
647		return(-1);
648
649		printf("0\n0\n7\n");
650
651	<	multp3(p0, fa->farg, totxform);
652	<	multp3(p1, fa->farg+3, totxform);
653	<	rad = fa->farg[6] * totscale;
651	>	multp3(p0, fa.farg, tot.xfm);
652	>	multp3(p1, fa.farg+3, tot.xfm);
653	>	rad = fa.farg[6] * tot.sca;
654		printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
655		printf(" %18.12g %18.12g %18.12g\n", p1[0], p1[1], p1[2]);
656		printf(" %18.12g\n", rad);
657	<	freefargs(fa);
657	>	freefargs(&fa);
658		return(0);
659		}
660
#	Line 590 \| Line 662 \| *FILE fin;**
662		o_ring(fin) /* transform ring arguments */
663		FILE *fin;
664		{
665	<	double p0[3], pd[3], r0, r1;
666	<	register FUNARGS *fa;
665	>	FVECT p0, pd;
666	>	double r0, r1;
667	>	FUNARGS fa;
668
669	<	if ((fa = getfargs(fin)) == NULL)
669	>	if (readfargs(&fa, fin) != 1)
670		return(-1);
671	<	if (fa->nsargs != 0 \|\| fa->niargs != 0 \|\| fa->nfargs != 8)
671	>	if (fa.nsargs != 0 \|\| fa.nfargs != 8)
672		return(-1);
673
674		printf("0\n0\n8\n");
675
676	<	multp3(p0, fa->farg, totxform);
677	<	multv3(pd, fa->farg+3, totxform);
678	<	r0 = fa->farg[6] * totscale;
679	<	r1 = fa->farg[7] * totscale;
676	>	multp3(p0, fa.farg, tot.xfm);
677	>	multv3(pd, fa.farg+3, tot.xfm);
678	>	if (invert) {
679	>	pd[0] = -pd[0];
680	>	pd[1] = -pd[1];
681	>	pd[2] = -pd[2];
682	>	}
683	>	r0 = fa.farg[6] * tot.sca;
684	>	r1 = fa.farg[7] * tot.sca;
685		printf(" %18.12g %18.12g %18.12g\n", p0[0], p0[1], p0[2]);
686		printf(" %18.12g %18.12g %18.12g\n", pd[0], pd[1], pd[2]);
687		printf(" %18.12g %18.12g\n", r0, r1);
688	<	freefargs(fa);
688	>	freefargs(&fa);
689		return(0);
690		}
691
692
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	–
693		initotypes() /* initialize ofun[] array */
694		{
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();
695		register int i;
696
697		if (ofun[OBJ_SOURCE].funp == o_source)
#	Line 727 \| Line 718 \| *initotypes() / initialize ofun[] array /*
718		ofun[MAT_SPOT].funp = m_spot;
719		ofun[MAT_DIELECTRIC].funp = m_dielectric;
720		ofun[MAT_INTERFACE].funp = m_interface;
721	+	ofun[MAT_MIST].funp = m_mist;
722		ofun[PAT_CTEXT].funp =
723		ofun[PAT_BTEXT].funp =
724		ofun[MIX_TEXT].funp = text;
725		ofun[ALIAS].funp = alias;
726	+	/* surface inverses */
727	+	tinvers[OBJ_FACE] = OBJ_FACE;
728	+	tinvers[OBJ_SOURCE] = OBJ_SOURCE;
729	+	tinvers[OBJ_CONE] = OBJ_CUP;
730	+	tinvers[OBJ_CUP] = OBJ_CONE;
731	+	tinvers[OBJ_SPHERE] = OBJ_BUBBLE;
732	+	tinvers[OBJ_BUBBLE] = OBJ_SPHERE;
733	+	tinvers[OBJ_RING] = OBJ_RING;
734	+	tinvers[OBJ_CYLINDER] = OBJ_TUBE;
735	+	tinvers[OBJ_TUBE] = OBJ_CYLINDER;
736	+	tinvers[OBJ_INSTANCE] = OBJ_INSTANCE; /* oh, well */
737		}
738	+
739	+
740	+	#ifdef OLDXFORM
741	+	openmain(fname)
742	+	char *fname;
743	+	{
744	+	if (fname == NULL) {
745	+	strcpy(mainfn, "standard input");
746	+	mainfp = stdin;
747	+	return;
748	+	}
749	+	if (mainfp != NULL) {
750	+	if (!strcmp(fname, mainfn)) {
751	+	rewind(mainfp);
752	+	return;
753	+	}
754	+	fclose(mainfp);
755	+	}
756	+	if ((mainfp = fopen(fname, "r")) == NULL) {
757	+	fprintf(stderr, "%s: cannot open file \"%s\"\n",
758	+	progname, fname);
759	+	exit(1);
760	+	}
761	+	strcpy(mainfn, fname);
762	+	}
763	+	#else
764	+	openmain(fname) /* open fname for input, changing to its directory */
765	+	char *fname;
766	+	{
767	+	extern FILE *tmpfile();
768	+	extern char getlibpath(), getpath();
769	+	static char origdir[MAXPATH];
770	+	static char curfn[MAXPATH];
771	+	static int diffdir;
772	+	register char *fpath;
773	+
774	+	if (fname == NULL) { /* standard input */
775	+	if (mainfp == NULL) {
776	+	register int c;
777	+	strcpy(mainfn, "standard input");
778	+	if (nrept <= 1) {
779	+	mainfp = stdin;
780	+	return; /* just read once */
781	+	}
782	+	/* else copy */
783	+	if ((mainfp = tmpfile()) == NULL) {
784	+	fprintf(stderr,
785	+	"%s: cannot create temporary file\n",
786	+	progname);
787	+	exit(1);
788	+	}
789	+	while ((c = getc(stdin)) != EOF)
790	+	putc(c, mainfp);
791	+	fclose(stdin);
792	+	}
793	+	rewind(mainfp); /* rewind copy */
794	+	return;
795	+	}
796	+	if (mainfp == NULL) { /* first call, initialize */
797	+	getwd(origdir);
798	+	} else if (!strcmp(fname, curfn)) { /* just need to rewind? */
799	+	rewind(mainfp);
800	+	return;
801	+	} else { /* else close old stream */
802	+	fclose(mainfp);
803	+	if (diffdir) {
804	+	chdir(origdir);
805	+	diffdir = 0;
806	+	}
807	+	}
808	+	strcpy(curfn, fname); /* remember file name */
809	+	/* get full path */
810	+	if ((fpath = getpath(fname, getlibpath(), R_OK)) == NULL) {
811	+	fprintf(stderr, "%s: cannot find file \"%s\"\n",
812	+	progname, fname);
813	+	exit(1);
814	+	}
815	+	if (fpath[0] == '.' && ISDIRSEP(fpath[1])) /* remove leading ./ */
816	+	fpath += 2;
817	+	/* record path name */
818	+	strcpy(mainfn, fpath);
819	+	if (expand) { /* change to local directory */
820	+	register char cp = fpath + strlen(fpath); / get dir. */
821	+	while (cp > fpath) {
822	+	cp--;
823	+	if (ISDIRSEP(*cp)) {
824	+	if (cp == fpath)
825	+	cp++; /* root special case */
826	+	break;
827	+	}
828	+	}
829	+	*cp = '\0';
830	+	if (fpath[0]) { /* change to new directory? */
831	+	if (chdir(fpath) < 0) {
832	+	fprintf(stderr,
833	+	"%s: cannot change directory to \"%s\"\n",
834	+	progname, fpath);
835	+	exit(1);
836	+	}
837	+	diffdir++;
838	+	}
839	+	/* get final path component */
840	+	for (fpath = fname+strlen(fname);
841	+	fpath > fname && !ISDIRSEP(fpath[-1]); fpath--)
842	+	;
843	+	}
844	+	/* open the file */
845	+	if ((mainfp = fopen(fpath, "r")) == NULL) {
846	+	fprintf(stderr, "%s: cannot open file \"%s\"\n",
847	+	progname, mainfn);
848	+	exit(1);
849	+	}
850	+	}
851	+	#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.15 by gregl, Fri May 30 18:24:32 1997 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.15 by gregl, Fri May 30 18:24:32 1997 UTC