ViewVC Help

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

root/Development/ray/src/px/pinterp.c

Comparing ray/src/px/pinterp.c (file contents):
Revision 1.4 by greg, Wed Dec 13 12:41:25 1989 UTC vs.
Revision 1.5 by greg, Fri Dec 22 10:08:33 1989 UTC

#	Line 31 | Line 31 | char   *progname;
31		VIEW    theirview = STDVIEW(512);       /* input view */
32		int     gotview;                        /* got input view? */
33
34	+	double  theirs2ours[4][4];              /* transformation matrix */
35
36	+
37		main(argc, argv)                        /* interpolate pictures */
38		int     argc;
39		char    *argv[];
#	Line 191 | Line 193 | char   *pfile, *zfile;
193		fprintf(stderr, "%s: %s\n", pfile, err);
194		exit(1);
195		}
196	+	/* compute transformation */
197	+	pixform(theirs2ours, &theirview, &ourview);
198		/* allocate scanlines */
199		scanin = (COLR *)malloc(xres*sizeof(COLR));
200		zin = (float *)malloc(xres*sizeof(float));
#	Line 218 | Line 222 | char   *pfile, *zfile;
222		}
223
224
225	+	pixform(xfmat, vw1, vw2)                /* compute view1 to view2 matrix */
226	+	register double xfmat[4][4];
227	+	register VIEW   *vw1, *vw2;
228	+	{
229	+	double  m4t[4][4];
230	+
231	+	setident4(xfmat);
232	+	xfmat[0][0] = vw1->vhinc[0];
233	+	xfmat[0][1] = vw1->vhinc[1];
234	+	xfmat[0][2] = vw1->vhinc[2];
235	+	xfmat[1][0] = vw1->vvinc[0];
236	+	xfmat[1][1] = vw1->vvinc[1];
237	+	xfmat[1][2] = vw1->vvinc[2];
238	+	xfmat[2][0] = vw1->vdir[0];
239	+	xfmat[2][1] = vw1->vdir[1];
240	+	xfmat[2][2] = vw1->vdir[2];
241	+	xfmat[3][0] = vw1->vp[0];
242	+	xfmat[3][1] = vw1->vp[1];
243	+	xfmat[3][2] = vw1->vp[2];
244	+	setident4(m4t);
245	+	m4t[0][0] = vw2->vhinc[0]/vw2->vhn2;
246	+	m4t[1][0] = vw2->vhinc[1]/vw2->vhn2;
247	+	m4t[2][0] = vw2->vhinc[2]/vw2->vhn2;
248	+	m4t[3][0] = -DOT(vw2->vp,vw2->vhinc)/vw2->vhn2;
249	+	m4t[0][1] = vw2->vvinc[0]/vw2->vvn2;
250	+	m4t[1][1] = vw2->vvinc[1]/vw2->vvn2;
251	+	m4t[2][1] = vw2->vvinc[2]/vw2->vvn2;
252	+	m4t[3][1] = -DOT(vw2->vp,vw2->vvinc)/vw2->vvn2;
253	+	m4t[0][2] = vw2->vdir[0];
254	+	m4t[1][2] = vw2->vdir[1];
255	+	m4t[2][2] = vw2->vdir[2];
256	+	m4t[3][2] = -DOT(vw2->vp,vw2->vdir);
257	+	multmat4(xfmat, xfmat, m4t);
258	+	}
259	+
260	+
261		addscanline(y, pline, zline)            /* add scanline to output */
262		int     y;
263		COLR    *pline;
264		float   *zline;
265		{
266	<	FVECT   p, dir;
267	<	double  xnew, ynew, znew;
266	>	extern double   sqrt();
267	>	double  pos[3];
268		register int    x;
269		register int    xpos, ypos;
270
271		for (x = 0; x < theirview.hresolu; x++) {
272	<	rayview(p, dir, &theirview, x+.5, y+.5);
273	<	p[0] += zline[x]*dir[0];
274	<	p[1] += zline[x]*dir[1];
275	<	p[2] += zline[x]*dir[2];
276	<	pixelview(&xnew, &ynew, &znew, &ourview, p);
277	<	if (znew <= 0.0 || xnew < 0 || xnew > ourview.hresolu
278	<	|| ynew < 0 || ynew > ourview.vresolu)
272	>	pos[0] = x - .5*(theirview.hresolu-1);
273	>	pos[1] = y - .5*(theirview.vresolu-1);
274	>	pos[2] = zline[x];
275	>	if (theirview.type == VT_PER) {
276	>	pos[2] /= sqrt( 1.
277	>	+ pos[0]*pos[0]*theirview.vhn2
278	>	+ pos[1]*pos[1]*theirview.vvn2 );
279	>	pos[0] *= pos[2];
280	>	pos[1] *= pos[2];
281	>	}
282	>	multp3(pos, pos, theirs2ours);
283	>	if (pos[2] <= 0.0)
284		continue;
285	<	/* check current value at position */
286	<	xpos = xnew;
287	<	ypos = ynew;
285	>	if (ourview.type == VT_PER) {
286	>	pos[0] /= pos[2];
287	>	pos[1] /= pos[2];
288	>	}
289	>	pos[0] += .5*ourview.hresolu;
290	>	pos[1] += .5*ourview.vresolu;
291	>	if (pos[0] < 0 || pos[0] > ourview.hresolu
292	>	|| pos[1] < 0 || pos[1] > ourview.vresolu)
293	>	continue;
294	>	/* check current value at pos */
295	>	xpos = pos[0];
296	>	ypos = pos[1];
297		if (zscan(ypos)[xpos] <= 0.0
298	<	|| zscan(ypos)[xpos] - znew
298	>	|| zscan(ypos)[xpos] - pos[2]
299		> zeps*zscan(ypos)[xpos]) {
300	<	zscan(ypos)[xpos] = znew;
300	>	zscan(ypos)[xpos] = pos[2];
301		copycolr(pscan(ypos)[xpos], pline[x]);
302		}
303		}

Diff Legend

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