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 2.43 by greg, Tue Apr 22 17:12:25 2025 UTC vs.
Revision 2.46 by greg, Sat Dec 6 04:13:14 2025 UTC

#	Line 60 | Line 60 | initfunc(void) /* initialize function evaluation */
60		setprismfuncs();
61		loadfunc(rayinitcal);
62		rayinitcal[0] = '\0';
63	+	doptimize(1);           /* optimize definitions */
64		}
65
66
#	Line 161 | Line 162 | getfunc(       /* get function for this modifier */
162		goto toofew;
163		if (i <= ff)                    /* find transform args */
164		i = ff+1;
165	<	while (i < na && arg[i][0] != '-')
165	>	while (i < na && !isxfopt(arg[i]))
166		i++;
167		if (i == na) {                  /* no transform */
168		f->fxp = f->bxp = &unitxf;
#	Line 285 | Line 286 | loadfunc(                      /* load definition file */
286		error(SYSTEM, errmsg);
287		}
288		fcompile(ffname);
288	–	doptimize(1);           /* optimize definitions */
289		}
290
291
#	Line 336 | Line 336 | chanvalue(                     /* return channel n to calcomp */
336		if (--n < 0)
337		goto badchan;
338
339	<	if (n <= 2)                     /* ray direction */
339	>	if (n < 3)                      /* ray direction */
340
341		return( (       fray->rdir[0]*funcxf.xfm[0][n] +
342		fray->rdir[1]*funcxf.xfm[1][n] +
343		fray->rdir[2]*funcxf.xfm[2][n]  )
344		/ funcxf.sca );
345
346	<	if (n <= 5)                     /* surface normal */
346	>	if (n < 6)                      /* surface normal */
347
348		return( (       fray->ron[0]*funcxf.xfm[0][n-3] +
349		fray->ron[1]*funcxf.xfm[1][n-3] +
350		fray->ron[2]*funcxf.xfm[2][n-3] )
351		/ funcxf.sca );
352
353	<	if (n <= 8) {                   /* intersection point */
354	<	if (fray->rot >= FHUGE*.99)
355	<	return(0.0);    /* XXX should be runtime error? */
353	>	if (n < 9)                      /* intersection point */
354
355		return( fray->rop[0]*funcxf.xfm[0][n-6] +
356		fray->rop[1]*funcxf.xfm[1][n-6] +
357		fray->rop[2]*funcxf.xfm[2][n-6] +
358		funcxf.xfm[3][n-6] );
361	–	}
359
360		if (n == 9)                     /* total distance */
361		return(raydist(fray,PRIMARY) * funcxf.sca);
#	Line 371 | Line 368 | chanvalue(                     /* return channel n to calcomp */
368		if (n == 11)                    /* scale */
369		return(funcxf.sca);
370
371	<	if (n <= 14)                    /* origin */
371	>	if (n < 15)                     /* origin */
372		return(funcxf.xfm[3][n-12]);
373
374	<	if (n <= 17)                    /* i unit vector */
374	>	if (n < 18)                     /* i unit vector */
375		return(funcxf.xfm[0][n-15] / funcxf.sca);
376
377	<	if (n <= 20)                    /* j unit vector */
377	>	if (n < 21)                     /* j unit vector */
378		return(funcxf.xfm[1][n-18] / funcxf.sca);
379
380	<	if (n <= 23)                    /* k unit vector */
380	>	if (n < 24)                     /* k unit vector */
381		return(funcxf.xfm[2][n-21] / funcxf.sca);
382
383		if (n == 24)                    /* single ray (shadow) distance */
384		return((fray->rot+raydist(fray->parent,SHADOW)) * funcxf.sca);
385
386	<	if (n <= 26)                    /* local (u,v) coordinates */
386	>	if (n < 27)                     /* local (u,v) coordinates */
387		return(fray->uv[n-25]);
388		badchan:
389		error(USER, "illegal channel number");

Diff Legend

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