ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/rtrace.c

Comparing ray/src/rt/rtrace.c (file contents):
Revision 2.41 by greg, Wed May 25 04:44:26 2005 UTC vs.
Revision 2.52 by greg, Wed Feb 22 17:05:36 2006 UTC

#	Line 29 | Line 29 | static const char      RCSid[] = "$Id$";
29		#include  "source.h"
30		#include  "otypes.h"
31		#include  "resolu.h"
32	+	#include  "random.h"
33
34		CUBE  thescene;                         /* our scene */
35		OBJECT  nsceneobjs;                     /* number of objects in our scene */
#	Line 46 | Line 47 | char  *outvals = "v";                  /* output specification */
47
48		int  do_irrad = 0;                      /* compute irradiance? */
49
50	+	int  rand_samp = 0;                     /* pure Monte Carlo sampling? */
51	+
52		void  (*trace)() = NULL;                /* trace call */
53
54		char  *tralist[128];                    /* list of modifers to trace (or no) */
55		int  traincl = -1;                      /* include == 1, exclude == 0 */
56	<	#define  MAXTSET        511             /* maximum number in trace set */
56	>	#ifndef  MAXTSET
57	>	#define  MAXTSET        8192            /* maximum number in trace set */
58	>	#endif
59		OBJECT  traset[MAXTSET+1]={0};          /* trace include/exclude set */
60
61		int  hresolu = 0;                       /* horizontal (scan) size */
#	Line 74 | Line 79 | double  specjitter = 1.;               /* specular sampling jitter
79
80		int  backvis = 1;                       /* back face visibility */
81
82	<	int  maxdepth = 8;                      /* maximum recursion depth */
82	>	int  maxdepth = -10;                    /* maximum recursion depth */
83		double  minweight = 2e-3;               /* minimum ray weight */
84
85		char  *ambfile = NULL;                  /* ambient file name */
#	Line 96 | Line 101 | typedef void putf_t(double v);
101		static putf_t puta, putd, putf;
102
103		typedef void oputf_t(RAY *r);
104	<	static oputf_t  oputo, oputd, oputv, oputl, oputL, oputc, oputp,
105	<	oputn, oputN, oputs, oputw, oputW, oputm, oputM, oputdash;
104	>	static oputf_t  oputo, oputd, oputv, oputV, oputl, oputL, oputc, oputp,
105	>	oputn, oputN, oputs, oputw, oputW, oputm, oputM, oputtilde;
106
107		static void setoutput(char *vs);
108		static void tranotify(OBJECT obj);
#	Line 148 | Line 153 | rtrace(                                /* trace rays from file */
153		char  *fname
154		)
155		{
156	<	long  vcount = hresolu>1 ? hresolu*vresolu : vresolu;
156	>	unsigned long  vcount = (hresolu > 1) ? (unsigned long)hresolu*vresolu
157	>	: vresolu;
158		long  nextflush = hresolu;
159		FILE  *fp;
160		double  d;
#	Line 160 | Line 166 | rtrace(                                /* trace rays from file */
166		sprintf(errmsg, "cannot open input file \"%s\"", fname);
167		error(SYSTEM, errmsg);
168		}
163	–	#ifdef _WIN32
169		if (inform != 'a')
170		SET_FILE_BINARY(fp);
166	–	#endif
171		/* set up output */
172		setoutput(outvals);
173		switch (outform) {
#	Line 189 | Line 193 | rtrace(                                /* trace rays from file */
193		d = normalize(direc);
194		if (d == 0.0) {                         /* zero ==> flush */
195		bogusray();
196	<	if (--nextflush <= 0 || vcount <= 0) {
196	>	if (--nextflush <= 0 || !vcount) {
197		fflush(stdout);
198		nextflush = hresolu;
199		}
200		} else {
201	<	samplendx++;
201	>	samplendx = rand_samp ? random() : samplendx+1;
202		/* compute and print */
203		if (imm_irrad)
204		irrad(orig, direc);
205		else
206		rad(orig, direc, lim_dist ? d : 0.0);
207		/* flush if time */
208	<	if (--nextflush == 0) {
208	>	if (!--nextflush) {
209		fflush(stdout);
210		nextflush = hresolu;
211		}
212		}
213		if (ferror(stdout))
214		error(SYSTEM, "write error");
215	<	if (--vcount == 0)                      /* check for end */
215	>	if (vcount && !--vcount)                /* check for end */
216		break;
217		}
218	<	fflush(stdout);
219	<	if (vcount > 0)
220	<	error(USER, "read error");
218	>	if (fflush(stdout) < 0)
219	>	error(SYSTEM, "write error");
220	>	if (vcount)
221	>	error(USER, "unexpected EOF on input");
222		if (fname != NULL)
223		fclose(fp);
224		}
#	Line 240 | Line 245 | setoutput(                             /* set up output tables */
245		while (*vs)
246		switch (*vs++) {
247		case 'T':                               /* trace sources */
248	+	if (!*vs) break;
249		trace_sources();
250		/* fall through */
251		case 't':                               /* trace */
252	+	if (!*vs) break;
253		*table = NULL;
254		table = every_out;
255		trace = ourtrace;
#	Line 258 | Line 265 | setoutput(                             /* set up output tables */
265		*table++ = oputv;
266		castonly = 0;
267		break;
268	+	case 'V':                               /* contribution */
269	+	*table++ = oputV;
270	+	if (ambounce > 0 && (ambacc > FTINY || ambssamp > 0))
271	+	error(WARNING,
272	+	"-otV accuracy depends on -aa 0 -as 0");
273	+	break;
274		case 'l':                               /* effective distance */
275		*table++ = oputl;
276		castonly = 0;
#	Line 296 | Line 309 | setoutput(                             /* set up output tables */
309		case 'M':                               /* material */
310		*table++ = oputM;
311		break;
312	<	case '-':                               /* dash */
313	<	*table++ = oputdash;
312	>	case '~':                               /* tilde */
313	>	*table++ = oputtilde;
314		break;
315		}
316		*table = NULL;
#	Line 525 | Line 538 | oputv(                         /* print value */
538
539
540		static void
541	+	oputV(                          /* print value contribution */
542	+	RAY *r
543	+	)
544	+	{
545	+	double  contr[3];
546	+
547	+	raycontrib(contr, r, PRIMARY);
548	+	multcolor(contr, r->rcol);
549	+	(*putreal)(contr[RED]);
550	+	(*putreal)(contr[GRN]);
551	+	(*putreal)(contr[BLU]);
552	+	}
553	+
554	+
555	+	static void
556		oputl(                          /* print effective distance */
557		RAY  *r
558		)
#	Line 629 | Line 657 | oputw(                         /* print weight */
657
658
659		static void
660	<	oputW(                          /* print contribution */
660	>	oputW(                          /* print coefficient */
661		RAY  *r
662		)
663		{
664	<	COLOR   contr;
664	>	double  contr[3];
665
666		raycontrib(contr, r, PRIMARY);
667	<	(*putreal)(colval(contr,RED));
668	<	(*putreal)(colval(contr,GRN));
669	<	(*putreal)(colval(contr,BLU));
667	>	(*putreal)(contr[RED]);
668	>	(*putreal)(contr[GRN]);
669	>	(*putreal)(contr[BLU]);
670		}
671
672
#	Line 677 | Line 705 | oputM(                         /* print material */
705
706
707		static void
708	<	oputdash(                       /* output dash (spacer) */
708	>	oputtilde(                      /* output tilde (spacer) */
709		RAY  *r
710		)
711		{
712	<	putchar('-');
685	<	putchar('\t');
712	>	fputs("~\t", stdout);
713		}
714
715

Diff Legend

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