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.88 by greg, Wed Nov 15 18:02:53 2023 UTC vs.
Revision 2.95 by greg, Thu Feb 6 02:17:33 2025 UTC

#	Line 50 | Line 50 | rayorigin(             /* start new ray from old one */
50		rw = 1.0;
51		setscolor(r->rcoef, 1., 1., 1.);
52		} else {
53	<	rw = sintens(rc);
53	>	rw = sintens((COLORV *)rc);
54		if (rw > 1.0)
55		rw = 1.0;               /* avoid calculation growth */
56		if (rc != r->rcoef)
#	Line 73 | Line 73 | rayorigin(             /* start new ray from old one */
73		return(-1);             /* illegal continuation */
74		}
75		r->rlvl = ro->rlvl;
76	+	r->rsrc = ro->rsrc;
77		if (rt & RAYREFL) {
78		r->rlvl++;
79	<	r->rsrc = -1;
79	>	if (r->rsrc >= 0)       /* malfunctioning material? */
80	>	r->rsrc = -1;
81		r->clipset = ro->clipset;
82		r->rmax = 0.0;
83		} else {
82	–	r->rsrc = ro->rsrc;
84		r->clipset = ro->newcset;
85	<	r->rmax = ro->rmax <= FTINY ? 0.0 : ro->rmax - ro->rot;
85	>	r->rmax = (ro->rmax > FTINY)*(ro->rmax - ro->rot);
86		}
87		r->revf = ro->revf;
88		copycolor(r->cext, ro->cext);
#	Line 212 | Line 213 | raytirrad(                     /* irradiance hack */
213		RAY     *r
214		)
215		{
216	<	if (ofun[m->otype].flags & (T_M|T_X) && m->otype != MAT_CLIP) {
217	<	if (istransp(m->otype) || isBSDFproxy(m)) {
216	>	if (m->otype != MAT_CLIP && ismaterial(m->otype)) {
217	>	if (istransp(m) || isBSDFproxy(m)) {
218		raytrans(r);
219		return(1);
220		}
#	Line 283 | Line 284 | rayparticipate(                        /* compute ray medium participation
284		/* PMAP: indirect inscattering accounted for by volume photons? */
285		if (!volumePhotonMapping) {
286		setscolor(ca,
287	<	colval(r->albedo,RED)*colval(ambval,RED)*(1.-colval(ce,RED)),
288	<	colval(r->albedo,GRN)*colval(ambval,GRN)*(1.-colval(ce,GRN)),
289	<	colval(r->albedo,BLU)*colval(ambval,BLU)*(1.-colval(ce,BLU)));
287	>	colval(r->albedo,RED)*colval(ambval,RED)*(1.-scolval(ce,RED)),
288	>	colval(r->albedo,GRN)*colval(ambval,GRN)*(1.-scolval(ce,GRN)),
289	>	colval(r->albedo,BLU)*colval(ambval,BLU)*(1.-scolval(ce,BLU)));
290		saddscolor(r->rcol, ca);                /* ambient in scattering */
291		}
292
#	Line 416 | Line 417 | raycontrib(            /* compute (cumulative) ray contribution
417		while (r != NULL && r->crtype&flags) {
418		smultscolor(rc, r->rcoef);
419		/* check for participating medium */
420	<	if (!warnedPM && (bright(r->cext) > FTINY) |
421	<	(bright(r->albedo) > FTINY)) {
420	>	if (bright(r->cext) > FTINY) {
421	>	double  re = r->rot*colval(r->cext,RED),
422	>	ge = r->rot*colval(r->cext,GRN),
423	>	be = r->rot*colval(r->cext,BLU);
424	>	SCOLOR  ce;
425	>	setscolor(ce,   re<=FTINY ? 1. : re>92. ? 0. : exp(-re),
426	>	ge<=FTINY ? 1. : ge>92. ? 0. : exp(-ge),
427	>	be<=FTINY ? 1. : be>92. ? 0. : exp(-be));
428	>	smultscolor(rc, ce);
429	>	}
430	>	if (!warnedPM && bright(r->albedo) > FTINY) {
431		error(WARNING,
432		"ray contribution calculation does not support participating media");
433		warnedPM++;
#	Line 454 | Line 464 | raynormal(             /* compute perturbed normal for ray */
464		return(r->rod);
465		}
466		newdot = -DOT(norm, r->rdir);
467	<	if ((newdot > 0.0) != (r->rod > 0.0)) {         /* fix orientation */
467	>	if ((newdot > 0.0) ^ (r->rod > 0.0)) {          /* fix orientation */
468		for (i = 0; i < 3; i++)
469		norm[i] += 2.0*newdot*r->rdir[i];
470		newdot = -newdot;
#	Line 543 | Line 553 | rayreject(             /* check if candidate hit is worse than cu
553		return(1);      /* old has material, new does not */
554		} else if (mray == NULL) {
555		return(0);              /* new has material, old does not */
556	<	} else if (istransp(mnew->otype)) {
557	<	if (!istransp(mray->otype))
556	>	} else if (istransp(mnew)) {
557	>	if (!istransp(mray))
558		return(1);      /* new is transparent, old is not */
559	<	} else if (istransp(mray->otype)) {
559	>	} else if (istransp(mray)) {
560		return(0);              /* old is transparent, new is not */
561		}
562		if (rod <= 0) {                 /* check which side we hit */

Diff Legend

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