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.6 by greg, Wed Jun 7 08:38:35 1989 UTC vs.
Revision 1.10 by greg, Thu Jul 27 22:58:26 1989 UTC

#	Line 65 | Line 65 | char  *s;
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;
68	+	if (pframe.l > pframe.r) pframe.l = pframe.r;
69	+	if (pframe.d > pframe.u) pframe.d = pframe.u;
70		pdepth = 0;
71		}
72
#	Line 74 | Line 76 | char  *s;
76		{
77		FILE  *fp;
78		char  buf[128];
79	<	char  *fname, *getpath();
79	>	char  *fname;
80		int  change = 0;
81		VIEW  nv;
82
83		if (sscanf(s, "%s", buf) == 1) {        /* write parameters to a file */
84	<	if ((fname = getpath(buf, NULL)) == NULL ||
84	>	if ((fname = getpath(buf, NULL, 0)) == NULL ||
85		(fp = fopen(fname, "a")) == NULL) {
86		sprintf(errmsg, "cannot open \"%s\"", buf);
87		error(COMMAND, errmsg);
#	Line 156 | Line 158 | lastview(s)                            /* return to a previous view */
158		char  *s;
159		{
160		char  buf[128];
161	<	char  *fname, *getpath();
161	>	char  *fname;
162		int  success;
163		VIEW  nv;
164
165		if (sscanf(s, "%s", buf) == 1) {        /* get parameters from a file */
166		bcopy(&stdview, &nv, sizeof(VIEW));
167	<	if ((fname = getpath(buf, NULL)) == NULL ||
167	>	if ((fname = getpath(buf, NULL, 0)) == NULL ||
168		(success = viewfile(fname, &nv)) == -1) {
169		sprintf(errmsg, "cannot open \"%s\"", buf);
170		error(COMMAND, errmsg);
#	Line 392 | Line 394 | register char  *s;
394		extern int  maxdepth;
395		extern double  dstrsrc;
396		extern double  shadthresh;
397	+	extern double  shadcert;
398		extern COLOR  ambval;
399		extern double  ambacc;
400		extern double  minarad;
#	Line 404 | Line 407 | register char  *s;
407		char  buf[128];
408
409		if (s[0] == '\0') {
410	<	(*dev->comout)("aa ab ad ar as av dj dt lr lw sd sp: ");
410	>	(*dev->comout)("aa ab ad ar as av dc dj dt lr lw sp st: ");
411		(*dev->comin)(buf);
412		s = buf;
413		}
#	Line 450 | Line 453 | register char  *s;
453		}
454		dstrsrc = d0;
455		break;
456	+	case 'c':                       /* certainty */
457	+	if (sscanf(s+2, "%lf", &d0) != 1) {
458	+	sprintf(buf, "direct certainty (%.6g): ",
459	+	shadcert);
460	+	(*dev->comout)(buf);
461	+	(*dev->comin)(buf);
462	+	if (sscanf(buf, "%lf", &d0) != 1)
463	+	break;
464	+	}
465	+	shadcert = d0;
466	+	break;
467		case 't':                       /* threshold */
468		if (sscanf(s+2, "%lf", &d0) != 1) {
469		sprintf(buf, "direct threshold (%.6g): ",
#	Line 555 | Line 569 | register char  *s;
569		psample = i0;
570		pdepth = 0;
571		break;
572	<	case 'd':                       /* difference */
572	>	case 't':                       /* threshold */
573		if (sscanf(s+2, "%lf", &d0) != 1) {
574	<	sprintf(buf, "sample difference (%.6g): ",
574	>	sprintf(buf, "sample threshold (%.6g): ",
575		maxdiff);
576		(*dev->comout)(buf);
577		(*dev->comin)(buf);
#	Line 641 | Line 655 | writepict(s)                           /* write the picture to a file */
655		char  *s;
656		{
657		static char  buf[128];
658	<	char  *fname, *getpath();
658	>	char  *fname;
659		FILE  *fp;
660		COLR  *scanline;
661		int  y;
#	Line 650 | Line 664 | char  *s;
664		error(COMMAND, "no file");
665		return;
666		}
667	<	if ((fname = getpath(buf, NULL)) == NULL ||
667	>	if ((fname = getpath(buf, NULL, 0)) == NULL ||
668		(fp = fopen(fname, "w")) == NULL) {
669		sprintf(errmsg, "cannot open \"%s\"", buf);
670		error(COMMAND, errmsg);

Diff Legend

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