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.38 by greg, Fri Nov 16 00:14:19 2012 UTC vs.
Revision 2.40 by greg, Wed Apr 3 00:35:09 2013 UTC

#	Line 33 | Line 33 | VIEW  *v
33		static char  ill_horiz[] = "illegal horizontal view size";
34		static char  ill_vert[] = "illegal vertical view size";
35
36	<	if (v->vaft < -FTINY || (v->vaft > FTINY && v->vaft <= v->vfore))
36	>	if ((v->vfore < -FTINY) | (v->vaft < -FTINY) ||
37	>	(v->vaft > FTINY) & (v->vaft <= v->vfore))
38		return("illegal fore/aft clipping plane");
39
40		if (v->vdist <= FTINY)
#	Line 169 | Line 170 | double  y
170		direc[0] = v->vdir[0] + x*v->hvec[0] + y*v->vvec[0];
171		direc[1] = v->vdir[1] + x*v->hvec[1] + y*v->vvec[1];
172		direc[2] = v->vdir[2] + x*v->hvec[2] + y*v->vvec[2];
173	<	orig[0] = v->vp[0] + v->vfore*direc[0];
173	<	orig[1] = v->vp[1] + v->vfore*direc[1];
174	<	orig[2] = v->vp[2] + v->vfore*direc[2];
173	>	VSUM(orig, v->vp, direc, v->vfore);
174		d = normalize(direc);
175		return(v->vaft > FTINY ? (v->vaft - v->vfore)*d : 0.0);
176		case VT_HEM:                    /* hemispherical fisheye */
#	Line 182 | Line 181 | double  y
181		direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0];
182		direc[1] = z*v->vdir[1] + x*v->hvec[1] + y*v->vvec[1];
183		direc[2] = z*v->vdir[2] + x*v->hvec[2] + y*v->vvec[2];
184	<	orig[0] = v->vp[0] + v->vfore*direc[0];
186	<	orig[1] = v->vp[1] + v->vfore*direc[1];
187	<	orig[2] = v->vp[2] + v->vfore*direc[2];
184	>	VSUM(orig, v->vp, direc, v->vfore);
185		return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0);
186		case VT_CYL:                    /* cylindrical panorama */
187		d = x * v->horiz * (PI/180.0);
#	Line 193 | Line 190 | double  y
190		direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0];
191		direc[1] = z*v->vdir[1] + x*v->hvec[1] + y*v->vvec[1];
192		direc[2] = z*v->vdir[2] + x*v->hvec[2] + y*v->vvec[2];
193	<	orig[0] = v->vp[0] + v->vfore*direc[0];
197	<	orig[1] = v->vp[1] + v->vfore*direc[1];
198	<	orig[2] = v->vp[2] + v->vfore*direc[2];
193	>	VSUM(orig, v->vp, direc, v->vfore);
194		d = normalize(direc);
195		return(v->vaft > FTINY ? (v->vaft - v->vfore)*d : 0.0);
196		case VT_ANG:                    /* angular fisheye */
#	Line 212 | Line 207 | double  y
207		direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0];
208		direc[1] = z*v->vdir[1] + x*v->hvec[1] + y*v->vvec[1];
209		direc[2] = z*v->vdir[2] + x*v->hvec[2] + y*v->vvec[2];
210	<	orig[0] = v->vp[0] + v->vfore*direc[0];
216	<	orig[1] = v->vp[1] + v->vfore*direc[1];
217	<	orig[2] = v->vp[2] + v->vfore*direc[2];
210	>	VSUM(orig, v->vp, direc, v->vfore);
211		return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0);
212		case VT_PLS:                    /* planispheric fisheye */
213		x *= sqrt(v->hn2);
#	Line 226 | Line 219 | double  y
219		direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0];
220		direc[1] = z*v->vdir[1] + x*v->hvec[1] + y*v->vvec[1];
221		direc[2] = z*v->vdir[2] + x*v->hvec[2] + y*v->vvec[2];
222	<	orig[0] = v->vp[0] + v->vfore*direc[0];
230	<	orig[1] = v->vp[1] + v->vfore*direc[1];
231	<	orig[2] = v->vp[2] + v->vfore*direc[2];
222	>	VSUM(orig, v->vp, direc, v->vfore);
223		return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0);
224		}
225		return(-1.0);

Diff Legend

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