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.14 by greg, Mon Jan 8 13:38:05 1990 UTC vs.
Revision 2.3 by greg, Thu Dec 19 14:54:55 1991 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1987 Regents of the University of California */
1	>	/* Copyright (c) 1991 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 18 | Line 18 | static char SCCSid[] = "$SunId$ LBL";
18
19		#include  "rpaint.h"
20
21	+	#include  "resolu.h"
22	+
23		#include  <ctype.h>
24
25		#define  CTRL(c)        ('c'-'@')
26
27	+	extern char  VersionID[];
28		extern char  *progname;
29	+	extern char  *octname;
30
31
32		getframe(s)                             /* get a new frame */
#	Line 63 | Line 67 | char  *s;
67		}
68		fputs(progname, fp);
69		fprintview(&ourview, fp);
70	+	fputs(sskip(s), fp);
71		fputs("\n", fp);
72		fclose(fp);
73		return;
74		}
75		sprintf(buf, "view type (%c): ", ourview.type);
76		(*dev->comout)(buf);
77	<	(*dev->comin)(buf);
77	>	(*dev->comin)(buf, NULL);
78		if (buf[0] == CTRL(C)) return;
79		if (buf[0] && buf[0] != ourview.type) {
80		nv.type = buf[0];
#	Line 79 | Line 84 | char  *s;
84		sprintf(buf, "view point (%.6g %.6g %.6g): ",
85		ourview.vp[0], ourview.vp[1], ourview.vp[2]);
86		(*dev->comout)(buf);
87	<	(*dev->comin)(buf);
87	>	(*dev->comin)(buf, NULL);
88		if (buf[0] == CTRL(C)) return;
89		if (sscanf(buf, "%lf %lf %lf", &nv.vp[0], &nv.vp[1], &nv.vp[2]) == 3)
90		change++;
#	Line 88 | Line 93 | char  *s;
93		sprintf(buf, "view direction (%.6g %.6g %.6g): ",
94		ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]);
95		(*dev->comout)(buf);
96	<	(*dev->comin)(buf);
96	>	(*dev->comin)(buf, NULL);
97		if (buf[0] == CTRL(C)) return;
98		if (sscanf(buf,"%lf %lf %lf",&nv.vdir[0],&nv.vdir[1],&nv.vdir[2]) == 3)
99		change++;
#	Line 97 | Line 102 | char  *s;
102		sprintf(buf, "view up (%.6g %.6g %.6g): ",
103		ourview.vup[0], ourview.vup[1], ourview.vup[2]);
104		(*dev->comout)(buf);
105	<	(*dev->comin)(buf);
105	>	(*dev->comin)(buf, NULL);
106		if (buf[0] == CTRL(C)) return;
107		if (sscanf(buf,"%lf %lf %lf",&nv.vup[0],&nv.vup[1],&nv.vup[2]) == 3)
108		change++;
#	Line 106 | Line 111 | char  *s;
111		sprintf(buf, "view horiz and vert size (%.6g %.6g): ",
112		ourview.horiz, ourview.vert);
113		(*dev->comout)(buf);
114	<	(*dev->comin)(buf);
114	>	(*dev->comin)(buf, NULL);
115		if (buf[0] == CTRL(C)) return;
116		if (sscanf(buf, "%lf %lf", &nv.horiz, &nv.vert) == 2)
117		change++;
#	Line 116 | Line 121 | char  *s;
121		sprintf(buf, "view shift and lift (%.6g %.6g): ",
122		ourview.hoff, ourview.voff);
123		(*dev->comout)(buf);
124	<	(*dev->comin)(buf);
124	>	(*dev->comin)(buf, NULL);
125		if (buf[0] == CTRL(C)) return;
126		if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2)
127		change++;
#	Line 137 | Line 142 | char  *s;
142		VIEW  nv;
143
144		if (sscanf(s, "%s", buf) == 1) {        /* get parameters from a file */
145	<	copyview(&nv, &stdview);
145	>	copystruct(&nv, &stdview);
146		if ((fname = getpath(buf, NULL, 0)) == NULL ||
147	<	(success = viewfile(fname, &nv)) == -1) {
147	>	(success = viewfile(fname, &nv, NULL)) == -1) {
148		sprintf(errmsg, "cannot open \"%s\"", buf);
149		error(COMMAND, errmsg);
150		return;
#	Line 150 | Line 155 | char  *s;
155		newview(&nv);
156		return;
157		}
158	<	if (oldview.horiz == 0) {       /* no old view! */
158	>	if (oldview.type == 0) {        /* no old view! */
159		error(COMMAND, "no previous view");
160		return;
161		}
162	<	copyview(&nv, &ourview);
163	<	copyview(&ourview, &oldview);
164	<	copyview(&oldview, &nv);
162	>	copystruct(&nv, &ourview);
163	>	copystruct(&ourview, &oldview);
164	>	copystruct(&oldview, &nv);
165		newimage();
166		}
167
#	Line 170 | Line 175 | char  *s;
175
176		if (getinterest(s, 1, nv.vdir, &zfact) < 0)
177		return;
178	+	nv.type = ourview.type;
179		VCOPY(nv.vp, ourview.vp);
180		VCOPY(nv.vup, ourview.vup);
181		nv.hoff = ourview.hoff; nv.voff = ourview.voff;
182	<	if ((nv.type = ourview.type) == VT_PAR) {
183	<	nv.horiz = ourview.horiz / zfact;
178	<	nv.vert = ourview.vert / zfact;
179	<	} else {
180	<	nv.horiz = atan(tan(ourview.horiz*(PI/180./2.))/zfact) /
181	<	(PI/180./2.);
182	<	nv.vert = atan(tan(ourview.vert*(PI/180./2.))/zfact) /
183	<	(PI/180./2.);
184	<	}
182	>	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
183	>	zoomview(&nv, zfact);
184		newview(&nv);
185		}
186
#	Line 211 | Line 210 | char  *s;
210		error(COMMAND, "missing angle");
211		return;
212		}
213	+	nv.type = ourview.type;
214		VCOPY(nv.vp, ourview.vp);
215		VCOPY(nv.vup, ourview.vup);
216		nv.hoff = ourview.hoff; nv.voff = ourview.voff;
#	Line 220 | Line 220 | char  *s;
220		normalize(v1);
221		spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.));
222		}
223	<	if ((nv.type = ourview.type) == VT_PAR) {
224	<	nv.horiz = ourview.horiz / zfact;
225	<	nv.vert = ourview.vert / zfact;
226	<	} else {
227	<	nv.horiz = atan(tan(ourview.horiz*(PI/180./2.))/zfact) /
228	<	(PI/180./2.);
229	<	nv.vert = atan(tan(ourview.vert*(PI/180./2.))/zfact) /
230	<	(PI/180./2.);
231	<	}
223	>	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
224	>	zoomview(&nv, zfact);
225		newview(&nv);
226		}
227
#	Line 253 | Line 246 | register char  *s;
246		getexposure(s)                          /* get new exposure */
247		char  *s;
248		{
256	–	double  atof(), pow(), fabs();
249		char  buf[128];
250		register char  *cp;
251		register PNODE  *p;
#	Line 282 | Line 274 | char  *s;
274		if (*cp == '\0') {      /* interactive */
275		sprintf(buf, "exposure (%lf): ", exposure);
276		(*dev->comout)(buf);
277	<	(*dev->comin)(buf);
277	>	(*dev->comin)(buf, NULL);
278		for (cp = buf; isspace(*cp); cp++)
279		;
280		if (*cp == '\0')
#	Line 312 | Line 304 | char  *s;
304		}
305
306
307	+	getparam(str, dsc, typ, ptr)            /* get variable from user */
308	+	char  *str, *dsc;
309	+	int  typ;
310	+	register union {int i; double d; COLOR C;}  *ptr;
311	+	{
312	+	extern char  *index();
313	+	int  i0;
314	+	double  d0, d1, d2;
315	+	char  buf[48];
316	+
317	+	switch (typ) {
318	+	case 'i':                       /* integer */
319	+	if (sscanf(str, "%d", &i0) != 1) {
320	+	(*dev->comout)(dsc);
321	+	sprintf(buf, " (%d): ", ptr->i);
322	+	(*dev->comout)(buf);
323	+	(*dev->comin)(buf, NULL);
324	+	if (sscanf(buf, "%d", &i0) != 1)
325	+	return(0);
326	+	}
327	+	ptr->i = i0;
328	+	return(1);
329	+	case 'r':                       /* real */
330	+	if (sscanf(str, "%lf", &d0) != 1) {
331	+	(*dev->comout)(dsc);
332	+	sprintf(buf, " (%.6g): ", ptr->d);
333	+	(*dev->comout)(buf);
334	+	(*dev->comin)(buf, NULL);
335	+	if (sscanf(buf, "%lf", &d0) != 1)
336	+	return(0);
337	+	}
338	+	ptr->d = d0;
339	+	return(1);
340	+	case 'b':                       /* boolean */
341	+	if (sscanf(str, "%1s", buf) != 1) {
342	+	(*dev->comout)(dsc);
343	+	sprintf(buf, "? (%c): ", ptr->i ? 'y' : 'n');
344	+	(*dev->comout)(buf);
345	+	(*dev->comin)(buf, NULL);
346	+	if (buf[0] == '\0' ||
347	+	index("yY+1tTnN-0fF", buf[0]) == NULL)
348	+	return(0);
349	+	}
350	+	ptr->i = index("yY+1tT", buf[0]) != NULL;
351	+	return(1);
352	+	case 'C':                       /* color */
353	+	if (sscanf(str, "%lf %lf %lf", &d0, &d1, &d2) != 3) {
354	+	(*dev->comout)(dsc);
355	+	sprintf(buf, " (%.6g %.6g %.6g): ",
356	+	colval(ptr->C,RED),
357	+	colval(ptr->C,GRN),
358	+	colval(ptr->C,BLU));
359	+	(*dev->comout)(buf);
360	+	(*dev->comin)(buf, NULL);
361	+	if (sscanf(buf, "%lf %lf %lf", &d0, &d1, &d2) != 3)
362	+	return(0);
363	+	}
364	+	setcolor(ptr->C, d0, d1, d2);
365	+	return(1);
366	+	}
367	+	}
368	+
369	+
370		setparam(s)                             /* get/set program parameter */
371		register char  *s;
372		{
#	Line 329 | Line 384 | register char  *s;
384		extern int  ambdiv;
385		extern int  ambssamp;
386		extern int  ambounce;
387	<	int  i0;
388	<	double  d0, d1, d2;
387	>	extern int  directinvis;
388	>	extern double  srcsizerat;
389	>	extern int  do_irrad;
390		char  buf[128];
391
392		if (s[0] == '\0') {
393	<	(*dev->comout)("aa ab ad ar as av dc dj dt lr lw sp st: ");
394	<	(*dev->comin)(buf);
393	>	(*dev->comout)(
394	>	"aa ab ad ar as av b dc di dj ds dt i lr lw sp st: ");
395	>	(*dev->comin)(buf, NULL);
396		s = buf;
397		}
398		switch (s[0]) {
399		case 'l':                       /* limit */
400		switch (s[1]) {
401		case 'w':                       /* weight */
402	<	if (sscanf(s+2, "%lf", &d0) != 1) {
346	<	sprintf(buf, "limit weight (%.6g): ",
347	<	minweight);
348	<	(*dev->comout)(buf);
349	<	(*dev->comin)(buf);
350	<	if (sscanf(buf, "%lf", &d0) != 1)
351	<	break;
352	<	}
353	<	minweight = d0;
402	>	getparam(s+2, "limit weight", 'r', &minweight);
403		break;
404		case 'r':                       /* reflection */
405	<	if (sscanf(s+2, "%d", &i0) != 1) {
357	<	sprintf(buf, "limit reflection (%d): ",
358	<	maxdepth);
359	<	(*dev->comout)(buf);
360	<	(*dev->comin)(buf);
361	<	if (sscanf(buf, "%d", &i0) != 1)
362	<	break;
363	<	}
364	<	maxdepth = i0;
405	>	getparam(s+2, "limit reflection", 'i', &maxdepth);
406		break;
407		default:
408		goto badparam;
#	Line 370 | Line 411 | register char  *s;
411		case 'd':                       /* direct */
412		switch (s[1]) {
413		case 'j':                       /* jitter */
414	<	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;
414	>	getparam(s+2, "direct jitter", 'r', &dstrsrc);
415		break;
416		case 'c':                       /* certainty */
417	<	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;
417	>	getparam(s+2, "direct certainty", 'r', &shadcert);
418		break;
419		case 't':                       /* threshold */
420	<	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;
420	>	getparam(s+2, "direct threshold", 'r', &shadthresh);
421		break;
422	+	case 'i':                       /* invisibility */
423	+	getparam(s+2, "direct invisibility",
424	+	'b', &directinvis);
425	+	break;
426	+	case 's':                       /* sampling */
427	+	getparam(s+2, "direct sampling", 'r', &srcsizerat);
428	+	break;
429		default:
430		goto badparam;
431		}
432		break;
433	+	case 'b':                       /* black and white */
434	+	getparam(s+1, "black and white", 'b', &greyscale);
435	+	break;
436	+	case 'i':                       /* irradiance */
437	+	getparam(s+1, "irradiance", 'b', &do_irrad);
438	+	break;
439		case 'a':                       /* ambient */
440		switch (s[1]) {
441		case 'v':                       /* value */
442	<	if (sscanf(s+2, "%lf %lf %lf", &d0, &d1, &d2) != 3) {
413	<	sprintf(buf,
414	<	"ambient value (%.6g %.6g %.6g): ",
415	<	colval(ambval,RED),
416	<	colval(ambval,GRN),
417	<	colval(ambval,BLU));
418	<	(*dev->comout)(buf);
419	<	(*dev->comin)(buf);
420	<	if (sscanf(buf, "%lf %lf %lf",
421	<	&d0, &d1, &d2) != 3)
422	<	break;
423	<	}
424	<	setcolor(ambval, d0, d1, d2);
442	>	getparam(s+2, "ambient value", 'C', ambval);
443		break;
444		case 'a':                       /* accuracy */
445	<	if (sscanf(s+2, "%lf", &d0) != 1) {
428	<	sprintf(buf, "ambient accuracy (%.6g): ",
429	<	ambacc);
430	<	(*dev->comout)(buf);
431	<	(*dev->comin)(buf);
432	<	if (sscanf(buf, "%lf", &d0) != 1)
433	<	break;
434	<	}
435	<	ambacc = d0;
445	>	getparam(s+2, "ambient accuracy", 'r', &ambacc);
446		break;
447		case 'd':                       /* divisions */
448	<	if (sscanf(s+2, "%d", &i0) != 1) {
439	<	sprintf(buf, "ambient divisions (%d): ",
440	<	ambdiv);
441	<	(*dev->comout)(buf);
442	<	(*dev->comin)(buf);
443	<	if (sscanf(buf, "%d", &i0) != 1)
444	<	break;
445	<	}
446	<	ambdiv = i0;
448	>	getparam(s+2, "ambient divisions", 'i', &ambdiv);
449		break;
450		case 's':                       /* samples */
451	<	if (sscanf(s+2, "%d", &i0) != 1) {
450	<	sprintf(buf, "ambient super-samples (%d): ",
451	<	ambssamp);
452	<	(*dev->comout)(buf);
453	<	(*dev->comin)(buf);
454	<	if (sscanf(buf, "%d", &i0) != 1)
455	<	break;
456	<	}
457	<	ambssamp = i0;
451	>	getparam(s+2, "ambient super-samples", 'i', &ambssamp);
452		break;
453		case 'b':                       /* bounces */
454	<	if (sscanf(s+2, "%d", &i0) != 1) {
461	<	sprintf(buf, "ambient bounces (%d): ",
462	<	ambounce);
463	<	(*dev->comout)(buf);
464	<	(*dev->comin)(buf);
465	<	if (sscanf(buf, "%d", &i0) != 1)
466	<	break;
467	<	}
468	<	ambounce = i0;
454	>	getparam(s+2, "ambient bounces", 'i', &ambounce);
455		break;
456		case 'r':
457	<	if (sscanf(s+2, "%d", &i0) != 1) {
458	<	sprintf(buf, "ambient resolution (%d): ",
459	<	ambres);
474	<	(*dev->comout)(buf);
475	<	(*dev->comin)(buf);
476	<	if (sscanf(buf, "%d", &i0) != 1)
477	<	break;
478	<	}
479	<	ambres = i0;
480	<	minarad = ambres > 0 ? thescene.cusize/ambres : 0.0;
457	>	if (getparam(s+2, "ambient resolution", 'i', &ambres))
458	>	minarad = ambres > 0 ?
459	>	thescene.cusize/ambres : 0.0;
460		break;
461		default:
462		goto badparam;
#	Line 486 | Line 465 | register char  *s;
465		case 's':                       /* sample */
466		switch (s[1]) {
467		case 'p':                       /* pixel */
468	<	if (sscanf(s+2, "%d", &i0) != 1) {
469	<	sprintf(buf, "sample pixel (%d): ", psample);
491	<	(*dev->comout)(buf);
492	<	(*dev->comin)(buf);
493	<	if (sscanf(buf, "%d", &i0) != 1)
494	<	break;
495	<	}
496	<	psample = i0;
497	<	pdepth = 0;
468	>	if (getparam(s+2, "sample pixel", 'i', &psample))
469	>	pdepth = 0;
470		break;
471		case 't':                       /* threshold */
472	<	if (sscanf(s+2, "%lf", &d0) != 1) {
473	<	sprintf(buf, "sample threshold (%.6g): ",
502	<	maxdiff);
503	<	(*dev->comout)(buf);
504	<	(*dev->comin)(buf);
505	<	if (sscanf(buf, "%lf", &d0) != 1)
506	<	break;
507	<	}
508	<	maxdiff = d0;
509	<	pdepth = 0;
472	>	if (getparam(s+2, "sample threshold", 'r', &maxdiff))
473	>	pdepth = 0;
474		break;
475		default:
476		goto badparam;
#	Line 516 | Line 480 | register char  *s;
480		break;
481		default:;
482		badparam:
483	+	*sskip(s) = '\0';
484		sprintf(errmsg, "%s: unknown variable", s);
485		error(COMMAND, errmsg);
486		break;
#	Line 540 | Line 505 | char  *s;
505		if ((*dev->getcur)(&x, &y) == ABORT)
506		return;
507
508	<	viewray(thisray.rorg, thisray.rdir, &ourview,
509	<	(x+.5)/hresolu, (y+.5)/vresolu);
510	<
508	>	if (viewray(thisray.rorg, thisray.rdir, &ourview,
509	>	(x+.5)/hresolu, (y+.5)/vresolu) < 0) {
510	>	error(COMMAND, "not on image");
511	>	return;
512	>	}
513	>
514		} else if (normalize(thisray.rdir) == 0.0) {
515		error(COMMAND, "zero ray direction");
516		return;
#	Line 560 | Line 528 | char  *s;
528		ofun[thisray.ro->otype].funame,
529		thisray.ro->oname);
530		(*dev->comout)(buf);
531	<	(*dev->comin)(buf);
531	>	(*dev->comin)(buf, NULL);
532		if (thisray.rot >= FHUGE)
533		(*dev->comout)("at infinity");
534		else {
#	Line 568 | Line 536 | char  *s;
536		thisray.rop[1], thisray.rop[2]);
537		(*dev->comout)(buf);
538		}
539	<	(*dev->comin)(buf);
540	<	sprintf(buf, "with value (%.6g %.6g %.6g)",
539	>	(*dev->comin)(buf, NULL);
540	>	sprintf(buf, "value (%.5g %.5g %.5g) (%.1fL)",
541		colval(thisray.rcol,RED),
542		colval(thisray.rcol,GRN),
543	<	colval(thisray.rcol,BLU));
543	>	colval(thisray.rcol,BLU),
544	>	luminance(thisray.rcol));
545		(*dev->comout)(buf);
546		}
547	<	(*dev->comin)(buf);
547	>	(*dev->comin)(buf, NULL);
548		}
549
550
#	Line 604 | Line 573 | char  *s;
573		/* write header */
574		fputs(progname, fp);
575		fprintview(&ourview, fp);
576	<	putc('\n', fp);
576	>	if (octname != NULL)
577	>	fprintf(fp, " %s\n", octname);
578	>	else
579	>	putc('\n', fp);
580	>	fprintf(fp, "SOFTWARE= %s\n", VersionID);
581		if (exposure != 1.0)
582		fputexpos(exposure, fp);
583	+	if (dev->pixaspect != 1.0)
584	+	fputaspect(dev->pixaspect, fp);
585	+	fputformat(COLRFMT, fp);
586		putc('\n', fp);
587	<	fputresolu(YMAJOR|YDECR, hresolu, vresolu, fp);
587	>	fprtresolu(hresolu, vresolu, fp);
588
589		scanline = (COLR *)malloc(hresolu*sizeof(COLR));
590	<	if (scanline == NULL)
591	<	error(SYSTEM, "out of memory in writepict");
590	>	if (scanline == NULL) {
591	>	error(COMMAND, "not enough memory!");
592	>	fclose(fp);
593	>	unlink(fname);
594	>	return;
595	>	}
596		for (y = vresolu-1; y >= 0; y--) {
597		getpictcolrs(y, scanline, &ptrunk, hresolu, vresolu);
598		if (fwritecolrs(scanline, hresolu, fp) < 0)
599		break;
600		}
601	+	free((char *)scanline);
602		if (fclose(fp) < 0)
603		error(COMMAND, "write error");
623	–	free((char *)scanline);
604		}

Diff Legend

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