ViewVC Help

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

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

Comparing ray/src/rt/t_func.c (file contents):
Revision 1.9 by greg, Thu Aug 8 11:29:51 1991 UTC vs.
Revision 2.2 by greg, Mon Nov 25 09:50:59 1991 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1990 Regents of the University of California */
1	>	/* Copyright (c) 1991 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 12 | Line 12 | static char SCCSid[] = "$SunId$ LBL";
12
13		#include  "ray.h"
14
15	+	#include  "func.h"
16	+
17		/*
18		*      A procedural texture perturbs the surface normal
19		*  at the point of intersection with an object.  It has
#	Line 33 | Line 35 | t_func(m, r)                   /* compute texture for ray */
35		register OBJREC  *m;
36		register RAY  *r;
37		{
36	–	extern double  varvalue();
37	–	extern int  errno;
38		FVECT  disp;
39		double  d;
40	<	register FULLXF  *mxf;
40	>	register MFUNC  *mf;
41		register int  i;
42	–	register char  **sa;
42
43		if (m->oargs.nsargs < 4)
44		objerror(m, USER, "bad # arguments");
45	<	sa = m->oargs.sarg;
46	<
48	<	if ((mxf = (FULLXF *)m->os) == NULL) {
49	<	mxf = (FULLXF *)malloc(sizeof(FULLXF));
50	<	if (mxf == NULL)
51	<	goto memerr;
52	<	if (fullxf(mxf, m->oargs.nsargs-4, sa+4) != m->oargs.nsargs-4)
53	<	objerror(m, USER, "bad transform");
54	<	if (mxf->f.sca < 0.0)
55	<	mxf->f.sca = -mxf->f.sca;
56	<	if (mxf->b.sca < 0.0)
57	<	mxf->b.sca = -mxf->b.sca;
58	<	m->os = (char *)mxf;
59	<	}
60	<
61	<	setmap(m, r, &mxf->b);
62	<
63	<	funcfile(sa[3]);
45	>	mf = getfunc(m, 3, 0x7, 1);
46	>	setfunc(m, r);
47		errno = 0;
48	<	for (i = 0; i < 3; i++)
49	<	disp[i] = varvalue(sa[i]);
50	<	if (errno) {
51	<	objerror(m, WARNING, "compute error");
52	<	return;
48	>	for (i = 0; i < 3; i++) {
49	>	disp[i] = evalue(mf->ep[i]);
50	>	if (errno) {
51	>	objerror(m, WARNING, "compute error");
52	>	return;
53	>	}
54		}
55	<	multv3(disp, disp, mxf->f.xfm);
55	>	if (mf->f != &unitxf)
56	>	multv3(disp, disp, mf->f->xfm);
57		if (r->rox != NULL) {
58		multv3(disp, disp, r->rox->f.xfm);
59	<	d = 1.0 / (mxf->f.sca * r->rox->f.sca);
59	>	d = 1.0 / (mf->f->sca * r->rox->f.sca);
60		} else
61	<	d = 1.0 / mxf->f.sca;
61	>	d = 1.0 / mf->f->sca;
62		for (i = 0; i < 3; i++)
63		r->pert[i] += disp[i] * d;
79	–	return;
80	–	memerr:
81	–	error(SYSTEM, "out of memory in t_func");
64		}

Diff Legend

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