ViewVC Help

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

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

Comparing ray/src/rt/t_data.c (file contents):
Revision 1.1 by greg, Tue Mar 14 11:31:17 1989 UTC vs.
Revision 2.4 by greg, Wed Jan 12 16:46:53 1994 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1989 Regents of the University of California */
1	>	/* Copyright (c) 1992 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 14 | Line 14 | static char SCCSid[] = "$SunId$ LBL";
14
15		#include  "data.h"
16
17	+	#include  "func.h"
18	+
19		/*
20		*      A stored texture is specified as follows:
21		*
#	Line 31 | Line 33 | static char SCCSid[] = "$SunId$ LBL";
33		*  to get from the original coordinates to the current coordinates.
34		*/
35
34	–	typedef struct {
35	–	struct {
36	–	double  sca;            /* scale factor */
37	–	double  xfm[4][4];      /* transformation matrix */
38	–	}  fore, back;
39	–	}  XFORM;
36
41	–
37		t_data(m, r)                    /* interpolate texture data */
38		register OBJREC  *m;
39		RAY  *r;
40		{
46	–	extern double  varvalue(), funvalue(), datavalue();
47	–	extern int  errno;
41		int  nv;
42	<	FVECT  dval, disp;
43	<	double  pt[MAXDIM];
42	>	FVECT  disp;
43	>	double  dval[3], pt[MAXDIM];
44	>	double  d;
45		DATARRAY  *dp;
46	<	register XFORM  *mxf;
53	<	register char  **sa;
46	>	register MFUNC  *mf;
47		register int  i;
48
49		if (m->oargs.nsargs < 8)
50		objerror(m, USER, "bad # arguments");
51	<	sa = m->oargs.sarg;
52	<
53	<	if ((mxf = (XFORM *)m->os) == NULL) {
54	<	for (i = 7; i < m->oargs.nsargs && sa[i][0] != '-'; i++)
62	<	;
63	<	nv = i-7;
64	<	mxf = (XFORM *)malloc(sizeof(XFORM));
65	<	if (mxf == NULL)
66	<	goto memerr;
67	<	mxf->fore.sca = 1.0;
68	<	setident4(mxf->fore.xfm);
69	<	if (xf(mxf->fore.xfm, &mxf->fore.sca,
70	<	m->oargs.nsargs-i, sa+i) != m->oargs.nsargs-i)
71	<	objerror(m, USER, "bad transform");
72	<	if (mxf->fore.sca < 0.0)
73	<	mxf->fore.sca = -mxf->fore.sca;
74	<	mxf->back.sca = 1.0;
75	<	setident4(mxf->back.xfm);
76	<	invxf(mxf->back.xfm, &mxf->back.sca,
77	<	m->oargs.nsargs-i, sa+i);
78	<	if (mxf->back.sca < 0.0)
79	<	mxf->back.sca = -mxf->back.sca;
80	<	m->os = (char *)mxf;
81	<	}
82	<
83	<	setmap(m, r, mxf->back.xfm, mxf->back.sca);
84	<
85	<	if (nv > MAXDIM)
86	<	goto dimerr;
87	<	if (!vardefined(sa[7]))
88	<	loadfunc(sa[6]);
51	>	dp = getdata(m->oargs.sarg[3]);
52	>	i = (1 << (nv = dp->nd)) - 1;
53	>	mf = getfunc(m, 6, i<<7, 1);
54	>	setfunc(m, r);
55		errno = 0;
56		for (i = 0; i < nv; i++)
57	<	pt[i] = varvalue(sa[i+7]);
57	>	pt[i] = evalue(mf->ep[i]);
58		if (errno)
59		goto computerr;
60	<	for (i = 0; i < 3; i++) {
61	<	dp = getdata(sa[i+3]);
60	>	dval[0] = datavalue(dp, pt);
61	>	for (i = 1; i < 3; i++) {
62	>	dp = getdata(m->oargs.sarg[i+3]);
63		if (dp->nd != nv)
64	<	goto dimerr;
64	>	objerror(m, USER, "dimension error");
65		dval[i] = datavalue(dp, pt);
66		}
67		errno = 0;
68		for (i = 0; i < 3; i++)
69	<	disp[i] = funvalue(sa[i], 3, dval);
69	>	disp[i] = funvalue(m->oargs.sarg[i], 3, dval);
70		if (errno)
71		goto computerr;
72	<
72	>	if (mf->f != &unitxf)
73	>	multv3(disp, disp, mf->f->xfm);
74	>	if (r->rox != NULL) {
75	>	multv3(disp, disp, r->rox->f.xfm);
76	>	d = 1.0 / (mf->f->sca * r->rox->f.sca);
77	>	} else
78	>	d = 1.0 / mf->f->sca;
79		for (i = 0; i < 3; i++)
80	<	r->pert[i] += ( disp[0]*mxf->fore.xfm[0][i] +
81	<	disp[1]*mxf->fore.xfm[1][i] +
109	<	disp[2]*mxf->fore.xfm[2][i] )
110	<	/ mxf->fore.sca;
111	<	return;
112	<	dimerr:
113	<	objerror(m, USER, "dimension error");
114	<	memerr:
115	<	error(SYSTEM, "out of memory in t_data");
80	>	r->pert[i] += disp[i] * d;
81	>	return(0);
82		computerr:
83		objerror(m, WARNING, "compute error");
84	<	return;
84	>	return(0);
85		}

Diff Legend

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