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 2.5 by greg, Wed Jan 15 16:55:21 1992 UTC vs.
Revision 2.29 by greg, Fri Feb 3 08:58:47 1995 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1991 Regents of the University of California */
1	>	/* Copyright (c) 1994 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 24 | Line 24 | static char SCCSid[] = "$SunId$ LBL";
24
25		#define  CTRL(c)        ((c)-'@')
26
27	+	#ifdef  SMLFLT
28	+	#define  sscanvec(s,v)  (sscanf(s,"%f %f %f",v,v+1,v+2)==3)
29	+	#else
30	+	#define  sscanvec(s,v)  (sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
31	+	#endif
32	+
33	+	extern char  *atos();
34	+
35	+	extern FILE  *popen();
36	+
37	+	extern char  rifname[128];              /* rad input file name */
38	+
39		extern char  VersionID[];
40		extern char  *progname;
41		extern char  *octname;
#	Line 58 | Line 70 | char  *s;
70		int  change = 0;
71		VIEW  nv;
72
73	+	while (isspace(*s))
74	+	s++;
75	+	if (*s == '-') {                        /* command line parameters */
76	+	copystruct(&nv, &ourview);
77	+	if (sscanview(&nv, s))
78	+	newview(&nv);
79	+	else
80	+	error(COMMAND, "bad view option(s)");
81	+	return;
82	+	}
83		if (sscanf(s, "%s", buf) == 1) {        /* write parameters to a file */
84		if ((fname = getpath(buf, NULL, 0)) == NULL ||
85		(fp = fopen(fname, "a")) == NULL) {
#	Line 68 | Line 90 | char  *s;
90		fputs(progname, fp);
91		fprintview(&ourview, fp);
92		fputs(sskip(s), fp);
93	<	fputs("\n", fp);
93	>	putc('\n', fp);
94		fclose(fp);
95		return;
96		}
#	Line 86 | Line 108 | char  *s;
108		(*dev->comout)(buf);
109		(*dev->comin)(buf, NULL);
110		if (buf[0] == CTRL('C')) return;
111	<	if (sscanf(buf, "%lf %lf %lf", &nv.vp[0], &nv.vp[1], &nv.vp[2]) == 3)
111	>	if (sscanvec(buf, nv.vp))
112		change++;
113		else
114		VCOPY(nv.vp, ourview.vp);
#	Line 95 | Line 117 | char  *s;
117		(*dev->comout)(buf);
118		(*dev->comin)(buf, NULL);
119		if (buf[0] == CTRL('C')) return;
120	<	if (sscanf(buf,"%lf %lf %lf",&nv.vdir[0],&nv.vdir[1],&nv.vdir[2]) == 3)
120	>	if (sscanvec(buf, nv.vdir))
121		change++;
122		else
123		VCOPY(nv.vdir, ourview.vdir);
#	Line 104 | Line 126 | char  *s;
126		(*dev->comout)(buf);
127		(*dev->comin)(buf, NULL);
128		if (buf[0] == CTRL('C')) return;
129	<	if (sscanf(buf,"%lf %lf %lf",&nv.vup[0],&nv.vup[1],&nv.vup[2]) == 3)
129	>	if (sscanvec(buf, nv.vup))
130		change++;
131		else
132		VCOPY(nv.vup, ourview.vup);
#	Line 118 | Line 140 | char  *s;
140		else {
141		nv.horiz = ourview.horiz; nv.vert = ourview.vert;
142		}
143	+	sprintf(buf, "fore and aft clipping plane (%.6g %.6g): ",
144	+	ourview.vfore, ourview.vaft);
145	+	(*dev->comout)(buf);
146	+	(*dev->comin)(buf, NULL);
147	+	if (buf[0] == CTRL('C')) return;
148	+	if (sscanf(buf, "%lf %lf", &nv.vfore, &nv.vaft) == 2)
149	+	change++;
150	+	else {
151	+	nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
152	+	}
153		sprintf(buf, "view shift and lift (%.6g %.6g): ",
154		ourview.hoff, ourview.voff);
155		(*dev->comout)(buf);
#	Line 143 | Line 175 | char  *s;
175
176		if (sscanf(s, "%s", buf) == 1) {        /* get parameters from a file */
177		copystruct(&nv, &stdview);
178	<	if ((fname = getpath(buf, NULL, 0)) == NULL ||
178	>	if ((fname = getpath(buf, "", R_OK)) == NULL ||
179		(success = viewfile(fname, &nv, NULL)) == -1) {
180		sprintf(errmsg, "cannot open \"%s\"", buf);
181		error(COMMAND, errmsg);
#	Line 166 | Line 198 | char  *s;
198		}
199
200
201	+	saveview(s)                             /* save view to rad file */
202	+	char  *s;
203	+	{
204	+	char  view[64];
205	+	char  *fname;
206	+	FILE  *fp;
207	+
208	+	if (*atos(view, sizeof(view), s)) {
209	+	if (isint(view)) {
210	+	error(COMMAND, "cannot write view by number");
211	+	return;
212	+	}
213	+	s = sskip(s);
214	+	}
215	+	while (isspace(*s))
216	+	s++;
217	+	if (*s)
218	+	atos(rifname, sizeof(rifname), s);
219	+	else if (rifname[0] == '\0') {
220	+	error(COMMAND, "no previous rad file");
221	+	return;
222	+	}
223	+	if ((fname = getpath(rifname, NULL, 0)) == NULL ||
224	+	(fp = fopen(fname, "a")) == NULL) {
225	+	sprintf(errmsg, "cannot open \"%s\"", rifname);
226	+	error(COMMAND, errmsg);
227	+	return;
228	+	}
229	+	fputs("view= ", fp);
230	+	fputs(view, fp);
231	+	fprintview(&ourview, fp);
232	+	putc('\n', fp);
233	+	fclose(fp);
234	+	}
235	+
236	+
237	+	loadview(s)                             /* load view from rad file */
238	+	char  *s;
239	+	{
240	+	char  buf[512];
241	+	char  *fname;
242	+	FILE  *fp;
243	+	VIEW  nv;
244	+
245	+	strcpy(buf, "rad -n -s -V -v ");
246	+	if (sscanf(s, "%s", buf+strlen(buf)) == 1)
247	+	s = sskip(s);
248	+	else
249	+	strcat(buf, "1");
250	+	if (*s)
251	+	atos(rifname, sizeof(rifname), s);
252	+	else if (rifname[0] == '\0') {
253	+	error(COMMAND, "no previous rad file");
254	+	return;
255	+	}
256	+	if ((fname = getpath(rifname, "", R_OK)) == NULL) {
257	+	sprintf(errmsg, "cannot access \"%s\"", rifname);
258	+	error(COMMAND, errmsg);
259	+	return;
260	+	}
261	+	sprintf(buf+strlen(buf), " %s", fname);
262	+	if ((fp = popen(buf, "r")) == NULL) {
263	+	error(COMMAND, "cannot run rad");
264	+	return;
265	+	}
266	+	buf[0] = '\0';
267	+	fgets(buf, sizeof(buf), fp);
268	+	pclose(fp);
269	+	copystruct(&nv, &stdview);
270	+	if (!sscanview(&nv, buf)) {
271	+	error(COMMAND, "rad error -- no such view?");
272	+	return;
273	+	}
274	+	newview(&nv);
275	+	}
276	+
277	+
278		getaim(s)                               /* aim camera */
279		char  *s;
280		{
172	–	extern double  tan(), atan();
281		double  zfact;
282		VIEW  nv;
283
#	Line 178 | Line 286 | char  *s;
286		nv.type = ourview.type;
287		VCOPY(nv.vp, ourview.vp);
288		VCOPY(nv.vup, ourview.vup);
181	–	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
289		nv.horiz = ourview.horiz; nv.vert = ourview.vert;
290	+	nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
291	+	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
292		zoomview(&nv, zfact);
293		newview(&nv);
294		}
#	Line 200 | Line 309 | char  *s;
309		getrotate(s)                            /* rotate camera */
310		char  *s;
311		{
203	–	extern double  normalize(), tan(), atan();
312		VIEW  nv;
313		FVECT  v1;
314		double  angle, elev, zfact;
#	Line 214 | Line 322 | char  *s;
322		VCOPY(nv.vp, ourview.vp);
323		VCOPY(nv.vup, ourview.vup);
324		nv.hoff = ourview.hoff; nv.voff = ourview.voff;
325	+	nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
326		spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.));
327		if (elev != 0.0) {
328		fcross(v1, nv.vdir, ourview.vup);
#	Line 248 | Line 357 | char  *s;
357		{
358		char  buf[128];
359		register char  *cp;
251	–	register PNODE  *p;
360		RECT  r;
361		int  x, y;
362	<	double  e;
362	>	register PNODE  *p = &ptrunk;
363	>	int  adapt = 0;
364	>	double  e = 1.0;
365
366		for (cp = s; isspace(*cp); cp++)
367		;
368	+	if (*cp == '@') {
369	+	adapt++;
370	+	while (isspace(*++cp))
371	+	;
372	+	}
373		if (*cp == '\0') {              /* normalize to point */
374		if (dev->getcur == NULL)
375		return;
#	Line 264 | Line 379 | char  *s;
379		r.l = r.d = 0;
380		r.r = hresolu; r.u = vresolu;
381		p = findrect(x, y, &ptrunk, &r, -1);
267	–	e = 1.0;
382		} else {
383		if (*cp == '=') {       /* absolute setting */
384		p = NULL;
#	Line 272 | Line 386 | char  *s;
386		for (cp++; isspace(*cp); cp++)
387		;
388		if (*cp == '\0') {      /* interactive */
389	<	sprintf(buf, "exposure (%lf): ", exposure);
389	>	sprintf(buf, "exposure (%f): ", exposure);
390		(*dev->comout)(buf);
391		(*dev->comin)(buf, NULL);
392		for (cp = buf; isspace(*cp); cp++)
#	Line 280 | Line 394 | char  *s;
394		if (*cp == '\0')
395		return;
396		}
283	–	} else {                /* normalize to average */
284	–	p = &ptrunk;
285	–	e = 1.0;
397		}
398		if (*cp == '+' || *cp == '-')   /* f-stops */
399		e *= pow(2.0, atof(cp));
#	Line 290 | Line 401 | char  *s;
401		e *= atof(cp);
402		}
403		if (p != NULL) {                /* relative setting */
404	<	if (bright(p->v) <= FTINY) {
404	>	if (bright(p->v) < 1e-15) {
405		error(COMMAND, "cannot normalize to zero");
406		return;
407		}
408	<	e *= 0.5 / bright(p->v);
408	>	if (adapt)
409	>	e *= 106./pow(1.219+pow(luminance(p->v)/exposure,.4),2.5)/exposure;
410	>	else
411	>	e *= 0.5 / bright(p->v);
412		}
413		if (e <= FTINY || fabs(1.0 - e) <= FTINY)
414		return;
#	Line 379 | Line 493 | register char  *s;
493		extern double  shadcert;
494		extern COLOR  ambval;
495		extern double  ambacc;
382	–	extern double  minarad;
496		extern int  ambres;
497		extern int  ambdiv;
498		extern int  ambssamp;
499		extern int  ambounce;
500	<	extern int  directinvis;
500	>	extern int  directvis;
501		extern double  srcsizerat;
502		extern int  do_irrad;
503		extern double  specjitter;
504		extern double  specthresh;
505	+	extern int  backvis;
506		char  buf[128];
507
508		if (s[0] == '\0') {
509		(*dev->comout)(
510	<	"aa ab ad ar as av b dc di dj ds dt i lr lw ps pt sj st: ");
510	>	"aa ab ad ar as av b dc di dj ds dt i lr lw ps pt sj st bv: ");
511		(*dev->comin)(buf, NULL);
512		s = buf;
513		}
#	Line 421 | Line 535 | register char  *s;
535		case 't':                       /* threshold */
536		getparam(s+2, "direct threshold", 'r', &shadthresh);
537		break;
538	<	case 'i':                       /* invisibility */
539	<	getparam(s+2, "direct invisibility",
540	<	'b', &directinvis);
538	>	case 'v':                       /* visibility */
539	>	getparam(s+2, "direct visibility",
540	>	'b', &directvis);
541		break;
542		case 's':                       /* sampling */
543		getparam(s+2, "direct sampling", 'r', &srcsizerat);
#	Line 432 | Line 546 | register char  *s;
546		goto badparam;
547		}
548		break;
549	<	case 'b':                       /* black and white */
550	<	getparam(s+1, "black and white", 'b', &greyscale);
549	>	case 'b':                       /* back faces or black and white */
550	>	switch (s[1]) {
551	>	case 'v':                       /* back face visibility */
552	>	getparam(s+2, "back face visibility", 'b', &backvis);
553	>	break;
554	>	case '\0':                      /* black and white */
555	>	case ' ':
556	>	case 'y': case 'Y': case 't': case 'T': case '1': case '+':
557	>	case 'n': case 'N': case 'f': case 'F': case '0': case '-':
558	>	getparam(s+1, "black and white", 'b', &greyscale);
559	>	break;
560	>	default:
561	>	goto badparam;
562	>	}
563		break;
564		case 'i':                       /* irradiance */
565		getparam(s+1, "irradiance", 'b', &do_irrad);
#	Line 441 | Line 567 | register char  *s;
567		case 'a':                       /* ambient */
568		switch (s[1]) {
569		case 'v':                       /* value */
570	<	getparam(s+2, "ambient value", 'C', ambval);
570	>	getparam(s+2, "ambient value", 'C', (COLOR *)ambval);
571		break;
572		case 'a':                       /* accuracy */
573	<	getparam(s+2, "ambient accuracy", 'r', &ambacc);
573	>	if (getparam(s+2, "ambient accuracy", 'r', &ambacc))
574	>	setambacc(ambacc);
575		break;
576		case 'd':                       /* divisions */
577		getparam(s+2, "ambient divisions", 'i', &ambdiv);
#	Line 457 | Line 584 | register char  *s;
584		break;
585		case 'r':
586		if (getparam(s+2, "ambient resolution", 'i', &ambres))
587	<	minarad = ambres > 0 ?
461	<	thescene.cusize/ambres : 0.0;
587	>	setambres(ambres);
588		break;
589		default:
590		goto badparam;
#	Line 509 | Line 635 | char  *s;
635		int  x, y;
636		RAY  thisray;
637
638	<	if (sscanf(s, "%lf %lf %lf %lf %lf %lf",
513	<	&thisray.rorg[0], &thisray.rorg[1], &thisray.rorg[2],
514	<	&thisray.rdir[0], &thisray.rdir[1], &thisray.rdir[2]) != 6) {
638	>	thisray.rmax = 0.0;
639
640	+	if (!sscanvec(s, thisray.rorg) ||
641	+	!sscanvec(sskip(sskip(sskip(s))), thisray.rdir)) {
642	+
643		if (dev->getcur == NULL)
644		return;
645		(*dev->comout)("Pick ray\n");
646		if ((*dev->getcur)(&x, &y) == ABORT)
647		return;
648
649	<	if (viewray(thisray.rorg, thisray.rdir, &ourview,
650	<	(x+.5)/hresolu, (y+.5)/vresolu) < 0) {
649	>	if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
650	>	&ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) {
651		error(COMMAND, "not on image");
652		return;
653		}
#	Line 537 | Line 664 | char  *s;
664		if (thisray.ro == NULL)
665		(*dev->comout)("ray hit nothing");
666		else {
667	<	sprintf(buf, "ray hit %s %s \"%s\"",
668	<	objptr(thisray.ro->omod)->oname,
667	>	sprintf(buf, "ray hit %s%s %s \"%s\"",
668	>	thisray.rod < 0.0 ? "back of " : "",
669	>	thisray.ro->omod == OVOID ? VOIDID :
670	>	objptr(thisray.ro->omod)->oname,
671		ofun[thisray.ro->otype].funame,
672		thisray.ro->oname);
673		(*dev->comout)(buf);
#	Line 571 | Line 700 | char  *s;
700		COLR  *scanline;
701		int  y;
702
703	<	if (sscanf(s, "%s", buf) != 1 && buf[0] == '\0') {
703	>	while (isspace(*s))
704	>	s++;
705	>	if (*s)
706	>	atos(buf, sizeof(buf), s);
707	>	else if (buf[0] == '\0') {
708		error(COMMAND, "no file");
709		return;
710		}
#	Line 581 | Line 714 | char  *s;
714		error(COMMAND, errmsg);
715		return;
716		}
717	+	#ifdef MSDOS
718	+	setmode(fileno(fp), O_BINARY);
719	+	#endif
720		(*dev->comout)("writing \"");
721		(*dev->comout)(fname);
722		(*dev->comout)("\"...\n");
723		/* write header */
724	+	newheader("RADIANCE", fp);
725		fputs(progname, fp);
726		fprintview(&ourview, fp);
727		if (octname != NULL)

Diff Legend

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