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.63 by greg, Thu Sep 6 00:07:43 2012 UTC vs.
Revision 2.71 by greg, Mon Feb 1 16:19:49 2021 UTC

#	Line 16 | Line 16 | static const char      RCSid[] = "$Id$";
16		#include  "rtprocess.h" /* win_popen() */
17		#include  "paths.h"
18		#include  "ray.h"
19	–	#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 26 | Line 26 | extern double  maxdiff;                        /* max. sample difference */
26
27		#define  CTRL(c)        ((c)-'@')
28
29	<	#ifdef  SMLFLT
30	<	#define  sscanvec(s,v)  (sscanf(s,"%f %f %f",v,v+1,v+2)==3)
31	<	#else
32	<	#define  sscanvec(s,v)  (sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
33	<	#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 373 | Line 369 | getpivot(                              /* pivot viewpoint */
369
370
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		)
#	Line 748 | Line 793 | traceray(                              /* trace a single ray */
793		matspec[0] = '\0';
794		if (thisray.ro->omod != OVOID) {
795		mod = objptr(thisray.ro->omod);
796	<	mat = findmaterial(mod);
796	>	mat = findmaterial(thisray.ro);
797		}
798		if (thisray.rod < 0.0)
799		strcpy(matspec, "back of ");
#	Line 767 | Line 812 | traceray(                              /* trace a single ray */
812		ofun[ino->otype].funame, ino->oname);
813		(*dev->comout)(buf);
814		(*dev->comin)(buf, NULL);
815	<	if (thisray.rot >= FHUGE)
815	>	if (thisray.rot >= FHUGE*.99)
816		(*dev->comout)("at infinity");
817		else {
818		sprintf(buf, "at (%.6g %.6g %.6g) (%.6g)",
819		thisray.rop[0], thisray.rop[1],
820	<	thisray.rop[2], thisray.rt);
820	>	thisray.rop[2], raydistance(&thisray));
821		(*dev->comout)(buf);
822		}
823		(*dev->comin)(buf, NULL);

Diff Legend

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