ViewVC Help

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

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

Comparing ray/src/rt/raytrace.c (file contents):
Revision 2.65 by greg, Wed Feb 19 14:12:48 2014 UTC vs.
Revision 2.73 by greg, Tue Nov 13 19:58:33 2018 UTC

#	Line 14 | Line 14 | static const char RCSid[] = "$Id$";
14		#include  "otypes.h"
15		#include  "otspecial.h"
16		#include  "random.h"
17	+	#include  "pmap.h"
18
19		#define  MAXCSET        ((MAXSET+1)*2-1)        /* maximum check set size */
20
#	Line 50 | Line 51 | rayorigin(             /* start new ray from old one */
51		setcolor(r->rcoef, 1., 1., 1.);
52		} else {
53		rw = intens(rc);
54	+	if (rw > 1.0)
55	+	rw = 1.0;               /* avoid calculation growth */
56		if (rc != r->rcoef)
57		copycolor(r->rcoef, rc);
58		}
#	Line 106 | Line 109 | rayorigin(             /* start new ray from old one */
109		return(-1);
110		if (r->crtype & SHADOW)                 /* shadow commitment */
111		return(0);
112	+	/* ambient in photon map? */
113	+	if (ro != NULL && ro->crtype & AMBIENT) {
114	+	if (causticPhotonMapping)
115	+	return(-1);
116	+	if (photonMapping && rt != TRANS)
117	+	return(-1);
118	+	}
119		if (maxdepth <= 0 && rc != NULL) {      /* Russian roulette */
120		if (minweight <= 0.0)
121		error(USER, "zero ray weight in Russian roulette");
#	Line 135 | Line 145 | rayclear(                      /* clear a ray for (re)evaluation */
145		r->robj = OVOID;
146		r->ro = NULL;
147		r->rox = NULL;
148	<	r->rt = r->rot = FHUGE;
148	>	r->rxt = r->rmt = r->rot = FHUGE;
149		r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
150		r->uv[0] = r->uv[1] = 0.0;
151		setcolor(r->pcol, 1.0, 1.0, 1.0);
152	+	setcolor(r->mcol, 0.0, 0.0, 0.0);
153		setcolor(r->rcol, 0.0, 0.0, 0.0);
154		}
155
#	Line 181 | Line 192 | raytrans(                      /* transmit ray as is */
192		{
193		RAY  tr;
194
195	<	if (rayorigin(&tr, TRANS, r, NULL) == 0) {
196	<	VCOPY(tr.rdir, r->rdir);
197	<	rayvalue(&tr);
198	<	copycolor(r->rcol, tr.rcol);
199	<	r->rt = r->rot + tr.rt;
200	<	}
195	>	rayorigin(&tr, TRANS, r, NULL);         /* always continue */
196	>	VCOPY(tr.rdir, r->rdir);
197	>	rayvalue(&tr);
198	>	copycolor(r->rcol, tr.rcol);
199	>	r->rmt = r->rot + tr.rmt;
200	>	r->rxt = r->rot + tr.rxt;
201		}
202
203
#	Line 198 | Line 209 | rayshade(              /* shade ray r with material mod */
209		{
210		OBJREC  *m;
211
212	<	r->rt = r->rot;                 /* set effective ray length */
212	>	r->rxt = r->rmt = r->rot;       /* preset effective ray length */
213		for ( ; mod != OVOID; mod = m->omod) {
214		m = objptr(mod);
215		/****** unnecessary test since modifier() is always called
#	Line 209 | Line 220 | rayshade(              /* shade ray r with material mod */
220		******/
221		/* hack for irradiance calculation */
222		if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS)) &&
223	<	m->otype != MAT_CLIP &&
224	<	(ofun[m->otype].flags & (T_M|T_X))) {
225	<	if (irr_ignore(m->otype)) {
223	>	(ofun[m->otype].flags & (T_M|T_X)) &&
224	>	m->otype != MAT_CLIP) {
225	>	if (istransp(m->otype) || isBSDFproxy(m)) {
226		raytrans(r);
227		return(1);
228		}
#	Line 249 | Line 260 | rayparticipate(                        /* compute ray medium participation
260		multcolor(r->rcol, ce);                 /* path extinction */
261		if (r->crtype & SHADOW || intens(r->albedo) <= FTINY)
262		return;                         /* no scattering */
263	<	setcolor(ca,
264	<	colval(r->albedo,RED)*colval(ambval,RED)*(1.-colval(ce,RED)),
265	<	colval(r->albedo,GRN)*colval(ambval,GRN)*(1.-colval(ce,GRN)),
266	<	colval(r->albedo,BLU)*colval(ambval,BLU)*(1.-colval(ce,BLU)));
267	<	addcolor(r->rcol, ca);                  /* ambient in scattering */
263	>
264	>	/* PMAP: indirect inscattering accounted for by volume photons? */
265	>	if (!volumePhotonMapping) {
266	>	setcolor(ca,
267	>	colval(r->albedo,RED)*colval(ambval,RED)*(1.-colval(ce,RED)),
268	>	colval(r->albedo,GRN)*colval(ambval,GRN)*(1.-colval(ce,GRN)),
269	>	colval(r->albedo,BLU)*colval(ambval,BLU)*(1.-colval(ce,BLU)));
270	>	addcolor(r->rcol, ca);                  /* ambient in scattering */
271	>	}
272	>
273		srcscatter(r);                          /* source in scattering */
274		}
275
#	Line 292 | Line 308 | raymixture(            /* mix modifiers */
308		)
309		{
310		RAY  fr, br;
311	+	double  mfore, mback;
312		int  foremat, backmat;
313		int  i;
314		/* bound coefficient */
#	Line 338 | Line 355 | raymixture(            /* mix modifiers */
355		scalecolor(br.rcol, 1.0-coef);
356		copycolor(r->rcol, fr.rcol);
357		addcolor(r->rcol, br.rcol);
358	<	r->rt = bright(fr.rcol) > bright(br.rcol) ? fr.rt : br.rt;
358	>	mfore = bright(fr.mcol); mback = bright(br.mcol);
359	>	r->rmt = mfore > mback ? fr.rmt : br.rmt;
360	>	r->rxt = bright(fr.rcol)-mfore > bright(br.rcol)-mback ?
361	>	fr.rxt : br.rxt;
362		return(1);
363		}
364

Diff Legend

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