ViewVC Help

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

root/Development/ray/src/common/calfunc.c

Comparing ray/src/common/calfunc.c (file contents):
Revision 2.11 by schorsch, Sat Jun 7 12:50:20 2003 UTC vs.
Revision 2.14 by schorsch, Fri Nov 14 17:22:06 2003 UTC

#	Line 17 | Line 17 | static const char      RCSid[] = "$Id$";
17		#include  <errno.h>
18		#include  <math.h>
19
20	+	#include  "rterror.h"
21		#include  "calcomp.h"
22
23		/* bits in argument flag (better be right!) */
#	Line 33 | Line 34 | typedef struct activation {
34
35		static ACTIVATION  *curact = NULL;
36
37	<	static double  libfunc();
37	>	static double  libfunc(char *fname, VARDEF *vp);
38
39		#ifndef  MAXLIB
40		#define  MAXLIB         64      /* maximum number of library functions */
41		#endif
42
43	<	static double  l_if(), l_select(), l_rand();
44	<	static double  l_floor(), l_ceil();
45	<	static double  l_sqrt();
46	<	static double  l_sin(), l_cos(), l_tan();
47	<	static double  l_asin(), l_acos(), l_atan(), l_atan2();
48	<	static double  l_exp(), l_log(), l_log10();
43	>	static double  l_if(char *), l_select(char *), l_rand(char *);
44	>	static double  l_floor(char *), l_ceil(char *);
45	>	static double  l_sqrt(char *);
46	>	static double  l_sin(char *), l_cos(char *), l_tan(char *);
47	>	static double  l_asin(char *), l_acos(char *), l_atan(char *), l_atan2(char *);
48	>	static double  l_exp(char *), l_log(char *), l_log10(char *);
49
50		/* functions must be listed alphabetically */
51		static LIBR  library[MAXLIB] = {
#	Line 124 | Line 125 | funset(fname, nargs, assign, fptr)     /* set a library fu
125		char  *fname;
126		int  nargs;
127		int  assign;
128	<	double  (*fptr)();
128	>	double  (*fptr)(char *);
129		{
130		int  oldlibsize = libsize;
131		char *cp;
#	Line 192 | Line 193 | argument(n)                    /* return nth argument for active functi
193		register int  n;
194		{
195		register ACTIVATION  *actp = curact;
196	<	register EPNODE  *ep;
196	>	register EPNODE  *ep = NULL;
197		double  aval;
198
199		if (actp == NULL || --n < 0) {
#	Line 371 | Line 372 | VARDEF  *vp;
372
373
374		static double
375	<	l_if()                  /* if(cond, then, else) conditional expression */
375	>	l_if(char *nm)          /* if(cond, then, else) conditional expression */
376		/* cond evaluates true if greater than zero */
377		{
378		if (argument(1) > 0.0)
#	Line 382 | Line 383 | l_if()                 /* if(cond, then, else) conditional expressio
383
384
385		static double
386	<	l_select()              /* return argument #(A1+1) */
386	>	l_select(char *nm)      /* return argument #(A1+1) */
387		{
388		register int  n;
389
#	Line 398 | Line 399 | l_select()             /* return argument #(A1+1) */
399
400
401		static double
402	<	l_rand()                /* random function between 0 and 1 */
402	>	l_rand(char *nm)                /* random function between 0 and 1 */
403		{
404		double  x;
405
#	Line 411 | Line 412 | l_rand()               /* random function between 0 and 1 */
412
413
414		static double
415	<	l_floor()               /* return largest integer not greater than arg1 */
415	>	l_floor(char *nm)               /* return largest integer not greater than arg1 */
416		{
417		return(floor(argument(1)));
418		}
419
420
421		static double
422	<	l_ceil()                /* return smallest integer not less than arg1 */
422	>	l_ceil(char *nm)                /* return smallest integer not less than arg1 */
423		{
424		return(ceil(argument(1)));
425		}
426
427
428		static double
429	<	l_sqrt()
429	>	l_sqrt(char *nm)
430		{
431		return(sqrt(argument(1)));
432		}
433
434
435		static double
436	<	l_sin()
436	>	l_sin(char *nm)
437		{
438		return(sin(argument(1)));
439		}
440
441
442		static double
443	<	l_cos()
443	>	l_cos(char *nm)
444		{
445		return(cos(argument(1)));
446		}
447
448
449		static double
450	<	l_tan()
450	>	l_tan(char *nm)
451		{
452		return(tan(argument(1)));
453		}
454
455
456		static double
457	<	l_asin()
457	>	l_asin(char *nm)
458		{
459		return(asin(argument(1)));
460		}
461
462
463		static double
464	<	l_acos()
464	>	l_acos(char *nm)
465		{
466		return(acos(argument(1)));
467		}
468
469
470		static double
471	<	l_atan()
471	>	l_atan(char *nm)
472		{
473		return(atan(argument(1)));
474		}
475
476
477		static double
478	<	l_atan2()
478	>	l_atan2(char *nm)
479		{
480		return(atan2(argument(1), argument(2)));
481		}
482
483
484		static double
485	<	l_exp()
485	>	l_exp(char *nm)
486		{
487		return(exp(argument(1)));
488		}
489
490
491		static double
492	<	l_log()
492	>	l_log(char *nm)
493		{
494		return(log(argument(1)));
495		}
496
497
498		static double
499	<	l_log10()
499	>	l_log10(char *nm)
500		{
501		return(log10(argument(1)));
502		}

Diff Legend

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