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.5 by greg, Tue Jun 13 08:17:24 1989 UTC vs.
Revision 1.16 by greg, Tue Jun 26 09:00:19 1990 UTC

#	Line 12 | Line 12 | static char SCCSid[] = "$SunId$ LBL";
12
13		#include  "ray.h"
14
15	+	#include  "octree.h"
16	+
17		#include  "rpaint.h"
18
19		#include  "random.h"
20
21	+	#ifndef WFLUSH
22	+	#define WFLUSH          30              /* flush after this many rays */
23	+	#endif
24
25	+
26	+	getrect(s, r)                           /* get a box */
27	+	char  *s;
28	+	register RECT  *r;
29	+	{
30	+	int  x0, y0, x1, y1;
31	+
32	+	if (*s && !strncmp(s, "all", strlen(s))) {
33	+	r->l = r->d = 0;
34	+	r->r = hresolu;
35	+	r->u = vresolu;
36	+	return(0);
37	+	}
38	+	if (sscanf(s, "%d %d %d %d", &x0, &y0, &x1, &y1) != 4) {
39	+	if (dev->getcur == NULL)
40	+	return(-1);
41	+	(*dev->comout)("Pick first corner\n");
42	+	if ((*dev->getcur)(&x0, &y0) == ABORT)
43	+	return(-1);
44	+	(*dev->comout)("Pick second corner\n");
45	+	if ((*dev->getcur)(&x1, &y1) == ABORT)
46	+	return(-1);
47	+	}
48	+	if (x0 < x1) {
49	+	r->l = x0;
50	+	r->r = x1;
51	+	} else {
52	+	r->l = x1;
53	+	r->r = x0;
54	+	}
55	+	if (y0 < y1) {
56	+	r->d = y0;
57	+	r->u = y1;
58	+	} else {
59	+	r->d = y1;
60	+	r->u = y0;
61	+	}
62	+	if (r->l < 0) r->l = 0;
63	+	if (r->d < 0) r->d = 0;
64	+	if (r->r > hresolu) r->r = hresolu;
65	+	if (r->u > vresolu) r->u = vresolu;
66	+	if (r->l > r->r) r->l = r->r;
67	+	if (r->d > r->u) r->d = r->u;
68	+	return(0);
69	+	}
70	+
71	+
72	+	getinterest(s, direc, vec, mp)          /* get area of interest */
73	+	char  *s;
74	+	int  direc;
75	+	FVECT  vec;
76	+	double  *mp;
77	+	{
78	+	int  x, y;
79	+	RAY  thisray;
80	+	register int  i;
81	+
82	+	if (sscanf(s, "%lf", mp) != 1)
83	+	*mp = 1.0;
84	+	else if (*mp < -FTINY)          /* negative zoom is reduction */
85	+	*mp = -1.0 / *mp;
86	+	else if (*mp <= FTINY) {        /* too small */
87	+	error(COMMAND, "illegal magnification");
88	+	return(-1);
89	+	}
90	+	if (sscanf(s, "%*lf %lf %lf %lf", &vec[0], &vec[1], &vec[2]) != 3) {
91	+	if (dev->getcur == NULL)
92	+	return(-1);
93	+	(*dev->comout)("Pick view center\n");
94	+	if ((*dev->getcur)(&x, &y) == ABORT)
95	+	return(-1);
96	+	viewray(thisray.rorg, thisray.rdir, &ourview,
97	+	(x+.5)/hresolu, (y+.5)/vresolu);
98	+	if (!direc || ourview.type == VT_PAR) {
99	+	rayorigin(&thisray, NULL, PRIMARY, 1.0);
100	+	if (!localhit(&thisray, &thescene)) {
101	+	error(COMMAND, "not a local object");
102	+	return(-1);
103	+	}
104	+	}
105	+	if (direc)
106	+	if (ourview.type == VT_PAR)
107	+	for (i = 0; i < 3; i++)
108	+	vec[i] = thisray.rop[i] - ourview.vp[i];
109	+	else
110	+	VCOPY(vec, thisray.rdir);
111	+	else
112	+	VCOPY(vec, thisray.rop);
113	+	} else if (direc)
114	+	for (i = 0; i < 3; i++)
115	+	vec[i] -= ourview.vp[i];
116	+	return(0);
117	+	}
118	+
119	+
120		float *         /* keep consistent with COLOR typedef */
121		greyof(col)                             /* convert color to greyscale */
122		register COLOR  col;
#	Line 34 | Line 134 | paint(p, xmin, ymin, xmax, ymax)       /* compute and paint
134		register PNODE  *p;
135		int  xmin, ymin, xmax, ymax;
136		{
137	+	extern long  nrays;
138	+	static long  lastflush = 0;
139		static RAY  thisray;
140		double  h, v;
39	–	register int  i;
141
142		if (xmax - xmin <= 0 || ymax - ymin <= 0) {     /* empty */
143		p->x = xmin;
#	Line 45 | Line 146 | int  xmin, ymin, xmax, ymax;
146		return;
147		}
148		/* jitter ray direction */
149	<	p->x = h = xmin + (xmax-xmin)*frandom();
150	<	p->y = v = ymin + (ymax-ymin)*frandom();
149	>	h = xmin + (xmax-xmin)*frandom();
150	>	v = ymin + (ymax-ymin)*frandom();
151
152	<	rayview(thisray.rorg, thisray.rdir, &ourview, h, v);
52	<
152	>	viewray(thisray.rorg, thisray.rdir, &ourview, h/hresolu, v/vresolu);
153		rayorigin(&thisray, NULL, PRIMARY, 1.0);
54	–
154		rayvalue(&thisray);
155
156	+	p->x = h;
157	+	p->y = v;
158		copycolor(p->v, thisray.rcol);
58	–
159		scalecolor(p->v, exposure);
160
161		(*dev->paintr)(greyscale?greyof(p->v):p->v, xmin, ymin, xmax, ymax);
162	+
163	+	if (dev->flush != NULL && nrays - lastflush >= WFLUSH) {
164	+	lastflush = nrays;
165	+	(*dev->flush)();
166	+	}
167		}
168
169
#	Line 66 | Line 171 | newimage()                             /* start a new image */
171		{
172		/* free old image */
173		freepkids(&ptrunk);
174	<	/* set up frame */
175	<	if (ourview.hresolu > dev->xsiz || ourview.vresolu > dev->ysiz)
176	<	error(USER, "resolution mismatch");
174	>	/* compute resolution */
175	>	hresolu = dev->xsiz;
176	>	vresolu = dev->ysiz;
177	>	normaspect(viewaspect(&ourview), &dev->pixaspect, &hresolu, &vresolu);
178		pframe.l = pframe.d = 0;
179	<	pframe.r = ourview.hresolu; pframe.u = ourview.vresolu;
179	>	pframe.r = hresolu; pframe.u = vresolu;
180		pdepth = 0;
181		/* clear device */
182	<	(*dev->clear)(ourview.hresolu, ourview.vresolu);
182	>	(*dev->clear)(hresolu, vresolu);
183		/* get first value */
184	<	paint(&ptrunk, 0, 0, ourview.hresolu, ourview.vresolu);
184	>	paint(&ptrunk, 0, 0, hresolu, vresolu);
185		}
186
187
188		redraw()                                /* redraw the image */
189		{
190	<	(*dev->clear)(ourview.hresolu, ourview.vresolu);
190	>	(*dev->clear)(hresolu, vresolu);
191		(*dev->comout)("redrawing...\n");
192	<	repaint(0, 0, ourview.hresolu, ourview.vresolu);
192	>	repaint(0, 0, hresolu, vresolu);
193		(*dev->comout)("\n");
194		}
195
#	Line 96 | Line 202 | int  xmin, ymin, xmax, ymax;
202		reg.l = xmin; reg.r = xmax;
203		reg.d = ymin; reg.u = ymax;
204
205	<	paintrect(&ptrunk, 0, 0, ourview.hresolu, ourview.vresolu, &reg);
205	>	paintrect(&ptrunk, 0, 0, hresolu, vresolu, &reg);
206		}
207
208
#	Line 107 | Line 213 | register RECT  *r;
213		{
214		int  mx, my;
215
110	–	if (dev->inpready)
111	–	return;                         /* break for input */
112	–
216		if (xmax - xmin <= 0 || ymax - ymin <= 0)
217		return;
218
#	Line 247 | Line 350 | register VIEW  *vp;
350		{
351		char  *err;
352
353	<	if (vp->hresolu > dev->xsiz || vp->vresolu > dev->ysiz) {
251	<	error(COMMAND, "view not set - resolution mismatch");
252	<	} else if ((err = setview(vp)) != NULL) {
353	>	if ((err = setview(vp)) != NULL) {
354		sprintf(errmsg, "view not set - %s", err);
355		error(COMMAND, errmsg);
356	<	} else if (bcmp(vp, &ourview, sizeof(VIEW))) {
357	<	bcopy(&ourview, &oldview, sizeof(VIEW));
358	<	bcopy(vp, &ourview, sizeof(VIEW));
356	>	} else if (bcmp((char *)vp, (char *)&ourview, sizeof(VIEW))) {
357	>	copystruct(&oldview, &ourview);
358	>	copystruct(&ourview, vp);
359		newimage();
360		}
361		}
#	Line 271 | Line 372 | FVECT  vc;
372		register int  i;
373
374		VCOPY(nv.vup, ourview.vup);
375	<	nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu;
375	>	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
376		spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.));
377		if (elev != 0.0) {
378		fcross(v1, ourview.vup, nv.vdir);

Diff Legend

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