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.38 by greg, Thu Apr 2 18:00:34 2020 UTC vs.
Revision 2.42 by greg, Tue Oct 29 00:36:54 2024 UTC

#	Line 43 | Line 43 | initfunc(void) /* initialize function evaluation */
43		return;
44		esupport |= E_VARIABLE|E_FUNCTION|E_INCHAN|E_RCONST|E_REDEFW;
45		esupport &= ~(E_OUTCHAN);
46	<	setcontext("");
46	>	calcontext("");
47		scompile("Dx=$1;Dy=$2;Dz=$3;", NULL, 0);
48		scompile("Nx=$4;Ny=$5;Nz=$6;", NULL, 0);
49		scompile("Px=$7;Py=$8;Pz=$9;", NULL, 0);
#	Line 65 | Line 65 | initfunc(void) /* initialize function evaluation */
65
66		/* Set parameters for current evaluation */
67		void
68	<	set_eparams(char *prms)
68	>	set_eparams(const char *prms)
69		{
70	<	static char     *last_params = NULL;
71	<	char            vname[RMAXWORD];
72	<	double          value;
73	<	char            *cpd;
70	>	static const char       *last_params = NULL;
71	>	char                    vname[RMAXWORD];
72	>	double                  value;
73	>	char                    *cpd;
74		/* check if already set */
75		if (prms == NULL || !*prms)
76		return;
#	Line 96 | Line 96 | set_eparams(char *prms)
96		if (*prms++ != '=')
97		goto bad_params;
98		value = atof(prms);
99	<	if ((prms = fskip(prms)) == NULL)
99	>	if ((prms = fskip((char *)prms)) == NULL)
100		goto bad_params;
101		while (isspace(*prms)) prms++;
102		prms += (*prms == ',') | (*prms == ';') | (*prms == ':');
#	Line 136 | Line 136 | getfunc(       /* get function for this modifier */
136		goto memerr;
137		i = strlen(arg[ff]);                    /* set up context */
138		if (i == 1 && arg[ff][0] == '.') {
139	<	setcontext(f->ctx = "");        /* "." means no file */
139	>	calcontext(f->ctx = "");        /* "." means no file */
140		} else {
141		strcpy(sbuf,arg[ff]);           /* file name is context */
142		if (i > LCALSUF && !strcmp(sbuf+i-LCALSUF, CALSUF))
143		sbuf[i-LCALSUF] = '\0'; /* remove suffix */
144	<	setcontext(f->ctx = savestr(sbuf));
144	>	calcontext(f->ctx = savestr(sbuf));
145		if (!vardefined(REFVNAME)) {    /* file loaded? */
146		loadfunc(arg[ff]);
147		varset(REFVNAME, '=', 1.0);
148		} else                          /* reference_count++ */
149		varset(REFVNAME, '=', varvalue(REFVNAME)+1.0);
150		}
151	<	curfunc = NULL;                 /* parse expressions */
151	>	ecurfunc = NULL;                        /* parse expressions */
152		sprintf(sbuf, "%s \"%s\"", ofun[m->otype].funame, m->oname);
153		for (i=0, ne=0; ef && i < na; i++, ef>>=1)
154		if (ef & 1) {                   /* flagged as an expression? */
#	Line 157 | Line 157 | getfunc(       /* get function for this modifier */
157		initstr(arg[i], sbuf, 0);
158		f->ep[ne++] = getE1();
159		if (nextc != EOF)
160	<	syntax("unexpected character");
160	>	esyntax("unexpected character");
161		}
162		if (ef)
163		goto toofew;
#	Line 203 | Line 203 | freefunc(                      /* free memory associated with modifier */
203		if ((f = (MFUNC *)m->os) == NULL)
204		return;
205		for (i = 0; f->ep[i] != NULL; i++)
206	<	epfree(f->ep[i]);
206	>	epfree(f->ep[i],1);
207		if (f->ctx[0]) {                        /* done with definitions */
208	<	setcontext(f->ctx);
208	>	calcontext(f->ctx);
209		i = varvalue(REFVNAME)-.5;      /* reference_count-- */
210		if (i > 0)
211		varset(REFVNAME, '=', (double)i);
#	Line 234 | Line 234 | setfunc(                       /* set channels for function call */
234		if ((f = (MFUNC *)m->os) == NULL)
235		objerror(m, CONSISTENCY, "setfunc called before getfunc");
236
237	<	setcontext(f->ctx);             /* set evaluator context */
237	>	calcontext(f->ctx);             /* set evaluator context */
238		/* check to see if matrix set */
239		if ((m == fobj) & (r->rno == lastrno))
240		return(0);
#	Line 256 | Line 256 | setfunc(                       /* set channels for function call */
256
257		int
258		worldfunc(                      /* special function context sans object */
259	<	char    *ctx,
259	>	const char      *ctx,
260		RAY     *r
261		)
262		{
#	Line 265 | Line 265 | worldfunc(                     /* special function context sans object *
265		if (rayinitcal[0])              /* initialize on first call */
266		initfunc();
267		/* set evaluator context */
268	<	setcontext(ctx);
268	>	calcontext((char *)ctx);
269		/* check if ray already set */
270		if ((fobj == NULL) & (r->rno == lastrno))
271		return(0);
#	Line 290 | Line 290 | loadfunc(                      /* load definition file */
290		error(SYSTEM, errmsg);
291		}
292		fcompile(ffname);
293	+	doptimize(1);           /* optimize definitions */
294		}
295
296
#	Line 335 | Line 336 | chanvalue(                     /* return channel n to calcomp */
336		)
337		{
338		if (fray == NULL)
339	<	syntax("ray parameter used in constant expression");
339	>	esyntax("ray parameter used in constant expression");
340
341		if (--n < 0)
342		goto badchan;

Diff Legend

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