ViewVC Help

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

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

Comparing ray/src/rt/rv3.c (file contents):
Revision 1.15 by greg, Thu Mar 8 10:28:29 1990 UTC vs.
Revision 2.5 by greg, Thu Aug 5 13:05:01 1993 UTC

#	Line 19 | Line 19 | static char SCCSid[] = "$SunId$ LBL";
19		#include  "random.h"
20
21		#ifndef WFLUSH
22	<	#define WFLUSH          30              /* flush after this many rays */
22	>	#ifdef SPEED
23	>	#define WFLUSH          (5*SPEED)
24	>	#else
25	>	#define WFLUSH          100             /* flush after this many rays */
26		#endif
27	+	#endif
28
29	+	#ifdef  SMLFLT
30	+	#define  sscanvec(s,v)  (sscanf(s,"%f %f %f",v,v+1,v+2)==3)
31	+	#else
32	+	#define  sscanvec(s,v)  (sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
33	+	#endif
34
35	+
36		getrect(s, r)                           /* get a box */
37		char  *s;
38		register RECT  *r;
#	Line 87 | Line 97 | double  *mp;
97		error(COMMAND, "illegal magnification");
98		return(-1);
99		}
100	<	if (sscanf(s, "%*lf %lf %lf %lf", &vec[0], &vec[1], &vec[2]) != 3) {
100	>	if (!sscanvec(sskip(s), vec)) {
101		if (dev->getcur == NULL)
102		return(-1);
103		(*dev->comout)("Pick view center\n");
104		if ((*dev->getcur)(&x, &y) == ABORT)
105		return(-1);
106	<	viewray(thisray.rorg, thisray.rdir, &ourview,
107	<	(x+.5)/hresolu, (y+.5)/vresolu);
106	>	if (viewray(thisray.rorg, thisray.rdir, &ourview,
107	>	(x+.5)/hresolu, (y+.5)/vresolu) < 0) {
108	>	error(COMMAND, "not on image");
109	>	return(-1);
110	>	}
111		if (!direc || ourview.type == VT_PAR) {
112		rayorigin(&thisray, NULL, PRIMARY, 1.0);
113		if (!localhit(&thisray, &thescene)) {
#	Line 134 | Line 147 | paint(p, xmin, ymin, xmax, ymax)       /* compute and paint
147		register PNODE  *p;
148		int  xmin, ymin, xmax, ymax;
149		{
150	<	extern long  nrays;
151	<	static long  lastflush = 0;
150	>	extern unsigned long  nrays;
151	>	static unsigned long  lastflush = 0;
152		static RAY  thisray;
153		double  h, v;
141	–	register int  i;
154
155		if (xmax - xmin <= 0 || ymax - ymin <= 0) {     /* empty */
156		p->x = xmin;
#	Line 150 | Line 162 | int  xmin, ymin, xmax, ymax;
162		h = xmin + (xmax-xmin)*frandom();
163		v = ymin + (ymax-ymin)*frandom();
164
165	<	viewray(thisray.rorg, thisray.rdir, &ourview, h/hresolu, v/vresolu);
166	<	rayorigin(&thisray, NULL, PRIMARY, 1.0);
167	<	rayvalue(&thisray);
165	>	if (viewray(thisray.rorg, thisray.rdir, &ourview,
166	>	h/hresolu, v/vresolu) < 0) {
167	>	setcolor(thisray.rcol, 0.0, 0.0, 0.0);
168	>	} else {
169	>	rayorigin(&thisray, NULL, PRIMARY, 1.0);
170	>	samplendx++;
171	>	rayvalue(&thisray);
172	>	}
173
174		p->x = h;
175		p->y = v;
#	Line 172 | Line 189 | newimage()                             /* start a new image */
189		{
190		/* free old image */
191		freepkids(&ptrunk);
192	+	/* save reserve memory */
193	+	fillreserves();
194		/* compute resolution */
195		hresolu = dev->xsiz;
196		vresolu = dev->ysiz;
#	Line 366 | Line 385 | moveview(angle, elev, mag, vc)                 /* move viewpoint */
385		double  angle, elev, mag;
386		FVECT  vc;
387		{
369	–	extern double  sqrt(), dist2();
388		double  d;
389		FVECT  v1;
390		VIEW  nv;
#	Line 397 | Line 415 | FVECT  vc;
415		}
416
417
418	<	spinvector(vres, vorig, vnorm, theta)   /* rotate vector around normal */
419	<	FVECT  vres, vorig, vnorm;
420	<	double  theta;
418	>	zoomview(vp, zf)                        /* zoom in our out */
419	>	register VIEW  *vp;
420	>	double  zf;
421		{
422	<	extern double  sin(), cos();
423	<	double  sint, cost, dotp;
424	<	FVECT  vperp;
425	<	register int  i;
426	<
409	<	if (theta == 0.0) {
410	<	VCOPY(vres, vorig);
422	>	switch (vp->type) {
423	>	case VT_PAR:                            /* parallel view */
424	>	case VT_ANG:                            /* angular fisheye */
425	>	vp->horiz /= zf;
426	>	vp->vert /= zf;
427		return;
428	+	case VT_PER:                            /* perspective view */
429	+	vp->horiz = atan(tan(vp->horiz*(PI/180./2.))/zf) /
430	+	(PI/180./2.);
431	+	vp->vert = atan(tan(vp->vert*(PI/180./2.))/zf) /
432	+	(PI/180./2.);
433	+	return;
434	+	case VT_HEM:                            /* hemispherical fisheye */
435	+	vp->horiz = sin(vp->horiz*(PI/180./2.))/zf;
436	+	if (vp->horiz >= 1.0-FTINY)
437	+	vp->horiz = 180.;
438	+	else
439	+	vp->horiz = asin(vp->horiz) / (PI/180./2.);
440	+	vp->vert = sin(vp->vert*(PI/180./2.))/zf;
441	+	if (vp->vert >= 1.0-FTINY)
442	+	vp->vert = 180.;
443	+	else
444	+	vp->vert = asin(vp->vert) / (PI/180./2.);
445	+	return;
446		}
413	–	sint = sin(theta);
414	–	cost = cos(theta);
415	–	dotp = DOT(vorig, vnorm);
416	–	fcross(vperp, vnorm, vorig);
417	–	for (i = 0; i < 3; i++)
418	–	vres[i] = vnorm[i]*dotp*(1.-cost) +
419	–	vorig[i]*cost + vperp[i]*sint;
447		}

Diff Legend

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