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.17 by greg, Tue Feb 25 02:47:21 2003 UTC vs.
Revision 2.50 by greg, Sat May 4 00:36:58 2019 UTC

#	Line 9 | Line 9 | static const char      RCSid[] = "$Id$";
9
10		#include "copyright.h"
11
12	<	#include  "standard.h"
13	<
12	>	#include  <ctype.h>
13	>	#include  "rtio.h"
14	>	#include  "rtmath.h"
15	>	#include  "paths.h"
16		#include  "view.h"
17
16	–	#include  "paths.h"
18
19		#define  FEQ(x,y)       (fabs((x)-(y)) <= FTINY)
20		#define  VEQ(v,w)       (FEQ((v)[0],(w)[0]) && FEQ((v)[1],(w)[1]) \
#	Line 21 | Line 22 | static const char      RCSid[] = "$Id$";
22
23		VIEW  stdview = STDVIEW;                /* default view parameters */
24
25	+	static gethfunc gethview;
26
27	+
28		char *
29	<	setview(v)              /* set hvec and vvec, return message on error */
30	<	register VIEW  *v;
29	>	setview(                /* set hvec and vvec, return message on error */
30	>	VIEW  *v
31	>	)
32		{
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 (normalize(v->vdir) == 0.0)          /* normalize direction */
40	>	if (v->vdist <= FTINY)
41	>	return("illegal view distance");
42	>	v->vdist *= normalize(v->vdir);         /* normalize direction */
43	>	if (v->vdist == 0.0)
44		return("zero view direction");
45
46		if (normalize(v->vup) == 0.0)           /* normalize view up */
#	Line 87 | Line 95 | register VIEW  *v;
95		v->hn2 = 2.0 * sin(v->horiz*(PI/180.0/2.0));
96		v->vn2 = 2.0 * sin(v->vert*(PI/180.0/2.0));
97		break;
98	+	case VT_PLS:                            /* planispheric fisheye */
99	+	if (v->horiz >= 360.0-FTINY)
100	+	return(ill_horiz);
101	+	if (v->vert >= 360.0-FTINY)
102	+	return(ill_vert);
103	+	v->hn2 = 2.*sin(v->horiz*(PI/180.0/2.0)) /
104	+	(1.0 + cos(v->horiz*(PI/180.0/2.0)));
105	+	v->vn2 = 2.*sin(v->vert*(PI/180.0/2.0)) /
106	+	(1.0 + cos(v->vert*(PI/180.0/2.0)));
107	+	break;
108		default:
109		return("unknown view type");
110		}
111	<	if (v->type != VT_ANG) {
111	>	if (v->type != VT_ANG && v->type != VT_PLS) {
112		if (v->type != VT_CYL) {
113		v->hvec[0] *= v->hn2;
114		v->hvec[1] *= v->hn2;
#	Line 108 | Line 126 | register VIEW  *v;
126
127
128		void
129	<	normaspect(va, ap, xp, yp)              /* fix pixel aspect or resolution */
130	<	double  va;                     /* view aspect ratio */
131	<	double  *ap;                    /* pixel aspect in (or out if 0) */
132	<	int  *xp, *yp;                  /* x and y resolution in (or out if *ap!=0) */
129	>	normaspect(                             /* fix pixel aspect or resolution */
130	>	double  va,                     /* view aspect ratio */
131	>	double  *ap,                    /* pixel aspect in (or out if 0) */
132	>	int  *xp,
133	>	int  *yp                        /* x and y resolution in (or out if *ap!=0) */
134	>	)
135		{
136		if (*ap <= FTINY)
137		*ap = va * *xp / *yp;           /* compute pixel aspect */
#	Line 123 | Line 143 | int  *xp, *yp;                 /* x and y resolution in (or out if *
143
144
145		double
146	<	viewray(orig, direc, v, x, y)           /* compute ray origin and direction */
147	<	FVECT  orig, direc;
148	<	register VIEW  *v;
149	<	double  x, y;
146	>	viewray(                                /* compute ray origin and direction */
147	>	FVECT  orig,
148	>	FVECT  direc,
149	>	VIEW  *v,
150	>	double  x,
151	>	double  y
152	>	)
153		{
154		double  d, z;
155
#	Line 147 | Line 170 | double  x, 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];
151	<	orig[1] = v->vp[1] + v->vfore*direc[1];
152	<	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 160 | Line 181 | double  x, 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];
164	<	orig[1] = v->vp[1] + v->vfore*direc[1];
165	<	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 171 | Line 190 | double  x, 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];
175	<	orig[1] = v->vp[1] + v->vfore*direc[1];
176	<	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 */
197	<	x *= v->horiz/180.0;
198	<	y *= v->vert/180.0;
197	>	x *= (1.0/180.0)*v->horiz;
198	>	y *= (1.0/180.0)*v->vert;
199		d = x*x + y*y;
200		if (d > 1.0)
201		return(-1.0);
202		d = sqrt(d);
203		z = cos(PI*d);
204	<	d = d <= FTINY ? PI : sqrt(1 - z*z)/d;
204	>	d = d <= FTINY ? PI : sqrt(1.0 - z*z)/d;
205		x *= d;
206		y *= d;
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];
194	<	orig[1] = v->vp[1] + v->vfore*direc[1];
195	<	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);
214	+	y *= sqrt(v->vn2);
215	+	d = x*x + y*y;
216	+	z = (1. - d)/(1. + d);
217	+	x *= (1. + z);
218	+	y *= (1. + z);
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	+	VSUM(orig, v->vp, direc, v->vfore);
223	+	return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0);
224		}
225		return(-1.0);
226		}
227
228
229	<	void
230	<	viewloc(ip, v, p)               /* find image location for point */
231	<	FVECT  ip;
232	<	register VIEW  *v;
233	<	FVECT  p;
229	>	int
230	>	viewloc(                        /* find image location for point */
231	>	FVECT  ip,
232	>	VIEW  *v,
233	>	FVECT  p
234	>	)       /* Use VL_* flags to interpret return value */
235		{
236	+	int     rflags = VL_GOOD;
237		double  d, d2;
238		FVECT  disp;
239
240	<	disp[0] = p[0] - v->vp[0];
212	<	disp[1] = p[1] - v->vp[1];
213	<	disp[2] = p[2] - v->vp[2];
240	>	VSUB(disp, p, v->vp);
241
242		switch (v->type) {
243		case VT_PAR:                    /* parallel view */
#	Line 218 | Line 245 | FVECT  p;
245		break;
246		case VT_PER:                    /* perspective view */
247		d = DOT(disp,v->vdir);
248	+	if ((v->vaft > FTINY) & (d >= v->vaft))
249	+	rflags |= VL_BEYOND;
250		ip[2] = VLEN(disp);
251	<	if (d < 0.0) {          /* fold pyramid */
251	>	if (d < -FTINY) {       /* fold pyramid */
252		ip[2] = -ip[2];
253		d = -d;
254	<	}
255	<	if (d > FTINY) {
256	<	d = 1.0/d;
257	<	disp[0] *= d;
258	<	disp[1] *= d;
259	<	disp[2] *= d;
260	<	}
254	>	} else if (d <= FTINY)
255	>	return(VL_BAD); /* at infinite edge */
256	>	d = 1.0/d;
257	>	disp[0] *= d;
258	>	disp[1] *= d;
259	>	disp[2] *= d;
260	>	if (ip[2] < 0.0) d = -d;
261		ip[2] *= (1.0 - v->vfore*d);
262		break;
263		case VT_HEM:                    /* hemispherical fisheye */
#	Line 243 | Line 272 | FVECT  p;
272		d = DOT(disp,v->hvec);
273		d2 = DOT(disp,v->vdir);
274		ip[0] = 180.0/PI * atan2(d,d2) / v->horiz + 0.5 - v->hoff;
275	<	d = 1.0/sqrt(d*d + d2*d2);
275	>	d = d*d + d2*d2;
276	>	if (d <= FTINY*FTINY)
277	>	return(VL_BAD); /* at pole */
278	>	if ((v->vaft > FTINY) & (d >= v->vaft*v->vaft))
279	>	rflags |= VL_BEYOND;
280	>	d = 1.0/sqrt(d);
281		ip[1] = DOT(disp,v->vvec)*d/v->vn2 + 0.5 - v->voff;
282		ip[2] = VLEN(disp);
283		ip[2] *= (1.0 - v->vfore*d);
284	<	return;
284	>	goto gotall;
285		case VT_ANG:                    /* angular fisheye */
286		ip[0] = 0.5 - v->hoff;
287		ip[1] = 0.5 - v->voff;
288		ip[2] = normalize(disp) - v->vfore;
289		d = DOT(disp,v->vdir);
290		if (d >= 1.0-FTINY)
291	<	return;
291	>	goto gotall;
292		if (d <= -(1.0-FTINY)) {
293		ip[0] += 180.0/v->horiz;
294	<	return;
294	>	goto gotall;
295		}
296	<	d = acos(d)/PI / sqrt(1.0 - d*d);
297	<	ip[0] += DOT(disp,v->hvec)*d*180.0/v->horiz;
298	<	ip[1] += DOT(disp,v->vvec)*d*180.0/v->vert;
299	<	return;
296	>	d = (180.0/PI)*acos(d) / sqrt(1.0 - d*d);
297	>	ip[0] += DOT(disp,v->hvec)*d/v->horiz;
298	>	ip[1] += DOT(disp,v->vvec)*d/v->vert;
299	>	goto gotall;
300	>	case VT_PLS:                    /* planispheric fisheye */
301	>	ip[0] = 0.5 - v->hoff;
302	>	ip[1] = 0.5 - v->voff;
303	>	ip[2] = normalize(disp) - v->vfore;
304	>	d = DOT(disp,v->vdir);
305	>	if (d >= 1.0-FTINY)
306	>	goto gotall;
307	>	if (d <= -(1.0-FTINY))
308	>	return(VL_BAD);
309	>	ip[0] += DOT(disp,v->hvec)/((1. + d)*sqrt(v->hn2));
310	>	ip[1] += DOT(disp,v->vvec)/((1. + d)*sqrt(v->vn2));
311	>	goto gotall;
312	>	default:
313	>	return(VL_BAD);
314		}
315		ip[0] = DOT(disp,v->hvec)/v->hn2 + 0.5 - v->hoff;
316		ip[1] = DOT(disp,v->vvec)/v->vn2 + 0.5 - v->voff;
317	+	gotall:                                 /* add appropriate return flags */
318	+	if (ip[2] <= 0.0)
319	+	rflags |= VL_BEHIND;
320	+	else if ((v->type != VT_PER) & (v->type != VT_CYL))
321	+	rflags |= VL_BEYOND*((v->vaft > FTINY) &
322	+	(ip[2] >= v->vaft - v->vfore));
323	+	rflags |= VL_OUTSIDE*((0.0 >= ip[0]) | (ip[0] >= 1.0) |
324	+	(0.0 >= ip[1]) | (ip[1] >= 1.0));
325	+	return(rflags);
326		}
327
328
329		void
330	<	pix2loc(loc, rp, px, py)        /* compute image location from pixel pos. */
331	<	FLOAT  loc[2];
332	<	register RESOLU  *rp;
333	<	int  px, py;
330	>	pix2loc(                /* compute image location from pixel pos. */
331	>	RREAL  loc[2],
332	>	RESOLU  *rp,
333	>	int  px,
334	>	int  py
335	>	)
336		{
337	<	register int  x, y;
337	>	int  x, y;
338
339		if (rp->rt & YMAJOR) {
340		x = px;
#	Line 294 | Line 353 | int  px, py;
353
354
355		void
356	<	loc2pix(pp, rp, lx, ly)         /* compute pixel pos. from image location */
357	<	int  pp[2];
358	<	register RESOLU  *rp;
359	<	double  lx, ly;
356	>	loc2pix(                        /* compute pixel pos. from image location */
357	>	int  pp[2],
358	>	RESOLU  *rp,
359	>	double  lx,
360	>	double  ly
361	>	)
362		{
363	<	register int  x, y;
363	>	int  x, y;
364
365	<	x = lx * rp->xr;
366	<	y = ly * rp->yr;
365	>	x = (int)(lx*rp->xr + .5 - (lx < 0.0));
366	>	y = (int)(ly*rp->yr + .5 - (ly < 0.0));
367	>
368		if (rp->rt & XDECR)
369		x = rp->xr-1 - x;
370		if (rp->rt & YDECR)
#	Line 318 | Line 380 | double  lx, ly;
380
381
382		int
383	<	getviewopt(v, ac, av)                   /* process view argument */
384	<	register VIEW  *v;
385	<	int  ac;
386	<	register char  *av[];
383	>	getviewopt(                             /* process view argument */
384	>	VIEW  *v,
385	>	int  ac,
386	>	char  *av[]
387	>	)
388		{
389	<	#define check(c,l)      if ((av[0][c]&&av[0][c]!=' ') || \
389	>	#define check(c,l)      if ((av[0][c]&&!isspace(av[0][c])) || \
390		badarg(ac-1,av+1,l)) return(-1)
391
392		if (ac <= 0 || av[0][0] != '-' || av[0][1] != 'v')
393		return(-1);
394		switch (av[0][2]) {
395		case 't':                       /* type */
396	<	if (!av[0][3] || av[0][3]==' ')
396	>	if (!av[0][3] || isspace(av[0][3]))
397		return(-1);
398		check(4,"");
399		v->type = av[0][3];
#	Line 346 | Line 409 | register char  *av[];
409		v->vdir[0] = atof(av[1]);
410		v->vdir[1] = atof(av[2]);
411		v->vdir[2] = atof(av[3]);
412	+	v->vdist = 1.;
413		return(3);
414		case 'u':                       /* up */
415		check(3,"fff");
#	Line 385 | Line 449 | register char  *av[];
449
450
451		int
452	<	sscanview(vp, s)                        /* get view parameters from string */
453	<	VIEW  *vp;
454	<	register char  *s;
452	>	sscanview(                              /* get view parameters from string */
453	>	VIEW  *vp,
454	>	char  *s
455	>	)
456		{
457		int  ac;
458		char  *av[4];
459		int  na;
460		int  nvopts = 0;
461
462	<	if (*s != '-')
463	<	s = sskip2(s,1);
462	>	while (isspace(*s))
463	>	if (!*s++)
464	>	return(0);
465		while (*s) {
466		ac = 0;
467		do {
468	<	av[ac++] = s;
469	<	while (*s && *s != ' ')
468	>	if (ac || *s == '-')
469	>	av[ac++] = s;
470	>	while (*s && !isspace(*s))
471		s++;
472	<	while (*s == ' ')
472	>	while (isspace(*s))
473		s++;
474		} while (*s && ac < 4);
475		if ((na = getviewopt(vp, ac, av)) >= 0) {
#	Line 417 | Line 484 | register char  *s;
484
485
486		void
487	<	fprintview(vp, fp)                      /* write out view parameters */
488	<	register VIEW  *vp;
489	<	FILE  *fp;
487	>	fprintview(                             /* write out view parameters */
488	>	VIEW  *vp,
489	>	FILE  *fp
490	>	)
491		{
492		fprintf(fp, " -vt%c", vp->type);
493		fprintf(fp, " -vp %.6g %.6g %.6g", vp->vp[0], vp->vp[1], vp->vp[2]);
494	<	fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0], vp->vdir[1], vp->vdir[2]);
494	>	fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0]*vp->vdist,
495	>	vp->vdir[1]*vp->vdist,
496	>	vp->vdir[2]*vp->vdist);
497		fprintf(fp, " -vu %.6g %.6g %.6g", vp->vup[0], vp->vup[1], vp->vup[2]);
498		fprintf(fp, " -vh %.6g -vv %.6g", vp->horiz, vp->vert);
499		fprintf(fp, " -vo %.6g -va %.6g", vp->vfore, vp->vaft);
#	Line 432 | Line 502 | FILE  *fp;
502
503
504		char *
505	<	viewopt(vp)                             /* translate to minimal view string */
506	<	register VIEW  *vp;
505	>	viewopt(                                /* translate to minimal view string */
506	>	VIEW  *vp
507	>	)
508		{
509		static char  vwstr[128];
510	<	register char  *cp = vwstr;
510	>	char  *cp = vwstr;
511
512	+	*cp = '\0';
513		if (vp->type != stdview.type) {
514		sprintf(cp, " -vt%c", vp->type);
515		cp += strlen(cp);
#	Line 447 | Line 519 | register VIEW  *vp;
519		vp->vp[0], vp->vp[1], vp->vp[2]);
520		cp += strlen(cp);
521		}
522	<	if (!VEQ(vp->vdir,stdview.vdir)) {
522	>	if (!FEQ(vp->vdist,stdview.vdist) || !VEQ(vp->vdir,stdview.vdir)) {
523		sprintf(cp, " -vd %.6g %.6g %.6g",
524	<	vp->vdir[0], vp->vdir[1], vp->vdir[2]);
524	>	vp->vdir[0]*vp->vdist,
525	>	vp->vdir[1]*vp->vdist,
526	>	vp->vdir[2]*vp->vdist);
527		cp += strlen(cp);
528		}
529		if (!VEQ(vp->vup,stdview.vup)) {
#	Line 486 | Line 560 | register VIEW  *vp;
560
561
562		int
563	<	isview(s)                               /* is this a view string? */
564	<	char  *s;
563	>	isview(                                 /* is this a view string? */
564	>	char  *s
565	>	)
566		{
567	<	static char  *altname[]={NULL,VIEWSTR,"rpict","rview","pinterp",NULL};
567	>	static char  *altname[]={NULL,VIEWSTR,"rpict","rview","rvu","rpiece","pinterp",NULL};
568		extern char  *progname;
569	<	register char  *cp;
570	<	register char  **an;
569	>	char  *cp;
570	>	char  **an;
571		/* add program name to list */
572		if (altname[0] == NULL) {
573		for (cp = progname; *cp; cp++)
#	Line 503 | Line 578 | char  *s;
578		}
579		/* skip leading path */
580		cp = s;
581	<	while (*cp && *cp != ' ')
581	>	while (*cp && !isspace(*cp))
582		cp++;
583		while (cp > s && !ISDIRSEP(cp[-1]))
584		cp--;
#	Line 521 | Line 596 | struct myview {
596
597
598		static int
599	<	gethview(s, v)                          /* get view from header */
600	<	char  *s;
601	<	register struct myview  *v;
599	>	gethview(                               /* get view from header */
600	>	char  *s,
601	>	void  *v
602	>	)
603		{
604	<	if (isview(s) && sscanview(v->hv, s) > 0)
605	<	v->ok++;
604	>	if (isview(s) && sscanview(((struct myview*)v)->hv, s) > 0)
605	>	((struct myview*)v)->ok++;
606		return(0);
607		}
608
609
610		int
611	<	viewfile(fname, vp, rp)                 /* get view from file */
612	<	char  *fname;
613	<	VIEW  *vp;
614	<	RESOLU  *rp;
611	>	viewfile(                               /* get view from file */
612	>	char  *fname,
613	>	VIEW  *vp,
614	>	RESOLU  *rp
615	>	)
616		{
617		struct myview   mvs;
618		FILE  *fp;
#	Line 548 | Line 625 | RESOLU  *rp;
625		mvs.hv = vp;
626		mvs.ok = 0;
627
628	<	getheader(fp, (int (*)(char *, char *))&gethview, (char *)&mvs);
628	>	getheader(fp, gethview, &mvs);
629
630		if (rp != NULL && !fgetsresolu(rp, fp))
631		mvs.ok = 0;
632
633	<	fclose(fp);
633	>	if (fp != stdin)
634	>	fclose(fp);
635
636		return(mvs.ok);
637		}

Diff Legend

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