ViewVC Help

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

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

Comparing ray/src/rt/p_data.c (file contents):
Revision 2.4 by greg, Wed Jan 12 16:46:48 1994 UTC vs.
Revision 2.9 by greg, Tue Jul 8 18:25:00 2014 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1992 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		*  p_data.c - routine for stored patterns.
9	–	*
10	–	*     6/4/86
6		*/
7
8	<	#include  "ray.h"
8	>	#include "copyright.h"
9
10	+	#include  "ray.h"
11		#include  "data.h"
16	–
12		#include  "func.h"
13	+	#include  "rtotypes.h"
14
15		/*
16		*      A stored pattern can either be brightness or
#	Line 50 | Line 46 | static char SCCSid[] = "$SunId$ LBL";
46		*/
47
48
49	<	p_bdata(m, r)                   /* interpolate brightness data */
50	<	register OBJREC  *m;
51	<	RAY  *r;
49	>	int
50	>	p_bdata(                        /* interpolate brightness data */
51	>	OBJREC  *m,
52	>	RAY  *r
53	>	)
54		{
55		double  bval;
56		double  pt[MAXDIM];
57		DATARRAY  *dp;
58	<	register MFUNC  *mf;
59	<	register int  i;
58	>	MFUNC  *mf;
59	>	int  i;
60
61		if (m->oargs.nsargs < 4)
62		objerror(m, USER, "bad # arguments");
#	Line 69 | Line 67 | RAY  *r;
67		errno = 0;
68		for (i = dp->nd; i-- > 0; ) {
69		pt[i] = evalue(mf->ep[i]);
70	<	if (errno)
70	>	if (errno == EDOM || errno == ERANGE)
71		goto computerr;
72		}
73		bval = datavalue(dp, pt);
74		errno = 0;
75		bval = funvalue(m->oargs.sarg[0], 1, &bval);
76	<	if (errno)
76	>	if (errno == EDOM || errno == ERANGE)
77		goto computerr;
78		scalecolor(r->pcol, bval);
79		return(0);
#	Line 85 | Line 83 | computerr:
83		}
84
85
86	<	p_cdata(m, r)                   /* interpolate color data */
87	<	register OBJREC  *m;
88	<	RAY  *r;
86	>	int
87	>	p_cdata(                        /* interpolate color data */
88	>	OBJREC  *m,
89	>	RAY  *r
90	>	)
91		{
92		double  col[3];
93		COLOR  cval;
94		double  pt[MAXDIM];
95		int  nv;
96		DATARRAY  *dp;
97	<	register MFUNC  *mf;
98	<	register int  i;
97	>	MFUNC  *mf;
98	>	int  i;
99
100		if (m->oargs.nsargs < 8)
101		objerror(m, USER, "bad # arguments");
#	Line 106 | Line 106 | RAY  *r;
106		errno = 0;
107		for (i = 0; i < nv; i++) {
108		pt[i] = evalue(mf->ep[i]);
109	<	if (errno)
109	>	if (errno == EDOM || errno == ERANGE)
110		goto computerr;
111		}
112		col[0] = datavalue(dp, pt);
#	Line 122 | Line 122 | RAY  *r;
122		colval(cval,i) = funvalue(m->oargs.sarg[i], 1, col+i);
123		else
124		colval(cval,i) = funvalue(m->oargs.sarg[i], 3, col);
125	<	if (errno)
125	>	if (errno == EDOM || errno == ERANGE)
126		goto computerr;
127		multcolor(r->pcol, cval);
128		return(0);
#	Line 132 | Line 132 | computerr:
132		}
133
134
135	<	p_pdata(m, r)                   /* interpolate picture data */
136	<	register OBJREC  *m;
137	<	RAY  *r;
135	>	int
136	>	p_pdata(                        /* interpolate picture data */
137	>	OBJREC  *m,
138	>	RAY  *r
139	>	)
140		{
141		double  col[3];
142		COLOR  cval;
143		double  pt[2];
144		DATARRAY  *dp;
145	<	register MFUNC  *mf;
146	<	register int  i;
145	>	MFUNC  *mf;
146	>	int  i;
147
148		if (m->oargs.nsargs < 7)
149		objerror(m, USER, "bad # arguments");
#	Line 150 | Line 152 | RAY  *r;
152		errno = 0;
153		pt[1] = evalue(mf->ep[0]);      /* y major ordering */
154		pt[0] = evalue(mf->ep[1]);
155	<	if (errno)
155	>	if (errno == EDOM || errno == ERANGE)
156		goto computerr;
157		dp = getpict(m->oargs.sarg[3]);
158		for (i = 0; i < 3; i++)
#	Line 161 | Line 163 | RAY  *r;
163		colval(cval,i) = funvalue(m->oargs.sarg[i], 1, col+i);
164		else
165		colval(cval,i) = funvalue(m->oargs.sarg[i], 3, col);
166	<	if (errno)
166	>	if (errno == EDOM || errno == ERANGE)
167		goto computerr;
168		multcolor(r->pcol, cval);
169		return(0);

Diff Legend

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