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.53 by greg, Mon Aug 22 07:02:21 2005 UTC vs.
Revision 2.73 by greg, Sun Nov 14 17:30:02 2021 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"
17	–	#include  "source.h"
19		#include  "ambient.h"
20		#include  "otypes.h"
21	+	#include  "otspecial.h"
22		#include  "rpaint.h"
23
24		extern int  psample;                    /* pixel sample size */
#	Line 24 | Line 26 | extern double  maxdiff;                        /* max. sample difference */
26
27		#define  CTRL(c)        ((c)-'@')
28
29	<	#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
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 36 | 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 47 | 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 56 | 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 80 | Line 78 | getview(                               /* get/show view parameters */
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 153 | Line 151 | getview(                               /* get/show view parameters */
151		}
152
153
154	<	extern void
154	>	void
155		lastview(                               /* return to a previous view */
156		char  *s
157		)
#	Line 162 | 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 184 | 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 204 | Line 202 | saveview(                              /* save view to rad file */
202		}
203		s = sskip(s);
204		}
205	<	while (isspace(*s))
208	<	s++;
209	<	if (*s)
210	<	atos(rifname, sizeof(rifname), s);
211	<	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 226 | 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 241 | Line 235 | loadview(                              /* load view from rad file */
235		s = sskip(s);
236		else
237		strcat(buf, "1");
238	<	if (*s)
245	<	atos(rifname, sizeof(rifname), s);
246	<	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 269 | Line 261 | loadview(                              /* load view from rad file */
261		}
262
263
264	<	extern void
264	>	void
265		getaim(                         /* aim camera */
266		char  *s
267		)
#	Line 284 | Line 276 | getaim(                                /* aim camera */
276		}
277
278
279	<	extern void
279	>	void
280		getfocus(                               /* set focus distance */
281		char *s
282		)
283		{
284		char  buf[64];
293	–	FVECT  vc;
285		double  dist;
286
287		if (sscanf(s, "%lf", &dist) < 1) {
#	Line 322 | Line 313 | getfocus(                              /* set focus distance */
313		}
314
315
316	<	extern void
316	>	void
317		getmove(                                /* move camera */
318		char  *s
319		)
#	Line 336 | 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 = ourview;
345	–	FVECT  v1;
336		double  angle, elev, zfact;
337
338		elev = 0.0; zfact = 1.0;
#	Line 351 | Line 341 | getrotate(                             /* rotate camera */
341		return;
342		}
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);
357	<	spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.));
358	<	}
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 380 | 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;
390	<	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 406 | 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;
410	<	r.r = hresolu; r.u = vresolu;
411	<	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 431 | 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 449 | Line 484 | getexposure(                           /* get new exposure */
484
485		typedef union {int i; double d; COLOR C;}       *MyUptr;
486
487	<	extern int
487	>	int
488		getparam(               /* get variable from user */
489		char  *str,
490		char  *dsc,
#	Line 457 | Line 492 | getparam(              /* get variable from user */
492		void  *p
493		)
494		{
495	<	register MyUptr  ptr = (MyUptr)p;
495	>	MyUptr  ptr = (MyUptr)p;
496		int  i0;
497		double  d0, d1, d2;
498		char  buf[48];
#	Line 472 | Line 507 | getparam(              /* get variable from user */
507		if (sscanf(buf, "%d", &i0) != 1)
508		return(0);
509		}
510	+	if (ptr->i == i0)
511	+	return(0);
512		ptr->i = i0;
513	<	return(1);
513	>	break;
514		case 'r':                       /* real */
515		if (sscanf(str, "%lf", &d0) != 1) {
516		(*dev->comout)(dsc);
#	Line 483 | Line 520 | getparam(              /* get variable from user */
520		if (sscanf(buf, "%lf", &d0) != 1)
521		return(0);
522		}
523	+	if (FABSEQ(ptr->d, d0))
524	+	return(0);
525		ptr->d = d0;
526	<	return(1);
526	>	break;
527		case 'b':                       /* boolean */
528		if (sscanf(str, "%1s", buf) != 1) {
529		(*dev->comout)(dsc);
530		sprintf(buf, "? (%c): ", ptr->i ? 'y' : 'n');
531		(*dev->comout)(buf);
532		(*dev->comin)(buf, NULL);
533	<	if (buf[0] == '\0' ||
495	<	strchr("yY+1tTnN-0fF", buf[0]) == NULL)
533	>	if (buf[0] == '\0')
534		return(0);
535		}
536	<	ptr->i = strchr("yY+1tT", buf[0]) != NULL;
537	<	return(1);
536	>	if (strchr("yY+1tTnN-0fF", buf[0]) == NULL)
537	>	return(0);
538	>	i0 = strchr("yY+1tT", buf[0]) != NULL;
539	>	if (ptr->i == i0)
540	>	return(0);
541	>	ptr->i = i0;
542	>	break;
543		case 'C':                       /* color */
544		if (sscanf(str, "%lf %lf %lf", &d0, &d1, &d2) != 3) {
545		(*dev->comout)(dsc);
#	Line 509 | Line 552 | getparam(              /* get variable from user */
552		if (sscanf(buf, "%lf %lf %lf", &d0, &d1, &d2) != 3)
553		return(0);
554		}
555	+	if (FABSEQ(colval(ptr->C,RED), d0) &&
556	+	FABSEQ(colval(ptr->C,GRN), d1) &&
557	+	FABSEQ(colval(ptr->C,BLU), d2))
558	+	return(0);
559		setcolor(ptr->C, d0, d1, d2);
560	<	return(1);
560	>	break;
561	>	default:
562	>	return(0);              /* shouldn't happen */
563		}
564	<	return 0; /* nothing matched */
564	>	newparam++;
565	>	return(1);
566		}
567
568
569	<	extern void
569	>	void
570		setparam(                               /* get/set program parameter */
571	<	register char  *s
571	>	char  *s
572		)
573		{
574	+	int  prev_newp = newparam;
575		char  buf[128];
576
577		if (s[0] == '\0') {
578		(*dev->comout)(
579	<	"aa ab ad ar as av aw b bv dc dv dj ds dt i lr lw me ma mg ms ps pt sj st u: ");
579	>	"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: ");
580		(*dev->comin)(buf, NULL);
581		s = buf;
582		}
#	Line 586 | Line 637 | setparam(                              /* get/set program parameter */
637		case 'n': case 'N': case 'f': case 'F': case '0': case '-':
638		getparam(s+1, "black and white", 'b',
639		(void *)&greyscale);
640	+	newparam = prev_newp;
641		break;
642		default:
643		goto badparam;
#	Line 668 | Line 720 | setparam(                              /* get/set program parameter */
720		default:
721		goto badparam;
722		}
723	+	newparam = prev_newp;
724		break;
725		case 's':                       /* specular */
726		switch (s[1]) {
727	<	case 'j':                       /* jitter */
728	<	getparam(s+2, "specular jitter", 'r',
727	>	case 's':                       /* sampling */
728	>	getparam(s+2, "specular sampling", 'r',
729		(void *)&specjitter);
730		break;
731		case 't':                       /* threshold */
#	Line 695 | Line 748 | badparam:
748		}
749
750
751	<	extern void
752	<	traceray(s)                             /* trace a single ray */
753	<	char  *s;
751	>	void
752	>	traceray(                               /* trace a single ray */
753	>	char  *s
754	>	)
755		{
756	<	char  buf[128];
757	<	int  x, y;
704	<	OBJREC  *ino;
705	<	RAY  thisray;
756	>	RAY     thisray;
757	>	char    buf[512];
758
759		thisray.rmax = 0.0;
760
761		if (!sscanvec(s, thisray.rorg) ||
762		!sscanvec(sskip2(s,3), thisray.rdir)) {
763	+	int  x, y;
764
765		if (dev->getcur == NULL)
766		return;
#	Line 726 | Line 779 | char  *s;
779		return;
780		}
781
782	<	rayorigin(&thisray, PRIMARY, NULL, NULL);
730	<
731	<	rayvalue(&thisray);
782	>	ray_trace(&thisray);
783
784		if (thisray.ro == NULL)
785		(*dev->comout)("ray hit nothing");
#	Line 736 | Line 787 | char  *s;
787		OBJREC  *mat = NULL;
788		OBJREC  *mod = NULL;
789		char    matspec[256];
790	+	OBJREC  *ino;
791	+
792		matspec[0] = '\0';
793		if (thisray.ro->omod != OVOID) {
794		mod = objptr(thisray.ro->omod);
795	<	mat = findmaterial(mod);
795	>	mat = findmaterial(thisray.ro);
796		}
797		if (thisray.rod < 0.0)
798		strcpy(matspec, "back of ");
#	Line 758 | Line 811 | char  *s;
811		ofun[ino->otype].funame, ino->oname);
812		(*dev->comout)(buf);
813		(*dev->comin)(buf, NULL);
814	<	if (thisray.rot >= FHUGE)
814	>	if (thisray.rot >= FHUGE*.99)
815		(*dev->comout)("at infinity");
816		else {
817		sprintf(buf, "at (%.6g %.6g %.6g) (%.6g)",
818		thisray.rop[0], thisray.rop[1],
819	<	thisray.rop[2], thisray.rt);
819	>	thisray.rop[2], raydistance(&thisray));
820		(*dev->comout)(buf);
821		}
822		(*dev->comin)(buf, NULL);
#	Line 778 | Line 831 | char  *s;
831		}
832
833
834	<	extern void
835	<	writepict(s)                            /* write the picture to a file */
836	<	char  *s;
834	>	void
835	>	writepict(                              /* write the picture to a file */
836	>	char  *s
837	>	)
838		{
839		static char  buf[128];
840		char  *fname;
841		FILE  *fp;
842		COLR  *scanline;
843		int  y;
844	<
845	<	while (isspace(*s))
792	<	s++;
793	<	if (*s)
794	<	atos(buf, sizeof(buf), s);
795	<	else if (buf[0] == '\0') {
844	>	/* XXX relies on words.c 2.11 behavior */
845	>	if (nextword(buf, sizeof(buf), s) == NULL && !buf[0]) {
846		error(COMMAND, "no file");
847		return;
848		}
#	Line 820 | Line 870 | char  *s;
870		fputexpos(exposure, fp);
871		if (dev->pixaspect != 1.0)
872		fputaspect(dev->pixaspect, fp);
873	+	fputprims(stdprims, fp);
874		fputformat(COLRFMT, fp);
875		putc('\n', fp);
876		fprtresolu(hresolu, vresolu, fp);

Diff Legend

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