ViewVC Help

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

root/Development/ray/src/common/image.c

Comparing ray/src/common/image.c (file contents):
Revision 2.28 by greg, Tue Jun 8 19:48:29 2004 UTC vs.
Revision 2.29 by greg, Tue Jan 18 00:33:16 2005 UTC

#	Line 34 | Line 34 | register VIEW  *v;
34		if (v->vaft < -FTINY || (v->vaft > FTINY && v->vaft <= v->vfore))
35		return("illegal fore/aft clipping plane");
36
37	<	if (normalize(v->vdir) == 0.0)          /* normalize direction */
37	>	v->vdist *= normalize(v->vdir);         /* normalize direction */
38	>	if (v->vdist == 0.0)
39		return("zero view direction");
40
41		if (normalize(v->vup) == 0.0)           /* normalize view up */
#	Line 428 | Line 429 | FILE  *fp;
429		{
430		fprintf(fp, " -vt%c", vp->type);
431		fprintf(fp, " -vp %.6g %.6g %.6g", vp->vp[0], vp->vp[1], vp->vp[2]);
432	<	fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0], vp->vdir[1], vp->vdir[2]);
432	>	fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0]*vp->vdist,
433	>	vp->vdir[1]*vp->vdist,
434	>	vp->vdir[2]*vp->vdist);
435		fprintf(fp, " -vu %.6g %.6g %.6g", vp->vup[0], vp->vup[1], vp->vup[2]);
436		fprintf(fp, " -vh %.6g -vv %.6g", vp->horiz, vp->vert);
437		fprintf(fp, " -vo %.6g -va %.6g", vp->vfore, vp->vaft);
#	Line 452 | Line 455 | register VIEW  *vp;
455		vp->vp[0], vp->vp[1], vp->vp[2]);
456		cp += strlen(cp);
457		}
458	<	if (!VEQ(vp->vdir,stdview.vdir)) {
458	>	if (!FEQ(vp->vdist,stdview.vdist) || !VEQ(vp->vdir,stdview.vdir)) {
459		sprintf(cp, " -vd %.6g %.6g %.6g",
460	<	vp->vdir[0], vp->vdir[1], vp->vdir[2]);
460	>	vp->vdir[0]*vp->vdist,
461	>	vp->vdir[1]*vp->vdist,
462	>	vp->vdir[2]*vp->vdist);
463		cp += strlen(cp);
464		}
465		if (!VEQ(vp->vup,stdview.vup)) {

Diff Legend

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