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.46 by greg, Wed Sep 8 17:10:16 2004 UTC vs.
Revision 2.60 by greg, Mon Feb 14 20:13:38 2011 UTC

#	Line 46 | Line 46 | extern OBJREC *                        /* find an object's actual material
46		findmaterial(register OBJREC *o)
47		{
48		while (!ismaterial(o->otype)) {
49	–	if (ismixture(o->otype))
50	–	return(NULL);   /* reject mixed materials */
49		if (o->otype == MOD_ALIAS && o->oargs.nsargs) {
50		OBJECT  aobj;
51		OBJREC  *ao;
#	Line 57 | 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);
65		o = objptr(o->omod);
66		}
67	<	return(o);
67	>	return(o);              /* mixtures will return NULL */
68		}
69
70
#	Line 84 | 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 159 | 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 176 | 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, r, SHADOW, 1.0);              /* 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)
195	<	continue;
196	<	/* check angle */
197	<	if (srcp->sflags & SSPOT) {
198	<	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 */
206	<	}
207	<	return(0);                  /* no more samples */
219	>	return(0);                      /* no more samples */
220		}
221
222
#	Line 250 | Line 262 | nomat:
262		}
263
264
265	+	static int
266	+	transillum(                     /* check if material is transparent illum */
267	+	OBJECT  obj
268	+	)
269	+	{
270	+	OBJREC *m = findmaterial(objptr(obj));
271	+
272	+	if (m == NULL)
273	+	return(1);
274	+	if (m->otype != MAT_ILLUM)
275	+	return(0);
276	+	return(!m->oargs.nsargs || !strcmp(m->oargs.sarg[0], VOIDID));
277	+	}
278	+
279	+
280		extern int
281		sourcehit(                      /* check to see if ray hit distant source */
282		register RAY  *r
283		)
284		{
285	+	int  glowsrc = -1;
286	+	int  transrc = -1;
287		int  first, last;
288		register int  i;
289
#	Line 263 | Line 292 | sourcehit(                     /* check to see if ray hit distant source
292		} else {                        /* otherwise check all */
293		first = 0; last = nsources-1;
294		}
295	<	for (i = first; i <= last; i++)
296	<	if ((source[i].sflags & (SDISTANT|SVIRTUAL)) == SDISTANT)
297	<	/*
298	<	* Check to see if ray is within
299	<	* solid angle of source.
300	<	*/
301	<	if (2.0*PI * (1.0 - DOT(source[i].sloc,r->rdir))
302	<	<= source[i].ss2) {
303	<	r->ro = source[i].so;
304	<	if (!(source[i].sflags & SSKIP))
305	<	break;
306	<	}
307	<
308	<	if (r->ro != NULL) {
309	<	r->robj = objndx(r->ro);
310	<	for (i = 0; i < 3; i++)
311	<	r->ron[i] = -r->rdir[i];
312	<	r->rod = 1.0;
313	<	r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
314	<	r->uv[0] = r->uv[1] = 0.0;
315	<	r->rox = NULL;
316	<	return(1);
295	>	for (i = first; i <= last; i++) {
296	>	if ((source[i].sflags & (SDISTANT|SVIRTUAL)) != SDISTANT)
297	>	continue;
298	>	/*
299	>	* Check to see if ray is within
300	>	* solid angle of source.
301	>	*/
302	>	if (2.*PI*(1. - DOT(source[i].sloc,r->rdir)) > source[i].ss2)
303	>	continue;
304	>	/* is it the only possibility? */
305	>	if (first == last) {
306	>	r->ro = source[i].so;
307	>	break;
308	>	}
309	>	/*
310	>	* If it's a glow or transparent illum, just remember it.
311	>	*/
312	>	if (source[i].sflags & SSKIP) {
313	>	if (glowsrc < 0)
314	>	glowsrc = i;
315	>	continue;
316	>	}
317	>	if (transillum(source[i].so->omod)) {
318	>	if (transrc < 0)
319	>	transrc = i;
320	>	continue;
321	>	}
322	>	r->ro = source[i].so;   /* otherwise, use first hit */
323	>	break;
324		}
325	<	return(0);
325	>	/*
326	>	* Do we need fallback?
327	>	*/
328	>	if (r->ro == NULL) {
329	>	if (transrc >= 0 && r->crtype & (AMBIENT|SPECULAR))
330	>	return(0);      /* avoid overcounting */
331	>	if (glowsrc >= 0)
332	>	r->ro = source[glowsrc].so;
333	>	else
334	>	return(0);      /* nothing usable */
335	>	}
336	>	/*
337	>	* Make assignments.
338	>	*/
339	>	r->robj = objndx(r->ro);
340	>	for (i = 0; i < 3; i++)
341	>	r->ron[i] = -r->rdir[i];
342	>	r->rod = 1.0;
343	>	r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
344	>	r->uv[0] = r->uv[1] = 0.0;
345	>	r->rox = NULL;
346	>	return(1);
347		}
348
349
#	Line 341 | 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 352 | Line 409 | direct(                                        /* add direct component */
409		}
410		#endif
411		VCOPY(scp->dir, sr.rdir);
412	+	copycolor(sr.rcoef, scp->coef);
413		/* compute potential */
414		sr.revf = srcvalue;
415		rayvalue(&sr);
416	+	multcolor(sr.rcol, sr.rcoef);
417		copycolor(scp->val, sr.rcol);
418	<	multcolor(scp->val, scp->coef);
360	<	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 395 | Line 453 | direct(                                        /* add direct component */
453		break;
454		scp = srccnt + cntord[sn].sndx;
455		/* test for hit */
456	<	rayorigin(&sr, r, SHADOW, 1.0);
456	>	rayorigin(&sr, SHADOW, r, NULL);
457	>	copycolor(sr.rcoef, scp->coef);
458		VCOPY(sr.rdir, scp->dir);
459		sr.rsrc = scp->sno;
460		/* keep statistics */
#	Line 408 | Line 467 | direct(                                        /* add direct component */
467		source[scp->sno].sflags & SFOLLOW )) {
468		/* follow entire path */
469		raycont(&sr);
411	–	rayparticipate(&sr);
470		if (trace != NULL)
471		(*trace)(&sr);  /* trace execution */
472		if (bright(sr.rcol) <= FTINY) {
#	Line 420 | 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	<	multcolor(scp->val, scp->coef);
484	>	} else if (trace != NULL &&
485	>	(source[scp->sno].sflags & (SDISTANT|SVIRTUAL|SFOLLOW))
486	>	== (SDISTANT|SFOLLOW) &&
487	>	sourcehit(&sr) && rayshade(&sr, sr.ro->omod)) {
488	>	(*trace)(&sr);          /* trace execution */
489	>	/* skip call to rayparticipate() & scp->val update */
490		}
491		/* add contribution if hit */
492		addcolor(r->rcol, scp->val);
#	Line 443 | Line 508 | direct(                                        /* add direct component */
508		scp = srccnt + cntord[sn].sndx;
509		prob = hwt * (double)source[scp->sno].nhits /
510		(double)source[scp->sno].ntests;
511	<	if (prob > 1.0)
512	<	prob = 1.0;
448	<	scalecolor(scp->val, prob);
511	>	if (prob < 1.0)
512	>	scalecolor(scp->val, prob);
513		addcolor(r->rcol, scp->val);
514		}
515		}
#	Line 492 | 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;
495	–	sr.rmax = 0.;
559		initsrcindex(&si);      /* sample ray to this source */
560		si.sn = r->slights[i];
561		nopart(&si, &sr);
#	Line 553 | Line 616 | srcscatter(                    /* compute source scattering into ray */
616		static int
617		weaksrcmat(OBJECT obj)          /* identify material */
618		{
619	<	OBJREC *o = findmaterial(objptr(obj));
619	>	OBJREC *m = findmaterial(objptr(obj));
620
621	<	if (o == NULL) return 0;
622	<	return((o->otype==MAT_ILLUM)|(o->otype==MAT_GLOW));
621	>	if (m == NULL) return(0);
622	>	return((m->otype==MAT_ILLUM) | (m->otype==MAT_GLOW));
623		}
624
625		#define  illumblock(m, r)       (!(source[r->rsrc].sflags&SVIRTUAL) && \
#	Line 624 | Line 687 | m_light(                               /* ray hit a light source */
687		)
688		{
689		/* check for over-counting */
690	<	if (badcomponent(m, r))
690	>	if (badcomponent(m, r)) {
691	>	setcolor(r->rcoef, 0.0, 0.0, 0.0);
692		return(1);
693	<	if (wrongsource(m, r))
693	>	}
694	>	if (wrongsource(m, r)) {
695	>	setcolor(r->rcoef, 0.0, 0.0, 0.0);
696		return(1);
697	+	}
698		/* check for passed illum */
699		if (passillum(m, r)) {
700		if (m->oargs.nsargs && strcmp(m->oargs.sarg[0], VOIDID))
#	Line 635 | Line 702 | m_light(                               /* ray hit a light source */
702		raytrans(r);
703		return(1);
704		}
705	+	/* check for invisibility */
706	+	if (srcignore(m, r)) {
707	+	setcolor(r->rcoef, 0.0, 0.0, 0.0);
708	+	return(1);
709	+	}
710		/* otherwise treat as source */
711		/* check for behind */
712		if (r->rod < 0.0)
641	–	return(1);
642	–	/* check for invisibility */
643	–	if (srcignore(m, r))
713		return(1);
714		/* check for outside spot */
715		if (m->otype==MAT_SPOT && spotout(r, makespot(m)))

Diff Legend

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