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.45 by greg, Wed Jun 23 12:58:02 2004 UTC vs.
Revision 2.56 by greg, Wed Jul 25 04:12:36 2007 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 125 | Line 133 | marksources(void)                      /* find and mark source objects */
133		}
134		}
135		#if  SHADCACHE
136	<	source[ns].obscache = NULL;
136	>	initobscache(ns);
137		#endif
138		if (!(source[ns].sflags & SSKIP))
139		foundsource++;
#	Line 179 | Line 187 | srcray(                                /* send a ray to a source, return domega */
187		double  d;                          /* distance to source */
188		register SRCREC  *srcp;
189
190	<	rayorigin(sr, r, SHADOW, 1.0);              /* ignore limits */
190	>	rayorigin(sr, SHADOW, r, NULL);             /* ignore limits */
191
192		while ((d = nextssamp(sr, si)) != 0.0) {
193		sr->rsrc = si->sn;                      /* remember source */
#	Line 250 | Line 258 | nomat:
258		}
259
260
261	+	static int
262	+	transillum(                     /* check if material is transparent illum */
263	+	OBJECT  obj
264	+	)
265	+	{
266	+	OBJREC *m = findmaterial(objptr(obj));
267	+
268	+	if (m == NULL)
269	+	return(1);
270	+	if (m->otype != MAT_ILLUM)
271	+	return(0);
272	+	return(!m->oargs.nsargs || !strcmp(m->oargs.sarg[0], VOIDID));
273	+	}
274	+
275	+
276		extern int
277		sourcehit(                      /* check to see if ray hit distant source */
278		register RAY  *r
279		)
280		{
281	+	int  glowsrc = -1;
282	+	int  transrc = -1;
283		int  first, last;
284		register int  i;
285
#	Line 263 | Line 288 | sourcehit(                     /* check to see if ray hit distant source
288		} else {                        /* otherwise check all */
289		first = 0; last = nsources-1;
290		}
291	<	for (i = first; i <= last; i++)
292	<	if ((source[i].sflags & (SDISTANT|SVIRTUAL)) == SDISTANT)
293	<	/*
294	<	* Check to see if ray is within
295	<	* solid angle of source.
296	<	*/
297	<	if (2.0*PI * (1.0 - DOT(source[i].sloc,r->rdir))
298	<	<= source[i].ss2) {
299	<	r->ro = source[i].so;
300	<	if (!(source[i].sflags & SSKIP))
301	<	break;
302	<	}
303	<
304	<	if (r->ro != NULL) {
305	<	r->robj = objndx(r->ro);
306	<	for (i = 0; i < 3; i++)
307	<	r->ron[i] = -r->rdir[i];
308	<	r->rod = 1.0;
309	<	r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
310	<	r->uv[0] = r->uv[1] = 0.0;
311	<	r->rox = NULL;
312	<	return(1);
291	>	for (i = first; i <= last; i++) {
292	>	if ((source[i].sflags & (SDISTANT|SVIRTUAL)) != SDISTANT)
293	>	continue;
294	>	/*
295	>	* Check to see if ray is within
296	>	* solid angle of source.
297	>	*/
298	>	if (2.*PI*(1. - DOT(source[i].sloc,r->rdir)) > source[i].ss2)
299	>	continue;
300	>	/* is it the only possibility? */
301	>	if (first == last) {
302	>	r->ro = source[i].so;
303	>	break;
304	>	}
305	>	/*
306	>	* If it's a glow or transparent illum, just remember it.
307	>	*/
308	>	if (source[i].sflags & SSKIP) {
309	>	glowsrc = i;
310	>	continue;
311	>	}
312	>	if (transillum(source[i].so->omod)) {
313	>	transrc = i;
314	>	continue;
315	>	}
316	>	r->ro = source[i].so;   /* otherwise, use first hit */
317	>	break;
318		}
319	<	return(0);
319	>	/*
320	>	* Do we need fallback?
321	>	*/
322	>	if (r->ro == NULL) {
323	>	if (transrc >= 0 && r->crtype & (AMBIENT|SPECULAR))
324	>	return(0);      /* avoid overcounting */
325	>	if (glowsrc >= 0)
326	>	r->ro = source[glowsrc].so;
327	>	else
328	>	return(0);      /* nothing usable */
329	>	}
330	>	/*
331	>	* Make assignments.
332	>	*/
333	>	r->robj = objndx(r->ro);
334	>	for (i = 0; i < 3; i++)
335	>	r->ron[i] = -r->rdir[i];
336	>	r->rod = 1.0;
337	>	r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
338	>	r->uv[0] = r->uv[1] = 0.0;
339	>	r->rox = NULL;
340	>	return(1);
341		}
342
343
#	Line 341 | Line 392 | direct(                                        /* add direct component */
392		scp->sno = sr.rsrc;
393		/* compute coefficient */
394		(*f)(scp->coef, p, sr.rdir, si.dom);
395	<	cntord[sn].brt = bright(scp->coef);
395	>	cntord[sn].brt = intens(scp->coef);
396		if (cntord[sn].brt <= 0.0)
397		continue;
398		#if SHADCACHE
#	Line 352 | Line 403 | direct(                                        /* add direct component */
403		}
404		#endif
405		VCOPY(scp->dir, sr.rdir);
406	+	copycolor(sr.rcoef, scp->coef);
407		/* compute potential */
408		sr.revf = srcvalue;
409		rayvalue(&sr);
410	+	multcolor(sr.rcol, sr.rcoef);
411		copycolor(scp->val, sr.rcol);
412	<	multcolor(scp->val, scp->coef);
360	<	cntord[sn].brt = bright(scp->val);
412	>	cntord[sn].brt = intens(sr.rcol);
413		}
414		/* sort contributions */
415		qsort(cntord, sn, sizeof(CNTPTR), cntcmp);
#	Line 395 | Line 447 | direct(                                        /* add direct component */
447		break;
448		scp = srccnt + cntord[sn].sndx;
449		/* test for hit */
450	<	rayorigin(&sr, r, SHADOW, 1.0);
450	>	rayorigin(&sr, SHADOW, r, NULL);
451	>	copycolor(sr.rcoef, scp->coef);
452		VCOPY(sr.rdir, scp->dir);
453		sr.rsrc = scp->sno;
454		/* keep statistics */
#	Line 408 | Line 461 | direct(                                        /* add direct component */
461		source[scp->sno].sflags & SFOLLOW )) {
462		/* follow entire path */
463		raycont(&sr);
411	–	rayparticipate(&sr);
464		if (trace != NULL)
465		(*trace)(&sr);  /* trace execution */
466		if (bright(sr.rcol) <= FTINY) {
#	Line 420 | Line 472 | direct(                                        /* add direct component */
472		#endif
473		continue;       /* missed! */
474		}
475	+	rayparticipate(&sr);
476	+	multcolor(sr.rcol, sr.rcoef);
477		copycolor(scp->val, sr.rcol);
478	<	multcolor(scp->val, scp->coef);
478	>	} else if (trace != NULL &&
479	>	(source[scp->sno].sflags & (SDISTANT|SVIRTUAL|SFOLLOW))
480	>	== (SDISTANT|SFOLLOW) &&
481	>	sourcehit(&sr) && rayshade(&sr, sr.ro->omod)) {
482	>	(*trace)(&sr);          /* trace execution */
483	>	/* skip call to rayparticipate() & scp->val update */
484		}
485		/* add contribution if hit */
486		addcolor(r->rcol, scp->val);
#	Line 443 | Line 502 | direct(                                        /* add direct component */
502		scp = srccnt + cntord[sn].sndx;
503		prob = hwt * (double)source[scp->sno].nhits /
504		(double)source[scp->sno].ntests;
505	<	if (prob > 1.0)
506	<	prob = 1.0;
448	<	scalecolor(scp->val, prob);
505	>	if (prob < 1.0)
506	>	scalecolor(scp->val, prob);
507		addcolor(r->rcol, scp->val);
508		}
509		}
#	Line 553 | Line 611 | srcscatter(                    /* compute source scattering into ray */
611		static int
612		weaksrcmat(OBJECT obj)          /* identify material */
613		{
614	<	OBJREC *o = findmaterial(objptr(obj));
614	>	OBJREC *m = findmaterial(objptr(obj));
615
616	<	if (o == NULL) return 0;
617	<	return((o->otype==MAT_ILLUM)|(o->otype==MAT_GLOW));
616	>	if (m == NULL) return(0);
617	>	return((m->otype==MAT_ILLUM) | (m->otype==MAT_GLOW));
618		}
619
620		#define  illumblock(m, r)       (!(source[r->rsrc].sflags&SVIRTUAL) && \
#	Line 624 | Line 682 | m_light(                               /* ray hit a light source */
682		)
683		{
684		/* check for over-counting */
685	<	if (badcomponent(m, r))
685	>	if (badcomponent(m, r)) {
686	>	setcolor(r->rcoef, 0.0, 0.0, 0.0);
687		return(1);
688	<	if (wrongsource(m, r))
688	>	}
689	>	if (wrongsource(m, r)) {
690	>	setcolor(r->rcoef, 0.0, 0.0, 0.0);
691		return(1);
692	+	}
693		/* check for passed illum */
694		if (passillum(m, r)) {
695		if (m->oargs.nsargs && strcmp(m->oargs.sarg[0], VOIDID))
#	Line 635 | Line 697 | m_light(                               /* ray hit a light source */
697		raytrans(r);
698		return(1);
699		}
700	+	/* check for invisibility */
701	+	if (srcignore(m, r)) {
702	+	setcolor(r->rcoef, 0.0, 0.0, 0.0);
703	+	return(1);
704	+	}
705		/* otherwise treat as source */
706		/* check for behind */
707		if (r->rod < 0.0)
641	–	return(1);
642	–	/* check for invisibility */
643	–	if (srcignore(m, r))
708		return(1);
709		/* check for outside spot */
710		if (m->otype==MAT_SPOT && spotout(r, makespot(m)))

Diff Legend

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