ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/gen/xform.c

Comparing ray/src/gen/xform.c (file contents):
Revision 1.16 by greg, Tue Oct 22 13:32:58 1991 UTC vs.
Revision 2.3 by greg, Thu Mar 12 11:43:58 1992 UTC

#	Line 248 | Line 248 | FILE  *fin;
248		progname, fname, typ);
249		exit(1);
250		}
251	<	if (issurface(fn))
251	>	if (ismodifier(fn))
252	>	printf("\n%s %s ", nam, typ);
253	>	else
254		printf("\n%s %s ", newmod != NULL ? newmod : nam,
255		invert ? ofun[tinvers[fn]].funame : typ);
254	–	else
255	–	printf("\n%s %s ", nam, typ);
256		/* object name */
257		fgetword(nam, sizeof(nam), fin);
258	<	if (idprefix != NULL && issurface(fn))
259	<	printf("%s.%s\n", idprefix, nam);
260	<	else
258	>	if (idprefix == NULL || ismodifier(fn))
259		printf("%s\n", nam);
260	+	else
261	+	printf("%s.%s\n", idprefix, nam);
262		/* transform arguments */
263		if ((*ofun[fn].funp)(fin) < 0) {
264		fprintf(stderr, "%s: (%s): bad %s \"%s\"\n",
#	Line 304 | Line 304 | addxform(fin)                  /* add xf arguments to strings */
304		FILE  *fin;
305		{
306		register int  i;
307	+	int  resetarr = 0;
308		FUNARGS  fa;
309
310		if (readfargs(&fa, fin) != 1)
311		return(-1);
312		/* string arguments */
313	<	printf("%d", fa.nsargs + xac-xfa);
313	>	if (xac > xfa && strcmp(xav[xfa], "-i"))
314	>	resetarr = 2;
315	>	printf("%d", fa.nsargs + resetarr + xac-xfa);
316		for (i = 0; i < fa.nsargs; i++)
317		printf(" %s", fa.sarg[i]);
318	+	if (resetarr)
319	+	printf(" -i 1");
320		for (i = xfa; i < xac; i++)     /* add xf arguments */
321		printf(" %s", xav[i]);
322		printf("\n");
#	Line 381 | Line 386 | FILE  *fin;
386		m_spot(fin)                     /* transform arguments for spotlight */
387		FILE  *fin;
388		{
389	<	double  v[3];
389	>	FVECT  v;
390		FUNARGS  fa;
391
392		if (readfargs(&fa, fin) != 1)
#	Line 449 | Line 454 | text(fin)                      /* transform text arguments */
454		FILE  *fin;
455		{
456		int  i;
457	<	double  v[3];
457	>	FVECT  v;
458		FUNARGS  fa;
459
460		if (readfargs(&fa, fin) != 1)
#	Line 487 | Line 492 | FILE  *fin;
492		o_source(fin)                   /* transform source arguments */
493		FILE  *fin;
494		{
495	<	double  dv[3];
495	>	FVECT  dv;
496		FUNARGS  fa;
497
498		if (readfargs(&fa, fin) != 1)
#	Line 508 | Line 513 | FILE  *fin;
513		o_sphere(fin)                   /* transform sphere arguments */
514		FILE  *fin;
515		{
516	<	double  cent[3], rad;
516	>	FVECT  cent;
517	>	double  rad;
518		FUNARGS  fa;
519
520		if (readfargs(&fa, fin) != 1)
#	Line 531 | Line 537 | FILE  *fin;
537		o_face(fin)                     /* transform face arguments */
538		FILE  *fin;
539		{
540	<	double  p[3];
540	>	FVECT  p;
541		register int  i;
542		FUNARGS  fa;
543
#	Line 557 | Line 563 | FILE  *fin;
563		o_cone(fin)                     /* transform cone and cup arguments */
564		FILE  *fin;
565		{
566	<	double  p0[3], p1[3], r0, r1;
566	>	FVECT  p0, p1;
567	>	double  r0, r1;
568		FUNARGS  fa;
569
570		if (readfargs(&fa, fin) != 1)
#	Line 583 | Line 590 | FILE  *fin;
590		o_cylinder(fin)                 /* transform cylinder and tube arguments */
591		FILE  *fin;
592		{
593	<	double  p0[3], p1[3], rad;
593	>	FVECT  p0, p1;
594	>	double  rad;
595		FUNARGS  fa;
596
597		if (readfargs(&fa, fin) != 1)
#	Line 607 | Line 615 | FILE  *fin;
615		o_ring(fin)                     /* transform ring arguments */
616		FILE  *fin;
617		{
618	<	double  p0[3], pd[3], r0, r1;
618	>	FVECT  p0, pd;
619	>	double  r0, r1;
620		FUNARGS  fa;
621
622		if (readfargs(&fa, fin) != 1)

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)