ViewVC Help

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

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

Comparing ray/src/rt/source.c (file contents):
Revision 2.52 by greg, Tue May 31 18:01:09 2005 UTC vs.
Revision 2.60 by greg, Mon Feb 14 20:13:38 2011 UTC

#	Line 55 | Line 55 | findmaterial(register OBJREC *o)
55		ao = objptr(aobj);
56		if (ismaterial(ao->otype))
57		return(ao);
58	+	if (ao->otype == MOD_ALIAS) {
59	+	o = ao;
60	+	continue;
61	+	}
62		}
63		if (o->omod == OVOID)
64		return(NULL);
#	Line 82 | Line 86 | marksources(void)                      /* find and mark source objects */
86		continue;
87		/* find material */
88		m = findmaterial(objptr(o->omod));
89	<	if (m == NULL || !islight(m->otype))
89	>	if (m == NULL)
90	>	continue;
91	>	if (m->otype == MAT_CLIP) {
92	>	markclip(m);    /* special case for antimatter */
93	>	continue;
94	>	}
95	>	if (!islight(m->otype))
96		continue;       /* not source modifier */
97
98		if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 :
#	Line 157 | Line 167 | freesources(void)                      /* free all source structures */
167		source = NULL;
168		nsources = 0;
169		}
170	+	markclip(NULL);
171		if (maxcntr <= 0)
172		return;
173		free((void *)srccnt);
#	Line 174 | Line 185 | srcray(                                /* send a ray to a source, return domega */
185		SRCINDEX  *si                   /* source sample index */
186		)
187		{
188	<	double  d;                          /* distance to source */
189	<	register SRCREC  *srcp;
188	>	double  d;                              /* distance to source */
189	>	register SRCREC  *srcp;
190
191	<	rayorigin(sr, SHADOW, r, NULL);             /* ignore limits */
191	>	rayorigin(sr, SHADOW, r, NULL);         /* ignore limits */
192
193	<	while ((d = nextssamp(sr, si)) != 0.0) {
194	<	sr->rsrc = si->sn;                      /* remember source */
195	<	srcp = source + si->sn;
196	<	if (srcp->sflags & SDISTANT) {
197	<	if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s))
198	<	continue;
199	<	return(1);              /* sample OK */
200	<	}
193	>	if (r == NULL)
194	>	sr->rmax = 0.0;
195	>
196	>	while ((d = nextssamp(sr, si)) != 0.0) {
197	>	sr->rsrc = si->sn;                      /* remember source */
198	>	srcp = source + si->sn;
199	>	if (srcp->sflags & SDISTANT) {
200	>	if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s))
201	>	continue;
202	>	return(1);              /* sample OK */
203	>	}
204		/* local source */
205		/* check proximity */
206	<	if (srcp->sflags & SPROX && d > srcp->sl.prox)
193	<	continue;
194	<	/* check angle */
195	<	if (srcp->sflags & SSPOT) {
196	<	if (spotout(sr, srcp->sl.s))
206	>	if (srcp->sflags & SPROX && d > srcp->sl.prox)
207		continue;
208	+	/* check angle */
209	+	if (srcp->sflags & SSPOT) {
210	+	if (spotout(sr, srcp->sl.s))
211	+	continue;
212		/* adjust solid angle */
213	<	si->dom *= d*d;
214	<	d += srcp->sl.s->flen;
215	<	si->dom /= d*d;
213	>	si->dom *= d*d;
214	>	d += srcp->sl.s->flen;
215	>	si->dom /= d*d;
216	>	}
217	>	return(1);                      /* sample OK */
218		}
219	<	return(1);                      /* sample OK */
204	<	}
205	<	return(0);                  /* no more samples */
219	>	return(0);                      /* no more samples */
220		}
221
222
#	Line 296 | Line 310 | sourcehit(                     /* check to see if ray hit distant source
310		* If it's a glow or transparent illum, just remember it.
311		*/
312		if (source[i].sflags & SSKIP) {
313	<	glowsrc = i;
313	>	if (glowsrc < 0)
314	>	glowsrc = i;
315		continue;
316		}
317		if (transillum(source[i].so->omod)) {
318	<	transrc = i;
318	>	if (transrc < 0)
319	>	transrc = i;
320		continue;
321		}
322		r->ro = source[i].so;   /* otherwise, use first hit */
#	Line 382 | Line 398 | direct(                                        /* add direct component */
398		scp->sno = sr.rsrc;
399		/* compute coefficient */
400		(*f)(scp->coef, p, sr.rdir, si.dom);
401	<	cntord[sn].brt = bright(scp->coef);
401	>	cntord[sn].brt = intens(scp->coef);
402		if (cntord[sn].brt <= 0.0)
403		continue;
404		#if SHADCACHE
#	Line 399 | Line 415 | direct(                                        /* add direct component */
415		rayvalue(&sr);
416		multcolor(sr.rcol, sr.rcoef);
417		copycolor(scp->val, sr.rcol);
418	<	cntord[sn].brt = bright(scp->val);
418	>	cntord[sn].brt = bright(sr.rcol);
419		}
420		/* sort contributions */
421		qsort(cntord, sn, sizeof(CNTPTR), cntcmp);
#	Line 453 | Line 469 | direct(                                        /* add direct component */
469		raycont(&sr);
470		if (trace != NULL)
471		(*trace)(&sr);  /* trace execution */
456	–	rayparticipate(&sr);
472		if (bright(sr.rcol) <= FTINY) {
473		#if SHADCACHE
474		if ((scp <= srccnt || scp[-1].sno != scp->sno)
#	Line 463 | Line 478 | direct(                                        /* add direct component */
478		#endif
479		continue;       /* missed! */
480		}
481	+	rayparticipate(&sr);
482		multcolor(sr.rcol, sr.rcoef);
483		copycolor(scp->val, sr.rcol);
484		} else if (trace != NULL &&
#	Line 540 | Line 556 | srcscatter(                    /* compute source scattering into ray */
556		sr.rorg[0] = r->rorg[0] + r->rdir[0]*t;
557		sr.rorg[1] = r->rorg[1] + r->rdir[1]*t;
558		sr.rorg[2] = r->rorg[2] + r->rdir[2]*t;
543	–	sr.rmax = 0.;
559		initsrcindex(&si);      /* sample ray to this source */
560		si.sn = r->slights[i];
561		nopart(&si, &sr);

Diff Legend

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