ViewVC Help

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

root/Development/ray/src/rt/func.c

Comparing ray/src/rt/func.c (file contents):
Revision 1.9 by greg, Thu Jul 19 11:17:12 1990 UTC vs.
Revision 1.11 by greg, Wed Dec 12 21:57:50 1990 UTC

#	Line 89 | Line 89 | RAY  *r;
89		return;
90		memerr:
91		error(SYSTEM, "out of memory in setfunc");
92	–	#undef  mxf
92		}
93
94
#	Line 133 | Line 132 | register int  n;
132		double  sum;
133		register RAY  *r;
134
135	<	n--;                            /* for convenience */
135	>	if (--n < 0)
136	>	goto badchan;
137
138	–	if (n < 0 || n > 23)
139	–	error(USER, "illegal channel number");
140	–
141	–	if (n == 9) {                   /* distance */
142	–
143	–	sum = fray->rot;
144	–	for (r = fray->parent; r != NULL; r = r->parent)
145	–	sum += r->rot;
146	–	return(sum * fxf.sca);
147	–
148	–	}
149	–	if (n == 10)                    /* dot product */
150	–	return(fray->rod);
151	–
138		if (n < 3)                      /* ray direction */
139
140		return( (       fray->rdir[0]*fxf.xfm[0][n] +
#	Line 170 | Line 156 | register int  n;
156		fray->rop[2]*fxf.xfm[2][n-6] +
157		fxf.xfm[3][n-6] );
158
159	+	if (n == 9) {                   /* distance */
160	+
161	+	sum = fray->rot;
162	+	for (r = fray->parent; r != NULL; r = r->parent)
163	+	sum += r->rot;
164	+	return(sum * fxf.sca);
165	+
166	+	}
167	+	if (n == 10)                    /* dot product */
168	+	return(fray->rod);
169	+
170		if (n == 11)                    /* scale */
171		return(fxf.sca);
172
#	Line 184 | Line 181 | register int  n;
181
182		if (n < 24)                     /* k unit vector */
183		return(fxf.xfm[2][n-21] / fxf.sca);
184	+	badchan:
185	+	error(USER, "illegal channel number");
186		}

Diff Legend

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