--- ray/src/rt/func.c 1995/11/02 17:38:05 2.13 +++ ray/src/rt/func.c 2011/02/22 16:45:12 2.24 @@ -1,19 +1,15 @@ -/* Copyright (c) 1995 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: func.c,v 2.24 2011/02/22 16:45:12 greg Exp $"; #endif - /* * func.c - interface to calcomp functions. - * - * 4/7/86 */ -#include "ray.h" +#include "copyright.h" +#include "ray.h" +#include "paths.h" #include "otypes.h" - #include "func.h" @@ -34,17 +30,17 @@ XF funcxf; /* current transformation */ static OBJREC *fobj = NULL; /* current function object */ static RAY *fray = NULL; /* current function ray */ -static double l_erf(), l_erfc(), l_arg(); +static double l_erf(char *), l_erfc(char *), l_arg(char *); -MFUNC * -getfunc(m, ff, ef, dofwd) /* get function for this modifier */ -OBJREC *m; -int ff; -unsigned ef; -int dofwd; +extern MFUNC * +getfunc( /* get function for this modifier */ + OBJREC *m, + int ff, + unsigned int ef, + int dofwd +) { - extern EPNODE *curfunc; static char initfile[] = INITFILE; char sbuf[MAXSTR]; register char **arg; @@ -56,6 +52,8 @@ int dofwd; return(f); fobj = NULL; fray = NULL; if (initfile[0]) { /* initialize on first call */ + esupport |= E_VARIABLE|E_FUNCTION|E_INCHAN|E_RCONST|E_REDEFW; + esupport &= ~(E_OUTCHAN); setcontext(""); scompile("Dx=$1;Dy=$2;Dz=$3;", NULL, 0); scompile("Nx=$4;Ny=$5;Nz=$6;", NULL, 0); @@ -65,6 +63,7 @@ int dofwd; scompile("Ix=$16;Iy=$17;Iz=$18;", NULL, 0); scompile("Jx=$19;Jy=$20;Jz=$21;", NULL, 0); scompile("Kx=$22;Ky=$23;Kz=$24;", NULL, 0); + scompile("Lu=$26;Lv=$27;", NULL, 0); funset("arg", 1, '=', l_arg); funset("erf", 1, ':', l_erf); funset("erfc", 1, ':', l_erfc); @@ -82,7 +81,7 @@ int dofwd; if (i == 1 && arg[ff][0] == '.') setcontext(f->ctx = ""); /* "." means no file */ else { - strcpy(sbuf,arg[ff]); /* file name is context */ + strcpy(sbuf,arg[ff]); /* file name is context */ if (i > LCALSUF && !strcmp(sbuf+i-LCALSUF, CALSUF)) sbuf[i-LCALSUF] = '\0'; /* remove suffix */ setcontext(f->ctx = savestr(sbuf)); @@ -132,11 +131,14 @@ toofew: objerror(m, USER, "too few string arguments"); memerr: error(SYSTEM, "out of memory in getfunc"); + return NULL; /* pro forma return */ } -freefunc(m) /* free memory associated with modifier */ -OBJREC *m; +extern void +freefunc( /* free memory associated with modifier */ + OBJREC *m +) { register MFUNC *f; register int i; @@ -155,23 +157,25 @@ OBJREC *m; freestr(f->ctx); } if (f->b != &unitxf) - free((char *)f->b); + free((void *)f->b); if (f->f != NULL && f->f != &unitxf) - free((char *)f->f); - free((char *)f); + free((void *)f->f); + free((void *)f); m->os = NULL; } -setfunc(m, r) /* set channels for function call */ -OBJREC *m; -register RAY *r; +extern int +setfunc( /* set channels for function call */ + OBJREC *m, + register RAY *r +) { - static unsigned long lastrno = ~0; + static RNUMBER lastrno = ~0; register MFUNC *f; /* get function */ if ((f = (MFUNC *)m->os) == NULL) - error(m, CONSISTENCY, "setfunc called before getfunc"); + objerror(m, CONSISTENCY, "setfunc called before getfunc"); /* set evaluator context */ setcontext(f->ctx); /* check to see if matrix set */ @@ -184,22 +188,23 @@ register RAY *r; funcxf.sca = r->rox->b.sca * f->b->sca; multmat4(funcxf.xfm, r->rox->b.xfm, f->b->xfm); } else - copystruct(&funcxf, &r->rox->b); + funcxf = r->rox->b; else - copystruct(&funcxf, f->b); + funcxf = *(f->b); lastrno = r->rno; eclock++; /* notify expression evaluator */ return(1); } -loadfunc(fname) /* load definition file */ -char *fname; +extern void +loadfunc( /* load definition file */ + char *fname +) { - extern char *getlibpath(); /* library search path */ char *ffname; - if ((ffname = getpath(fname, getlibpath(), R_OK)) == NULL) { + if ((ffname = getpath(fname, getrlibpath(), R_OK)) == NULL) { sprintf(errmsg, "cannot find function file \"%s\"", fname); error(USER, errmsg); } @@ -208,9 +213,8 @@ char *fname; static double -l_arg() /* return nth real argument */ +l_arg(char *nm) /* return nth real argument */ { - extern double argument(); register int n; if (fobj == NULL) @@ -230,26 +234,23 @@ l_arg() /* return nth real argument */ static double -l_erf() /* error function */ +l_erf(char *nm) /* error function */ { - extern double erf(); - return(erf(argument(1))); } static double -l_erfc() /* cumulative error function */ +l_erfc(char *nm) /* cumulative error function */ { - extern double erfc(); - return(erfc(argument(1))); } -double -chanvalue(n) /* return channel n to calcomp */ -register int n; +extern double +chanvalue( /* return channel n to calcomp */ + register int n +) { if (fray == NULL) syntax("ray parameter used in constant expression"); @@ -257,21 +258,21 @@ register int n; if (--n < 0) goto badchan; - if (n < 3) /* ray direction */ + if (n <= 2) /* ray direction */ return( ( fray->rdir[0]*funcxf.xfm[0][n] + fray->rdir[1]*funcxf.xfm[1][n] + fray->rdir[2]*funcxf.xfm[2][n] ) / funcxf.sca ); - if (n < 6) /* surface normal */ + if (n <= 5) /* surface normal */ return( ( fray->ron[0]*funcxf.xfm[0][n-3] + fray->ron[1]*funcxf.xfm[1][n-3] + fray->ron[2]*funcxf.xfm[2][n-3] ) / funcxf.sca ); - if (n < 9) /* intersection */ + if (n <= 8) /* intersection */ return( fray->rop[0]*funcxf.xfm[0][n-6] + fray->rop[1]*funcxf.xfm[1][n-6] + @@ -289,20 +290,24 @@ register int n; if (n == 11) /* scale */ return(funcxf.sca); - if (n < 15) /* origin */ + if (n <= 14) /* origin */ return(funcxf.xfm[3][n-12]); - if (n < 18) /* i unit vector */ + if (n <= 17) /* i unit vector */ return(funcxf.xfm[0][n-15] / funcxf.sca); - if (n < 21) /* j unit vector */ - return(funcxf.xfm[1][n-15] / funcxf.sca); + if (n <= 20) /* j unit vector */ + return(funcxf.xfm[1][n-18] / funcxf.sca); - if (n < 24) /* k unit vector */ + if (n <= 23) /* k unit vector */ return(funcxf.xfm[2][n-21] / funcxf.sca); if (n == 24) /* single ray (shadow) distance */ return((fray->rot+raydist(fray->parent,SHADOW)) * funcxf.sca); + + if (n <= 26) /* local (u,v) coordinates */ + return(fray->uv[n-25]); badchan: error(USER, "illegal channel number"); + return(0.0); }