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.44 by greg, Tue Jan 18 00:33:16 2005 UTC vs.
Revision 2.57 by greg, Fri Aug 29 00:30:51 2008 UTC

#	Line 14 | Line 14 | static const char      RCSid[] = "$Id$";
14
15		#include  "platform.h"
16		#include  "ray.h"
17	+	#include  "source.h"
18		#include  "ambient.h"
19		#include  "otypes.h"
20		#include  "rpaint.h"
#	Line 35 | Line 36 | extern char  *progname;
36		extern char  *octname;
37
38
39	<	extern void
39	>	void
40		getframe(                               /* get a new frame */
41		char  *s
42		)
#	Line 46 | Line 47 | getframe(                              /* get a new frame */
47		}
48
49
50	<	extern void
50	>	void
51		getrepaint(                             /* get area and repaint */
52		char  *s
53		)
#	Line 55 | Line 56 | getrepaint(                            /* get area and repaint */
56
57		if (getrect(s, &box) < 0)
58		return;
59	<	paintrect(&ptrunk, 0, 0, hresolu, vresolu, &box);
59	>	paintrect(&ptrunk, &box);
60		}
61
62
63	<	extern void
63	>	void
64		getview(                                /* get/show view parameters */
65		char  *s
66		)
#	Line 109 | Line 110 | getview(                               /* get/show view parameters */
110		if (sscanvec(buf, nv.vp))
111		change++;
112		sprintf(buf, "view direction (%.6g %.6g %.6g): ",
113	<	ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]);
113	>	ourview.vdir[0]*ourview.vdist,
114	>	ourview.vdir[1]*ourview.vdist,
115	>	ourview.vdir[2]*ourview.vdist);
116		(*dev->comout)(buf);
117		(*dev->comin)(buf, NULL);
118		if (buf[0] == CTRL('C')) return;
119	<	if (sscanvec(buf, nv.vdir))
119	>	if (sscanvec(buf, nv.vdir)) {
120	>	nv.vdist = 1.;
121		change++;
122	+	}
123		sprintf(buf, "view up (%.6g %.6g %.6g): ",
124		ourview.vup[0], ourview.vup[1], ourview.vup[2]);
125		(*dev->comout)(buf);
#	Line 148 | Line 153 | getview(                               /* get/show view parameters */
153		}
154
155
156	<	extern void
156	>	void
157		lastview(                               /* return to a previous view */
158		char  *s
159		)
#	Line 179 | Line 184 | lastview(                              /* return to a previous view */
184		nv = ourview;
185		ourview = oldview;
186		oldview = nv;
187	<	newimage();
187	>	newimage(NULL);
188		}
189
190
191	<	extern void
191	>	void
192		saveview(                               /* save view to rad file */
193		char  *s
194		)
#	Line 221 | Line 226 | saveview(                              /* save view to rad file */
226		}
227
228
229	<	extern void
229	>	void
230		loadview(                               /* load view from rad file */
231		char  *s
232		)
#	Line 264 | Line 269 | loadview(                              /* load view from rad file */
269		}
270
271
272	<	extern void
272	>	void
273		getaim(                         /* aim camera */
274		char  *s
275		)
#	Line 279 | Line 284 | getaim(                                /* aim camera */
284		}
285
286
287	<	extern void
287	>	void
288	>	getfocus(                               /* set focus distance */
289	>	char *s
290	>	)
291	>	{
292	>	char  buf[64];
293	>	double  dist;
294	>
295	>	if (sscanf(s, "%lf", &dist) < 1) {
296	>	int     x, y;
297	>	RAY     thisray;
298	>	if (dev->getcur == NULL)
299	>	return;
300	>	(*dev->comout)("Pick focus point\n");
301	>	if ((*dev->getcur)(&x, &y) == ABORT)
302	>	return;
303	>	if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
304	>	&ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) {
305	>	error(COMMAND, "not on image");
306	>	return;
307	>	}
308	>	rayorigin(&thisray, PRIMARY, NULL, NULL);
309	>	if (!localhit(&thisray, &thescene)) {
310	>	error(COMMAND, "not a local object");
311	>	return;
312	>	}
313	>	dist = thisray.rot;
314	>	} else if (dist <= .0) {
315	>	error(COMMAND, "focus distance must be positive");
316	>	return;
317	>	}
318	>	ourview.vdist = dist;
319	>	sprintf(buf, "Focus distance set to %f\n", dist);
320	>	(*dev->comout)(buf);
321	>	}
322	>
323	>
324	>	void
325		getmove(                                /* move camera */
326		char  *s
327		)
#	Line 293 | Line 335 | getmove(                               /* move camera */
335		}
336
337
338	<	extern void
338	>	void
339		getrotate(                              /* rotate camera */
340		char  *s
341		)
#	Line 318 | Line 360 | getrotate(                             /* rotate camera */
360		}
361
362
363	<	extern void
363	>	void
364		getpivot(                               /* pivot viewpoint */
365	<	register char  *s
365	>	char  *s
366		)
367		{
368		FVECT  vc;
#	Line 337 | Line 379 | getpivot(                              /* pivot viewpoint */
379		}
380
381
382	<	extern void
382	>	void
383		getexposure(                            /* get new exposure */
384		char  *s
385		)
386		{
387		char  buf[128];
388	<	register char  *cp;
347	<	RECT  r;
388	>	char  *cp;
389		int  x, y;
390	<	register PNODE  *p = &ptrunk;
390	>	PNODE  *p = &ptrunk;
391		int  adapt = 0;
392		double  e = 1.0;
393
#	Line 363 | Line 404 | getexposure(                           /* get new exposure */
404		(*dev->comout)("Pick point for exposure\n");
405		if ((*dev->getcur)(&x, &y) == ABORT)
406		return;
407	<	r.l = r.d = 0;
367	<	r.r = hresolu; r.u = vresolu;
368	<	p = findrect(x, y, &ptrunk, &r, -1);
407	>	p = findrect(x, y, &ptrunk, -1);
408		} else {
409		if (*cp == '=') {       /* absolute setting */
410		p = NULL;
#	Line 405 | Line 444 | getexposure(                           /* get new exposure */
444		}
445
446		typedef union {int i; double d; COLOR C;}       *MyUptr;
447	+	#define  FEQ(x,y)     (fabs((x)-(y)) <= FTINY)
448
449	<	extern int
449	>	int
450		getparam(               /* get variable from user */
451		char  *str,
452		char  *dsc,
#	Line 414 | Line 454 | getparam(              /* get variable from user */
454		void  *p
455		)
456		{
457	<	register MyUptr  ptr = (MyUptr)p;
457	>	MyUptr  ptr = (MyUptr)p;
458		int  i0;
459		double  d0, d1, d2;
460		char  buf[48];
#	Line 429 | Line 469 | getparam(              /* get variable from user */
469		if (sscanf(buf, "%d", &i0) != 1)
470		return(0);
471		}
472	+	if (ptr->i == i0)
473	+	return(0);
474		ptr->i = i0;
475	<	return(1);
475	>	break;
476		case 'r':                       /* real */
477		if (sscanf(str, "%lf", &d0) != 1) {
478		(*dev->comout)(dsc);
#	Line 440 | Line 482 | getparam(              /* get variable from user */
482		if (sscanf(buf, "%lf", &d0) != 1)
483		return(0);
484		}
485	+	if (FEQ(ptr->d, d0))
486	+	return(0);
487		ptr->d = d0;
488	<	return(1);
488	>	break;
489		case 'b':                       /* boolean */
490		if (sscanf(str, "%1s", buf) != 1) {
491		(*dev->comout)(dsc);
492		sprintf(buf, "? (%c): ", ptr->i ? 'y' : 'n');
493		(*dev->comout)(buf);
494		(*dev->comin)(buf, NULL);
495	<	if (buf[0] == '\0' ||
452	<	strchr("yY+1tTnN-0fF", buf[0]) == NULL)
495	>	if (buf[0] == '\0')
496		return(0);
497		}
498	<	ptr->i = strchr("yY+1tT", buf[0]) != NULL;
499	<	return(1);
498	>	if (strchr("yY+1tTnN-0fF", buf[0]) == NULL)
499	>	return(0);
500	>	i0 = strchr("yY+1tT", buf[0]) != NULL;
501	>	if (ptr->i == i0)
502	>	return(0);
503	>	ptr->i = i0;
504	>	break;
505		case 'C':                       /* color */
506		if (sscanf(str, "%lf %lf %lf", &d0, &d1, &d2) != 3) {
507		(*dev->comout)(dsc);
#	Line 466 | Line 514 | getparam(              /* get variable from user */
514		if (sscanf(buf, "%lf %lf %lf", &d0, &d1, &d2) != 3)
515		return(0);
516		}
517	+	if (FEQ(colval(ptr->C,RED), d0) &&
518	+	FEQ(colval(ptr->C,GRN), d1) &&
519	+	FEQ(colval(ptr->C,BLU), d2))
520	+	return(0);
521		setcolor(ptr->C, d0, d1, d2);
522	<	return(1);
522	>	break;
523	>	default:
524	>	return(0);              /* shouldn't happen */
525		}
526	<	return 0; /* nothing matched */
526	>	newparam++;
527	>	return(1);
528		}
529
530
531	<	extern void
531	>	void
532		setparam(                               /* get/set program parameter */
533	<	register char  *s
533	>	char  *s
534		)
535		{
536		char  buf[128];
537
538		if (s[0] == '\0') {
539		(*dev->comout)(
540	<	"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: ");
540	>	"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: ");
541		(*dev->comin)(buf, NULL);
542		s = buf;
543		}
544		switch (s[0]) {
545	+	case 'u':                       /* uncorrelated sampling */
546	+	getparam(s+1, "uncorrelated sampling", 'b',
547	+	(void *)&rand_samp);
548	+	break;
549		case 'l':                       /* limit */
550		switch (s[1]) {
551		case 'w':                       /* weight */
#	Line 648 | Line 707 | badparam:
707		}
708
709
710	<	extern void
711	<	traceray(s)                             /* trace a single ray */
712	<	char  *s;
710	>	void
711	>	traceray(                               /* trace a single ray */
712	>	char  *s
713	>	)
714		{
715		char  buf[128];
716		int  x, y;
#	Line 679 | Line 739 | char  *s;
739		return;
740		}
741
742	<	rayorigin(&thisray, NULL, PRIMARY, 1.0);
683	<
684	<	rayvalue(&thisray);
742	>	ray_trace(&thisray);
743
744		if (thisray.ro == NULL)
745		(*dev->comout)("ray hit nothing");
746		else {
747	<	sprintf(buf, "ray hit %s%s %s \"%s\"",
748	<	thisray.rod < 0.0 ? "back of " : "",
749	<	thisray.ro->omod == OVOID ? VOIDID :
750	<	objptr(thisray.ro->omod)->oname,
747	>	OBJREC  *mat = NULL;
748	>	OBJREC  *mod = NULL;
749	>	char    matspec[256];
750	>	matspec[0] = '\0';
751	>	if (thisray.ro->omod != OVOID) {
752	>	mod = objptr(thisray.ro->omod);
753	>	mat = findmaterial(mod);
754	>	}
755	>	if (thisray.rod < 0.0)
756	>	strcpy(matspec, "back of ");
757	>	if (mod != NULL) {
758	>	strcat(matspec, mod->oname);
759	>	if (mat != mod && mat != NULL)
760	>	sprintf(matspec+strlen(matspec),
761	>	" (%s)", mat->oname);
762	>	} else
763	>	strcat(matspec, VOIDID);
764	>	sprintf(buf, "ray hit %s %s \"%s\"", matspec,
765		ofun[thisray.ro->otype].funame,
766		thisray.ro->oname);
767		if ((ino = objptr(thisray.robj)) != thisray.ro)
#	Line 717 | Line 789 | char  *s;
789		}
790
791
792	<	extern void
793	<	writepict(s)                            /* write the picture to a file */
794	<	char  *s;
792	>	void
793	>	writepict(                              /* write the picture to a file */
794	>	char  *s
795	>	)
796		{
797		static char  buf[128];
798		char  *fname;

Diff Legend

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