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.50 by greg, Tue Apr 19 01:15:07 2005 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 62 | Line 60 | findmaterial(register OBJREC *o)
60		return(NULL);
61		o = objptr(o->omod);
62		}
63	<	return(o);
63	>	return(o);              /* mixtures will return NULL */
64		}
65
66
#	Line 125 | Line 123 | marksources(void)                      /* find and mark source objects */
123		}
124		}
125		#if  SHADCACHE
126	<	source[ns].obscache = NULL;
126	>	initobscache(ns);
127		#endif
128		if (!(source[ns].sflags & SSKIP))
129		foundsource++;
#	Line 179 | Line 177 | srcray(                                /* send a ray to a source, return domega */
177		double  d;                          /* distance to source */
178		register SRCREC  *srcp;
179
180	<	rayorigin(sr, r, SHADOW, 1.0);              /* ignore limits */
180	>	rayorigin(sr, SHADOW, r, NULL);             /* ignore limits */
181
182		while ((d = nextssamp(sr, si)) != 0.0) {
183		sr->rsrc = si->sn;                      /* remember source */
#	Line 250 | Line 248 | nomat:
248		}
249
250
251	+	static int
252	+	transillum(                     /* check if material is transparent illum */
253	+	OBJECT  obj
254	+	)
255	+	{
256	+	OBJREC *m = findmaterial(objptr(obj));
257	+
258	+	if (m == NULL)
259	+	return(1);
260	+	if (m->otype != MAT_ILLUM)
261	+	return(0);
262	+	return(!m->oargs.nsargs || !strcmp(m->oargs.sarg[0], VOIDID));
263	+	}
264	+
265	+
266		extern int
267		sourcehit(                      /* check to see if ray hit distant source */
268		register RAY  *r
269		)
270		{
271	+	int  glowsrc = -1;
272	+	int  transrc = -1;
273		int  first, last;
274		register int  i;
275
#	Line 263 | Line 278 | sourcehit(                     /* check to see if ray hit distant source
278		} else {                        /* otherwise check all */
279		first = 0; last = nsources-1;
280		}
281	<	for (i = first; i <= last; i++)
282	<	if ((source[i].sflags & (SDISTANT|SVIRTUAL)) == SDISTANT)
283	<	/*
284	<	* Check to see if ray is within
285	<	* solid angle of source.
286	<	*/
287	<	if (2.0*PI * (1.0 - DOT(source[i].sloc,r->rdir))
288	<	<= source[i].ss2) {
289	<	r->ro = source[i].so;
290	<	if (!(source[i].sflags & SSKIP))
291	<	break;
292	<	}
293	<
294	<	if (r->ro != NULL) {
295	<	r->robj = objndx(r->ro);
296	<	for (i = 0; i < 3; i++)
297	<	r->ron[i] = -r->rdir[i];
298	<	r->rod = 1.0;
299	<	r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
300	<	r->uv[0] = r->uv[1] = 0.0;
301	<	r->rox = NULL;
302	<	return(1);
281	>	for (i = first; i <= last; i++) {
282	>	if ((source[i].sflags & (SDISTANT|SVIRTUAL)) != SDISTANT)
283	>	continue;
284	>	/*
285	>	* Check to see if ray is within
286	>	* solid angle of source.
287	>	*/
288	>	if (2.*PI*(1. - DOT(source[i].sloc,r->rdir)) > source[i].ss2)
289	>	continue;
290	>	/* is it the only possibility? */
291	>	if (first == last) {
292	>	r->ro = source[i].so;
293	>	break;
294	>	}
295	>	/*
296	>	* If it's a glow or transparent illum, just remember it.
297	>	*/
298	>	if (source[i].sflags & SSKIP) {
299	>	glowsrc = i;
300	>	continue;
301	>	}
302	>	if (transillum(source[i].so->omod)) {
303	>	transrc = i;
304	>	continue;
305	>	}
306	>	r->ro = source[i].so;   /* otherwise, use first hit */
307	>	break;
308		}
309	<	return(0);
309	>	/*
310	>	* Do we need fallback?
311	>	*/
312	>	if (r->ro == NULL) {
313	>	if (transrc >= 0 && r->crtype & (AMBIENT|SPECULAR))
314	>	return(0);      /* avoid overcounting */
315	>	if (glowsrc >= 0)
316	>	r->ro = source[glowsrc].so;
317	>	else
318	>	return(0);      /* nothing usable */
319	>	}
320	>	/*
321	>	* Make assignments.
322	>	*/
323	>	r->robj = objndx(r->ro);
324	>	for (i = 0; i < 3; i++)
325	>	r->ron[i] = -r->rdir[i];
326	>	r->rod = 1.0;
327	>	r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
328	>	r->uv[0] = r->uv[1] = 0.0;
329	>	r->rox = NULL;
330	>	return(1);
331		}
332
333
#	Line 352 | Line 393 | direct(                                        /* add direct component */
393		}
394		#endif
395		VCOPY(scp->dir, sr.rdir);
396	+	copycolor(sr.rcoef, scp->coef);
397		/* compute potential */
398	<	sr.revf = srcvalue;
399	<	rayvalue(&sr);
398	>	srcvalue(&sr);
399	>	multcolor(sr.rcol, sr.rcoef);
400		copycolor(scp->val, sr.rcol);
359	–	multcolor(scp->val, scp->coef);
401		cntord[sn].brt = bright(scp->val);
402		}
403		/* sort contributions */
#	Line 395 | Line 436 | direct(                                        /* add direct component */
436		break;
437		scp = srccnt + cntord[sn].sndx;
438		/* test for hit */
439	<	rayorigin(&sr, r, SHADOW, 1.0);
439	>	rayorigin(&sr, SHADOW, r, NULL);
440		VCOPY(sr.rdir, scp->dir);
441		sr.rsrc = scp->sno;
442		/* keep statistics */
#	Line 408 | Line 449 | direct(                                        /* add direct component */
449		source[scp->sno].sflags & SFOLLOW )) {
450		/* follow entire path */
451		raycont(&sr);
411	–	rayparticipate(&sr);
452		if (trace != NULL)
453		(*trace)(&sr);  /* trace execution */
454	+	rayparticipate(&sr);
455		if (bright(sr.rcol) <= FTINY) {
456		#if SHADCACHE
457		if ((scp <= srccnt || scp[-1].sno != scp->sno)
#	Line 553 | Line 594 | srcscatter(                    /* compute source scattering into ray */
594		static int
595		weaksrcmat(OBJECT obj)          /* identify material */
596		{
597	<	OBJREC *o = findmaterial(objptr(obj));
597	>	OBJREC *m = findmaterial(objptr(obj));
598
599	<	if (o == NULL) return 0;
600	<	return((o->otype==MAT_ILLUM)|(o->otype==MAT_GLOW));
599	>	if (m == NULL) return(0);
600	>	return((m->otype==MAT_ILLUM) | (m->otype==MAT_GLOW));
601		}
602
603		#define  illumblock(m, r)       (!(source[r->rsrc].sflags&SVIRTUAL) && \
#	Line 624 | Line 665 | m_light(                               /* ray hit a light source */
665		)
666		{
667		/* check for over-counting */
668	<	if (badcomponent(m, r))
668	>	if (badcomponent(m, r)) {
669	>	setcolor(r->rcoef, 0.0, 0.0, 0.0);
670		return(1);
671	<	if (wrongsource(m, r))
671	>	}
672	>	if (wrongsource(m, r)) {
673	>	setcolor(r->rcoef, 0.0, 0.0, 0.0);
674		return(1);
675	+	}
676		/* check for passed illum */
677		if (passillum(m, r)) {
678		if (m->oargs.nsargs && strcmp(m->oargs.sarg[0], VOIDID))
#	Line 635 | Line 680 | m_light(                               /* ray hit a light source */
680		raytrans(r);
681		return(1);
682		}
683	+	/* check for invisibility */
684	+	if (srcignore(m, r)) {
685	+	setcolor(r->rcoef, 0.0, 0.0, 0.0);
686	+	return(1);
687	+	}
688		/* otherwise treat as source */
689		/* check for behind */
690		if (r->rod < 0.0)
641	–	return(1);
642	–	/* check for invisibility */
643	–	if (srcignore(m, r))
691		return(1);
692		/* check for outside spot */
693		if (m->otype==MAT_SPOT && spotout(r, makespot(m)))

Diff Legend

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