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.43 by schorsch, Tue Mar 30 16:13:01 2004 UTC vs.
Revision 2.67 by greg, Thu Apr 12 16:21:53 2018 UTC

#	Line 13 | Line 13 | static const char      RCSid[] = "$Id$";
13		#include  <string.h>
14
15		#include  "platform.h"
16	+	#include  "rtprocess.h" /* win_popen() */
17	+	#include  "paths.h"
18		#include  "ray.h"
19	+	#include  "source.h"
20		#include  "ambient.h"
21		#include  "otypes.h"
22		#include  "rpaint.h"
#	Line 23 | Line 26 | extern double  maxdiff;                        /* max. sample difference */
26
27		#define  CTRL(c)        ((c)-'@')
28
29	<	#ifdef  SMLFLT
27	<	#define  sscanvec(s,v)  (sscanf(s,"%f %f %f",v,v+1,v+2)==3)
28	<	#else
29	<	#define  sscanvec(s,v)  (sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
30	<	#endif
29	>	#define  sscanvec(s,v)  (sscanf(s,FVFORMAT,v,v+1,v+2)==3)
30
31		extern char  rifname[128];              /* rad input file name */
32
#	Line 35 | Line 34 | extern char  *progname;
34		extern char  *octname;
35
36
37	<	extern void
37	>	void
38		getframe(                               /* get a new frame */
39		char  *s
40		)
#	Line 46 | Line 45 | getframe(                              /* get a new frame */
45		}
46
47
48	<	extern void
48	>	void
49		getrepaint(                             /* get area and repaint */
50		char  *s
51		)
#	Line 55 | Line 54 | getrepaint(                            /* get area and repaint */
54
55		if (getrect(s, &box) < 0)
56		return;
57	<	paintrect(&ptrunk, 0, 0, hresolu, vresolu, &box);
57	>	paintrect(&ptrunk, &box);
58		}
59
60
61	<	extern void
62	<	getview(                                /* get/show view parameters */
61	>	void
62	>	getview(                                /* get/show/save view parameters */
63		char  *s
64		)
65		{
#	Line 68 | Line 67 | getview(                               /* get/show view parameters */
67		char  buf[128];
68		char  *fname;
69		int  change = 0;
70	<	VIEW  nv;
70	>	VIEW  nv = ourview;
71
72		while (isspace(*s))
73		s++;
74		if (*s == '-') {                        /* command line parameters */
76	–	nv = ourview;
75		if (sscanview(&nv, s))
76		newview(&nv);
77		else
78		error(COMMAND, "bad view option(s)");
79		return;
80		}
81	<	if (sscanf(s, "%s", buf) == 1) {        /* write parameters to a file */
81	>	if (nextword(buf, sizeof(buf), s) != NULL) {    /* write to a file */
82		if ((fname = getpath(buf, NULL, 0)) == NULL ||
83		(fp = fopen(fname, "a")) == NULL) {
84		sprintf(errmsg, "cannot open \"%s\"", buf);
#	Line 101 | Line 99 | getview(                               /* get/show view parameters */
99		if (buf[0] && buf[0] != ourview.type) {
100		nv.type = buf[0];
101		change++;
102	<	} else
105	<	nv.type = ourview.type;
102	>	}
103		sprintf(buf, "view point (%.6g %.6g %.6g): ",
104		ourview.vp[0], ourview.vp[1], ourview.vp[2]);
105		(*dev->comout)(buf);
#	Line 110 | Line 107 | getview(                               /* get/show view parameters */
107		if (buf[0] == CTRL('C')) return;
108		if (sscanvec(buf, nv.vp))
109		change++;
113	–	else
114	–	VCOPY(nv.vp, ourview.vp);
110		sprintf(buf, "view direction (%.6g %.6g %.6g): ",
111	<	ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]);
111	>	ourview.vdir[0]*ourview.vdist,
112	>	ourview.vdir[1]*ourview.vdist,
113	>	ourview.vdir[2]*ourview.vdist);
114		(*dev->comout)(buf);
115		(*dev->comin)(buf, NULL);
116		if (buf[0] == CTRL('C')) return;
117	<	if (sscanvec(buf, nv.vdir))
117	>	if (sscanvec(buf, nv.vdir)) {
118	>	nv.vdist = 1.;
119		change++;
120	<	else
123	<	VCOPY(nv.vdir, ourview.vdir);
120	>	}
121		sprintf(buf, "view up (%.6g %.6g %.6g): ",
122		ourview.vup[0], ourview.vup[1], ourview.vup[2]);
123		(*dev->comout)(buf);
#	Line 128 | Line 125 | getview(                               /* get/show view parameters */
125		if (buf[0] == CTRL('C')) return;
126		if (sscanvec(buf, nv.vup))
127		change++;
131	–	else
132	–	VCOPY(nv.vup, ourview.vup);
128		sprintf(buf, "view horiz and vert size (%.6g %.6g): ",
129		ourview.horiz, ourview.vert);
130		(*dev->comout)(buf);
#	Line 137 | Line 132 | getview(                               /* get/show view parameters */
132		if (buf[0] == CTRL('C')) return;
133		if (sscanf(buf, "%lf %lf", &nv.horiz, &nv.vert) == 2)
134		change++;
140	–	else {
141	–	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
142	–	}
135		sprintf(buf, "fore and aft clipping plane (%.6g %.6g): ",
136		ourview.vfore, ourview.vaft);
137		(*dev->comout)(buf);
#	Line 147 | Line 139 | getview(                               /* get/show view parameters */
139		if (buf[0] == CTRL('C')) return;
140		if (sscanf(buf, "%lf %lf", &nv.vfore, &nv.vaft) == 2)
141		change++;
150	–	else {
151	–	nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
152	–	}
142		sprintf(buf, "view shift and lift (%.6g %.6g): ",
143		ourview.hoff, ourview.voff);
144		(*dev->comout)(buf);
#	Line 157 | Line 146 | getview(                               /* get/show view parameters */
146		if (buf[0] == CTRL('C')) return;
147		if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2)
148		change++;
160	–	else {
161	–	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
162	–	}
149		if (change)
150		newview(&nv);
151		}
152
153
154	<	extern void
154	>	void
155		lastview(                               /* return to a previous view */
156		char  *s
157		)
#	Line 174 | Line 160 | lastview(                              /* return to a previous view */
160		char  *fname;
161		int  success;
162		VIEW  nv;
163	<
164	<	if (sscanf(s, "%s", buf) == 1) {        /* get parameters from a file */
163	>	/* get parameters from a file */
164	>	if (nextword(buf, sizeof(buf), s) != NULL) {
165		nv = stdview;
166		if ((fname = getpath(buf, "", R_OK)) == NULL ||
167		(success = viewfile(fname, &nv, NULL)) == -1) {
#	Line 196 | Line 182 | lastview(                              /* return to a previous view */
182		nv = ourview;
183		ourview = oldview;
184		oldview = nv;
185	<	newimage();
185	>	newimage(NULL);
186		}
187
188
189	<	extern void
189	>	void
190		saveview(                               /* save view to rad file */
191		char  *s
192		)
#	Line 216 | Line 202 | saveview(                              /* save view to rad file */
202		}
203		s = sskip(s);
204		}
205	<	while (isspace(*s))
220	<	s++;
221	<	if (*s)
222	<	atos(rifname, sizeof(rifname), s);
223	<	else if (rifname[0] == '\0') {
205	>	if (nextword(rifname, sizeof(rifname), s) == NULL && !rifname[0]) {
206		error(COMMAND, "no previous rad file");
207		return;
208		}
#	Line 238 | Line 220 | saveview(                              /* save view to rad file */
220		}
221
222
223	<	extern void
223	>	void
224		loadview(                               /* load view from rad file */
225		char  *s
226		)
#	Line 253 | Line 235 | loadview(                              /* load view from rad file */
235		s = sskip(s);
236		else
237		strcat(buf, "1");
238	<	if (*s)
257	<	atos(rifname, sizeof(rifname), s);
258	<	else if (rifname[0] == '\0') {
238	>	if (nextword(rifname, sizeof(rifname), s) == NULL && !rifname[0]) {
239		error(COMMAND, "no previous rad file");
240		return;
241		}
#	Line 281 | Line 261 | loadview(                              /* load view from rad file */
261		}
262
263
264	<	extern void
264	>	void
265		getaim(                         /* aim camera */
266		char  *s
267		)
268		{
269	+	VIEW  nv = ourview;
270		double  zfact;
290	–	VIEW  nv;
271
272		if (getinterest(s, 1, nv.vdir, &zfact) < 0)
273		return;
294	–	nv.type = ourview.type;
295	–	VCOPY(nv.vp, ourview.vp);
296	–	VCOPY(nv.vup, ourview.vup);
297	–	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
298	–	nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
299	–	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
274		zoomview(&nv, zfact);
275		newview(&nv);
276		}
277
278
279	<	extern void
279	>	void
280	>	getfocus(                               /* set focus distance */
281	>	char *s
282	>	)
283	>	{
284	>	char  buf[64];
285	>	double  dist;
286	>
287	>	if (sscanf(s, "%lf", &dist) < 1) {
288	>	int     x, y;
289	>	RAY     thisray;
290	>	if (dev->getcur == NULL)
291	>	return;
292	>	(*dev->comout)("Pick focus point\n");
293	>	if ((*dev->getcur)(&x, &y) == ABORT)
294	>	return;
295	>	if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
296	>	&ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) {
297	>	error(COMMAND, "not on image");
298	>	return;
299	>	}
300	>	rayorigin(&thisray, PRIMARY, NULL, NULL);
301	>	if (!localhit(&thisray, &thescene)) {
302	>	error(COMMAND, "not a local object");
303	>	return;
304	>	}
305	>	dist = thisray.rot;
306	>	} else if (dist <= .0) {
307	>	error(COMMAND, "focus distance must be positive");
308	>	return;
309	>	}
310	>	ourview.vdist = dist;
311	>	sprintf(buf, "Focus distance set to %f\n", dist);
312	>	(*dev->comout)(buf);
313	>	}
314	>
315	>
316	>	void
317		getmove(                                /* move camera */
318		char  *s
319		)
#	Line 316 | Line 327 | getmove(                               /* move camera */
327		}
328
329
330	<	extern void
330	>	void
331		getrotate(                              /* rotate camera */
332		char  *s
333		)
334		{
335	<	VIEW  nv;
325	<	FVECT  v1;
335	>	VIEW  nv = ourview;
336		double  angle, elev, zfact;
337
338		elev = 0.0; zfact = 1.0;
#	Line 330 | Line 340 | getrotate(                             /* rotate camera */
340		error(COMMAND, "missing angle");
341		return;
342		}
333	–	nv.type = ourview.type;
334	–	VCOPY(nv.vp, ourview.vp);
335	–	VCOPY(nv.vup, ourview.vup);
336	–	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
337	–	nv.vfore = ourview.vfore; nv.vaft = ourview.vaft;
343		spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.));
344	<	if (elev != 0.0) {
345	<	fcross(v1, nv.vdir, ourview.vup);
346	<	normalize(v1);
342	<	spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.));
343	<	}
344	<	nv.horiz = ourview.horiz; nv.vert = ourview.vert;
344	>	if (elev != 0.0)
345	>	geodesic(nv.vdir, nv.vdir, nv.vup, elev*(PI/180.), GEOD_RAD);
346	>
347		zoomview(&nv, zfact);
348		newview(&nv);
349		}
350
351
352	<	extern void
352	>	void
353		getpivot(                               /* pivot viewpoint */
354	<	register char  *s
354	>	char  *s
355		)
356		{
357		FVECT  vc;
#	Line 366 | Line 368 | getpivot(                              /* pivot viewpoint */
368		}
369
370
371	<	extern void
371	>	void
372	>	getorigin(                              /* origin viewpoint */
373	>	char  *s
374	>	)
375	>	{
376	>	VIEW    nv = ourview;
377	>	double  d;
378	>	/* get new view origin */
379	>	if (sscanf(s, "%lf %lf", &d, &d) == 1) {
380	>	/* just moving some distance */
381	>	VSUM(nv.vp, nv.vp, nv.vdir, d);
382	>	} else if (!sscanvec(s, nv.vp)) {
383	>	int     x, y;           /* need to pick origin */
384	>	RAY     thisray;
385	>	if (dev->getcur == NULL)
386	>	return;
387	>	(*dev->comout)("Pick point on surface for new origin\n");
388	>	if ((*dev->getcur)(&x, &y) == ABORT)
389	>	return;
390	>	if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
391	>	&ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) {
392	>	error(COMMAND, "not on image");
393	>	return;
394	>	}
395	>	rayorigin(&thisray, PRIMARY, NULL, NULL);
396	>	if (!localhit(&thisray, &thescene)) {
397	>	error(COMMAND, "not a local object");
398	>	return;
399	>	}
400	>	if (thisray.rod < 0.0)  /* don't look through other side */
401	>	flipsurface(&thisray);
402	>	VSUM(nv.vp, thisray.rop, thisray.ron, 20.0*FTINY);
403	>	VCOPY(nv.vdir, thisray.ron);
404	>	} else if (!sscanvec(sskip2(s,3), nv.vdir) || normalize(nv.vdir) == 0.0)
405	>	VCOPY(nv.vdir, ourview.vdir);
406	>
407	>	d = DOT(nv.vdir, nv.vup);       /* need different up vector? */
408	>	if (d*d >= 1.-2.*FTINY) {
409	>	int     i;
410	>	nv.vup[0] = nv.vup[1] = nv.vup[2] = 0.0;
411	>	for (i = 3; i--; )
412	>	if (nv.vdir[i]*nv.vdir[i] < 0.34)
413	>	break;
414	>	nv.vup[i] = 1.;
415	>	}
416	>	newview(&nv);
417	>	}
418	>
419	>
420	>	void
421		getexposure(                            /* get new exposure */
422		char  *s
423		)
424		{
425		char  buf[128];
426	<	register char  *cp;
376	<	RECT  r;
426	>	char  *cp;
427		int  x, y;
428	<	register PNODE  *p = &ptrunk;
428	>	PNODE  *p = &ptrunk;
429		int  adapt = 0;
430		double  e = 1.0;
431
#	Line 392 | Line 442 | getexposure(                           /* get new exposure */
442		(*dev->comout)("Pick point for exposure\n");
443		if ((*dev->getcur)(&x, &y) == ABORT)
444		return;
445	<	r.l = r.d = 0;
396	<	r.r = hresolu; r.u = vresolu;
397	<	p = findrect(x, y, &ptrunk, &r, -1);
445	>	p = findrect(x, y, &ptrunk, -1);
446		} else {
447		if (*cp == '=') {       /* absolute setting */
448		p = NULL;
#	Line 417 | Line 465 | getexposure(                           /* get new exposure */
465		e *= atof(cp);
466		}
467		if (p != NULL) {                /* relative setting */
468	+	compavg(p);
469		if (bright(p->v) < 1e-15) {
470		error(COMMAND, "cannot normalize to zero");
471		return;
#	Line 434 | Line 483 | getexposure(                           /* get new exposure */
483		}
484
485		typedef union {int i; double d; COLOR C;}       *MyUptr;
486	+	#define  FEQ(x,y)     (fabs((x)-(y)) <= FTINY)
487
488	<	extern int
488	>	int
489		getparam(               /* get variable from user */
490		char  *str,
491		char  *dsc,
#	Line 443 | Line 493 | getparam(              /* get variable from user */
493		void  *p
494		)
495		{
496	<	register MyUptr  ptr = (MyUptr)p;
496	>	MyUptr  ptr = (MyUptr)p;
497		int  i0;
498		double  d0, d1, d2;
499		char  buf[48];
#	Line 458 | Line 508 | getparam(              /* get variable from user */
508		if (sscanf(buf, "%d", &i0) != 1)
509		return(0);
510		}
511	+	if (ptr->i == i0)
512	+	return(0);
513		ptr->i = i0;
514	<	return(1);
514	>	break;
515		case 'r':                       /* real */
516		if (sscanf(str, "%lf", &d0) != 1) {
517		(*dev->comout)(dsc);
#	Line 469 | Line 521 | getparam(              /* get variable from user */
521		if (sscanf(buf, "%lf", &d0) != 1)
522		return(0);
523		}
524	+	if (FEQ(ptr->d, d0))
525	+	return(0);
526		ptr->d = d0;
527	<	return(1);
527	>	break;
528		case 'b':                       /* boolean */
529		if (sscanf(str, "%1s", buf) != 1) {
530		(*dev->comout)(dsc);
531		sprintf(buf, "? (%c): ", ptr->i ? 'y' : 'n');
532		(*dev->comout)(buf);
533		(*dev->comin)(buf, NULL);
534	<	if (buf[0] == '\0' ||
481	<	strchr("yY+1tTnN-0fF", buf[0]) == NULL)
534	>	if (buf[0] == '\0')
535		return(0);
536		}
537	<	ptr->i = strchr("yY+1tT", buf[0]) != NULL;
538	<	return(1);
537	>	if (strchr("yY+1tTnN-0fF", buf[0]) == NULL)
538	>	return(0);
539	>	i0 = strchr("yY+1tT", buf[0]) != NULL;
540	>	if (ptr->i == i0)
541	>	return(0);
542	>	ptr->i = i0;
543	>	break;
544		case 'C':                       /* color */
545		if (sscanf(str, "%lf %lf %lf", &d0, &d1, &d2) != 3) {
546		(*dev->comout)(dsc);
#	Line 495 | Line 553 | getparam(              /* get variable from user */
553		if (sscanf(buf, "%lf %lf %lf", &d0, &d1, &d2) != 3)
554		return(0);
555		}
556	+	if (FEQ(colval(ptr->C,RED), d0) &&
557	+	FEQ(colval(ptr->C,GRN), d1) &&
558	+	FEQ(colval(ptr->C,BLU), d2))
559	+	return(0);
560		setcolor(ptr->C, d0, d1, d2);
561	<	return(1);
561	>	break;
562	>	default:
563	>	return(0);              /* shouldn't happen */
564		}
565	<	return 0; /* nothing matched */
565	>	newparam++;
566	>	return(1);
567		}
568
569
570	<	extern void
570	>	void
571		setparam(                               /* get/set program parameter */
572	<	register char  *s
572	>	char  *s
573		)
574		{
575	+	int  prev_newp = newparam;
576		char  buf[128];
577
578		if (s[0] == '\0') {
579		(*dev->comout)(
580	<	"aa ab ad ar as av aw b dc dv dj ds dt i lr lw me ma mg ms ps pt sj st bv: ");
580	>	"aa ab ad ar as av aw b bv dc dv dj ds dt i lr lw me ma mg ms ps pt ss st u: ");
581		(*dev->comin)(buf, NULL);
582		s = buf;
583		}
584		switch (s[0]) {
585	+	case 'u':                       /* uncorrelated sampling */
586	+	getparam(s+1, "uncorrelated sampling", 'b',
587	+	(void *)&rand_samp);
588	+	break;
589		case 'l':                       /* limit */
590		switch (s[1]) {
591		case 'w':                       /* weight */
#	Line 568 | Line 638 | setparam(                              /* get/set program parameter */
638		case 'n': case 'N': case 'f': case 'F': case '0': case '-':
639		getparam(s+1, "black and white", 'b',
640		(void *)&greyscale);
641	+	newparam = prev_newp;
642		break;
643		default:
644		goto badparam;
#	Line 650 | Line 721 | setparam(                              /* get/set program parameter */
721		default:
722		goto badparam;
723		}
724	+	newparam = prev_newp;
725		break;
726		case 's':                       /* specular */
727		switch (s[1]) {
728	<	case 'j':                       /* jitter */
729	<	getparam(s+2, "specular jitter", 'r',
728	>	case 's':                       /* sampling */
729	>	getparam(s+2, "specular sampling", 'r',
730		(void *)&specjitter);
731		break;
732		case 't':                       /* threshold */
#	Line 677 | Line 749 | badparam:
749		}
750
751
752	<	extern void
753	<	traceray(s)                             /* trace a single ray */
754	<	char  *s;
752	>	void
753	>	traceray(                               /* trace a single ray */
754	>	char  *s
755	>	)
756		{
757	<	char  buf[128];
758	<	int  x, y;
686	<	OBJREC  *ino;
687	<	RAY  thisray;
757	>	RAY     thisray;
758	>	char    buf[512];
759
760		thisray.rmax = 0.0;
761
762		if (!sscanvec(s, thisray.rorg) ||
763		!sscanvec(sskip2(s,3), thisray.rdir)) {
764	+	int  x, y;
765
766		if (dev->getcur == NULL)
767		return;
#	Line 708 | Line 780 | char  *s;
780		return;
781		}
782
783	<	rayorigin(&thisray, NULL, PRIMARY, 1.0);
712	<
713	<	rayvalue(&thisray);
783	>	ray_trace(&thisray);
784
785		if (thisray.ro == NULL)
786		(*dev->comout)("ray hit nothing");
787		else {
788	<	sprintf(buf, "ray hit %s%s %s \"%s\"",
789	<	thisray.rod < 0.0 ? "back of " : "",
790	<	thisray.ro->omod == OVOID ? VOIDID :
791	<	objptr(thisray.ro->omod)->oname,
788	>	OBJREC  *mat = NULL;
789	>	OBJREC  *mod = NULL;
790	>	char    matspec[256];
791	>	OBJREC  *ino;
792	>
793	>	matspec[0] = '\0';
794	>	if (thisray.ro->omod != OVOID) {
795	>	mod = objptr(thisray.ro->omod);
796	>	mat = findmaterial(mod);
797	>	}
798	>	if (thisray.rod < 0.0)
799	>	strcpy(matspec, "back of ");
800	>	if (mod != NULL) {
801	>	strcat(matspec, mod->oname);
802	>	if (mat != mod && mat != NULL)
803	>	sprintf(matspec+strlen(matspec),
804	>	" (%s)", mat->oname);
805	>	} else
806	>	strcat(matspec, VOIDID);
807	>	sprintf(buf, "ray hit %s %s \"%s\"", matspec,
808		ofun[thisray.ro->otype].funame,
809		thisray.ro->oname);
810		if ((ino = objptr(thisray.robj)) != thisray.ro)
#	Line 746 | Line 832 | char  *s;
832		}
833
834
835	<	extern void
836	<	writepict(s)                            /* write the picture to a file */
837	<	char  *s;
835	>	void
836	>	writepict(                              /* write the picture to a file */
837	>	char  *s
838	>	)
839		{
840		static char  buf[128];
841		char  *fname;
842		FILE  *fp;
843		COLR  *scanline;
844		int  y;
845	<
846	<	while (isspace(*s))
760	<	s++;
761	<	if (*s)
762	<	atos(buf, sizeof(buf), s);
763	<	else if (buf[0] == '\0') {
845	>	/* XXX relies on words.c 2.11 behavior */
846	>	if (nextword(buf, sizeof(buf), s) == NULL && !buf[0]) {
847		error(COMMAND, "no file");
848		return;
849		}

Diff Legend

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