ViewVC Help

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

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

Comparing ray/src/rt/rv2.c (file contents):
Revision 1.4 by greg, Tue May 30 09:57:13 1989 UTC vs.
Revision 1.14 by greg, Mon Jan 8 13:38:05 1990 UTC

#	Line 28 | Line 28 | extern char  *progname;
28		getframe(s)                             /* get a new frame */
29		char  *s;
30		{
31	<	int  x0, y0, x1, y1;
32	<
33	<	if (!strcmp("all", s)) {
34	<	pframe.l = pframe.d = 0;
35	<	pframe.r = ourview.hresolu;
36	<	pframe.u = ourview.vresolu;
37	<	pdepth = 0;
31	>	if (getrect(s, &pframe) < 0)
32		return;
39	–	}
40	–	if (sscanf(s, "%d %d %d %d", &x0, &y0, &x1, &y1) != 4) {
41	–	if (dev->getcur == NULL)
42	–	return;
43	–	(*dev->comout)("Pick first corner\n");
44	–	if ((*dev->getcur)(&x0, &y0) == ABORT)
45	–	return;
46	–	(*dev->comout)("Pick second corner\n");
47	–	if ((*dev->getcur)(&x1, &y1) == ABORT)
48	–	return;
49	–	}
50	–	if (x0 < x1) {
51	–	pframe.l = x0;
52	–	pframe.r = x1;
53	–	} else {
54	–	pframe.l = x1;
55	–	pframe.r = x0;
56	–	}
57	–	if (y0 < y1) {
58	–	pframe.d = y0;
59	–	pframe.u = y1;
60	–	} else {
61	–	pframe.d = y1;
62	–	pframe.u = y0;
63	–	}
64	–	if (pframe.l < 0) pframe.l = 0;
65	–	if (pframe.d < 0) pframe.d = 0;
66	–	if (pframe.r > ourview.hresolu) pframe.r = ourview.hresolu;
67	–	if (pframe.u > ourview.vresolu) pframe.u = ourview.vresolu;
33		pdepth = 0;
34		}
35
36
37	+	getrepaint(s)                           /* get area and repaint */
38	+	char  *s;
39	+	{
40	+	RECT  box;
41	+
42	+	if (getrect(s, &box) < 0)
43	+	return;
44	+	paintrect(&ptrunk, 0, 0, hresolu, vresolu, &box);
45	+	}
46	+
47	+
48		getview(s)                              /* get/show view parameters */
49		char  *s;
50		{
51		FILE  *fp;
52		char  buf[128];
53	<	char  *fname, *getpath();
53	>	char  *fname;
54		int  change = 0;
55		VIEW  nv;
56
57		if (sscanf(s, "%s", buf) == 1) {        /* write parameters to a file */
58	<	if ((fname = getpath(buf, NULL)) == NULL ||
58	>	if ((fname = getpath(buf, NULL, 0)) == NULL ||
59		(fp = fopen(fname, "a")) == NULL) {
60		sprintf(errmsg, "cannot open \"%s\"", buf);
61		error(COMMAND, errmsg);
#	Line 137 | Line 113 | char  *s;
113		else {
114		nv.horiz = ourview.horiz; nv.vert = ourview.vert;
115		}
116	<	sprintf(buf, "x and y resolution (%d %d): ",
117	<	ourview.hresolu, ourview.vresolu);
116	>	sprintf(buf, "view shift and lift (%.6g %.6g): ",
117	>	ourview.hoff, ourview.voff);
118		(*dev->comout)(buf);
119		(*dev->comin)(buf);
120		if (buf[0] == CTRL(C)) return;
121	<	if (sscanf(buf, "%d %d", &nv.hresolu, &nv.vresolu) == 2)
121	>	if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2)
122		change++;
123		else {
124	<	nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu;
124	>	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
125		}
126		if (change)
127		newview(&nv);
#	Line 156 | Line 132 | lastview(s)                            /* return to a previous view */
132		char  *s;
133		{
134		char  buf[128];
135	<	char  *fname, *getpath();
135	>	char  *fname;
136		int  success;
137		VIEW  nv;
138
139		if (sscanf(s, "%s", buf) == 1) {        /* get parameters from a file */
140	<	bcopy(&stdview, &nv, sizeof(VIEW));
141	<	if ((fname = getpath(buf, NULL)) == NULL ||
140	>	copyview(&nv, &stdview);
141	>	if ((fname = getpath(buf, NULL, 0)) == NULL ||
142		(success = viewfile(fname, &nv)) == -1) {
143		sprintf(errmsg, "cannot open \"%s\"", buf);
144		error(COMMAND, errmsg);
#	Line 174 | Line 150 | char  *s;
150		newview(&nv);
151		return;
152		}
153	<	if (oldview.hresolu == 0) {     /* no old view! */
153	>	if (oldview.horiz == 0) {       /* no old view! */
154		error(COMMAND, "no previous view");
155		return;
156		}
157	<	bcopy(&ourview, &nv, sizeof(VIEW));
158	<	bcopy(&oldview, &ourview, sizeof(VIEW));
159	<	bcopy(&nv, &oldview, sizeof(VIEW));
157	>	copyview(&nv, &ourview);
158	>	copyview(&ourview, &oldview);
159	>	copyview(&oldview, &nv);
160		newimage();
161		}
162
163
188	–	getinterest(s, direc, vec, mp)          /* get area of interest */
189	–	char  *s;
190	–	int  direc;
191	–	FVECT  vec;
192	–	double  *mp;
193	–	{
194	–	int  x, y;
195	–	RAY  thisray;
196	–	register int  i;
197	–
198	–	if (sscanf(s, "%lf", mp) != 1)
199	–	*mp = 1.0;
200	–	else if (*mp < -FTINY)          /* negative zoom is reduction */
201	–	*mp = -1.0 / *mp;
202	–	else if (*mp <= FTINY) {        /* too small */
203	–	error(COMMAND, "illegal magnification");
204	–	return(-1);
205	–	}
206	–	if (sscanf(s, "%*lf %lf %lf %lf", &vec[0], &vec[1], &vec[2]) != 3) {
207	–	if (dev->getcur == NULL)
208	–	return(-1);
209	–	(*dev->comout)("Pick view center\n");
210	–	if ((*dev->getcur)(&x, &y) == ABORT)
211	–	return(-1);
212	–	rayview(thisray.rorg, thisray.rdir, &ourview, x+.5, y+.5);
213	–	if (!direc || ourview.type == VT_PAR) {
214	–	rayorigin(&thisray, NULL, PRIMARY, 1.0);
215	–	if (!localhit(&thisray, &thescene)) {
216	–	error(COMMAND, "not a local object");
217	–	return(-1);
218	–	}
219	–	}
220	–	if (direc)
221	–	if (ourview.type == VT_PAR)
222	–	for (i = 0; i < 3; i++)
223	–	vec[i] = thisray.rop[i] - ourview.vp[i];
224	–	else
225	–	VCOPY(vec, thisray.rdir);
226	–	else
227	–	VCOPY(vec, thisray.rop);
228	–	} else if (direc)
229	–	for (i = 0; i < 3; i++)
230	–	vec[i] -= ourview.vp[i];
231	–	return(0);
232	–	}
233	–
234	–
164		getaim(s)                               /* aim camera */
165		char  *s;
166		{
#	Line 243 | Line 172 | char  *s;
172		return;
173		VCOPY(nv.vp, ourview.vp);
174		VCOPY(nv.vup, ourview.vup);
175	<	nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu;
175	>	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
176		if ((nv.type = ourview.type) == VT_PAR) {
177		nv.horiz = ourview.horiz / zfact;
178		nv.vert = ourview.vert / zfact;
#	Line 284 | Line 213 | char  *s;
213		}
214		VCOPY(nv.vp, ourview.vp);
215		VCOPY(nv.vup, ourview.vup);
216	<	nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu;
216	>	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
217		spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.));
218		if (elev != 0.0) {
219		fcross(v1, nv.vdir, ourview.vup);
#	Line 341 | Line 270 | char  *s;
270		if ((*dev->getcur)(&x, &y) == ABORT)
271		return;
272		r.l = r.d = 0;
273	<	r.r = ourview.hresolu; r.u = ourview.vresolu;
273	>	r.r = hresolu; r.u = vresolu;
274		p = findrect(x, y, &ptrunk, &r, -1);
275		e = 1.0;
276		} else {
#	Line 369 | Line 298 | char  *s;
298		e *= atof(cp);
299		}
300		if (p != NULL) {                /* relative setting */
301	<	if (intens(p->v) <= FTINY) {
301	>	if (bright(p->v) <= FTINY) {
302		error(COMMAND, "cannot normalize to zero");
303		return;
304		}
305	<	e *= 0.5 / intens(p->v);
305	>	e *= 0.5 / bright(p->v);
306		}
307		if (e <= FTINY || fabs(1.0 - e) <= FTINY)
308		return;
#	Line 391 | Line 320 | register char  *s;
320		extern double  minweight;
321		extern int  maxdepth;
322		extern double  dstrsrc;
323	+	extern double  shadthresh;
324	+	extern double  shadcert;
325		extern COLOR  ambval;
326		extern double  ambacc;
327		extern double  minarad;
#	Line 403 | Line 334 | register char  *s;
334		char  buf[128];
335
336		if (s[0] == '\0') {
337	<	(*dev->comout)("aa ab ad ar as av ds lr lw sd sp: ");
337	>	(*dev->comout)("aa ab ad ar as av dc dj dt lr lw sp st: ");
338		(*dev->comin)(buf);
339		s = buf;
340		}
#	Line 436 | Line 367 | register char  *s;
367		goto badparam;
368		}
369		break;
370	<	case 'd':                       /* distribute source */
371	<	if (s[1] != 's')
370	>	case 'd':                       /* direct */
371	>	switch (s[1]) {
372	>	case 'j':                       /* jitter */
373	>	if (sscanf(s+2, "%lf", &d0) != 1) {
374	>	sprintf(buf, "direct jitter (%.6g): ",
375	>	dstrsrc);
376	>	(*dev->comout)(buf);
377	>	(*dev->comin)(buf);
378	>	if (sscanf(buf, "%lf", &d0) != 1)
379	>	break;
380	>	}
381	>	dstrsrc = d0;
382	>	break;
383	>	case 'c':                       /* certainty */
384	>	if (sscanf(s+2, "%lf", &d0) != 1) {
385	>	sprintf(buf, "direct certainty (%.6g): ",
386	>	shadcert);
387	>	(*dev->comout)(buf);
388	>	(*dev->comin)(buf);
389	>	if (sscanf(buf, "%lf", &d0) != 1)
390	>	break;
391	>	}
392	>	shadcert = d0;
393	>	break;
394	>	case 't':                       /* threshold */
395	>	if (sscanf(s+2, "%lf", &d0) != 1) {
396	>	sprintf(buf, "direct threshold (%.6g): ",
397	>	shadthresh);
398	>	(*dev->comout)(buf);
399	>	(*dev->comin)(buf);
400	>	if (sscanf(buf, "%lf", &d0) != 1)
401	>	break;
402	>	}
403	>	shadthresh = d0;
404	>	break;
405	>	default:
406		goto badparam;
442	–	if (sscanf(s+2, "%lf", &d0) != 1) {
443	–	sprintf(buf, "distribute source (%.6g): ", dstrsrc);
444	–	(*dev->comout)(buf);
445	–	(*dev->comin)(buf);
446	–	if (sscanf(buf, "%lf", &d0) != 1)
447	–	break;
407		}
449	–	dstrsrc = d0;
408		break;
409		case 'a':                       /* ambient */
410		switch (s[1]) {
#	Line 538 | Line 496 | register char  *s;
496		psample = i0;
497		pdepth = 0;
498		break;
499	<	case 'd':                       /* difference */
499	>	case 't':                       /* threshold */
500		if (sscanf(s+2, "%lf", &d0) != 1) {
501	<	sprintf(buf, "sample difference (%.6g): ",
501	>	sprintf(buf, "sample threshold (%.6g): ",
502		maxdiff);
503		(*dev->comout)(buf);
504		(*dev->comin)(buf);
#	Line 582 | Line 540 | char  *s;
540		if ((*dev->getcur)(&x, &y) == ABORT)
541		return;
542
543	<	rayview(thisray.rorg, thisray.rdir, &ourview, x+.5, y+.5);
543	>	viewray(thisray.rorg, thisray.rdir, &ourview,
544	>	(x+.5)/hresolu, (y+.5)/vresolu);
545
546		} else if (normalize(thisray.rdir) == 0.0) {
547		error(COMMAND, "zero ray direction");
#	Line 624 | Line 583 | writepict(s)                           /* write the picture to a file */
583		char  *s;
584		{
585		static char  buf[128];
586	<	char  *fname, *getpath();
586	>	char  *fname;
587		FILE  *fp;
588		COLR  *scanline;
589		int  y;
#	Line 633 | Line 592 | char  *s;
592		error(COMMAND, "no file");
593		return;
594		}
595	<	if ((fname = getpath(buf, NULL)) == NULL ||
595	>	if ((fname = getpath(buf, NULL, 0)) == NULL ||
596		(fp = fopen(fname, "w")) == NULL) {
597		sprintf(errmsg, "cannot open \"%s\"", buf);
598		error(COMMAND, errmsg);
#	Line 645 | Line 604 | char  *s;
604		/* write header */
605		fputs(progname, fp);
606		fprintview(&ourview, fp);
607	<	fputs("\n", fp);
607	>	putc('\n', fp);
608		if (exposure != 1.0)
609	<	fprintf(fp, "EXPOSURE=%e\n", exposure);
610	<	fprintf(fp, "\n-Y %d +X %d\n", ourview.vresolu, ourview.hresolu);
609	>	fputexpos(exposure, fp);
610	>	putc('\n', fp);
611	>	fputresolu(YMAJOR|YDECR, hresolu, vresolu, fp);
612
613	<	scanline = (COLR *)malloc(ourview.hresolu*sizeof(COLR));
613	>	scanline = (COLR *)malloc(hresolu*sizeof(COLR));
614		if (scanline == NULL)
615		error(SYSTEM, "out of memory in writepict");
616	<	for (y = ourview.vresolu-1; y >= 0; y--) {
617	<	getpictcolrs(y, scanline, &ptrunk,
618	<	ourview.hresolu, ourview.vresolu);
659	<	if (fwritecolrs(scanline, ourview.hresolu, fp) < 0)
616	>	for (y = vresolu-1; y >= 0; y--) {
617	>	getpictcolrs(y, scanline, &ptrunk, hresolu, vresolu);
618	>	if (fwritecolrs(scanline, hresolu, fp) < 0)
619		break;
620		}
621		if (fclose(fp) < 0)

Diff Legend

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