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.8 by greg, Sat Nov 14 13:58:23 1992 UTC vs.
Revision 2.13 by greg, Tue Dec 21 15:46:19 1993 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1992 Regents of the University of California */
1	>	/* Copyright (c) 1993 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 299 | Line 299 | char  *p;                      /* data for f */
299		/* modify threshold */
300		ourthresh = shadthresh / r->rweight;
301		/* test for shadows */
302	<	nhits = 0;
303	<	for (sn = 0; sn < ncnts; sn++) {
302	>	for (nhits = 0, hwt = 0.0, sn = 0; sn < ncnts;
303	>	hwt += (double)source[scp->sno].nhits /
304	>	(double)source[scp->sno].ntests,
305	>	sn++) {
306		/* check threshold */
307		if ((sn+nshadcheck>=ncnts ? cntord[sn].brt :
308		cntord[sn].brt-cntord[sn+nshadcheck].brt)
#	Line 329 | Line 331 | char  *p;                      /* data for f */
331		nhits++;
332		source[scp->sno].nhits++;
333		}
334	<	/* surface hit rate */
335	<	if (sn > 0)
336	<	hwt = (double)nhits / (double)sn;
334	>	/* source hit rate */
335	>	if (hwt > FTINY)
336	>	hwt = (double)nhits / hwt;
337		else
338		hwt = 0.5;
339		#ifdef DEBUG
340	<	sprintf(errmsg, "%d tested, %d untested, %f hit rate\n",
340	>	sprintf(errmsg, "%d tested, %d untested, %f conditional hit rate\n",
341		sn, ncnts-sn, hwt);
342		eputs(errmsg);
343		#endif
#	Line 344 | Line 346 | char  *p;                      /* data for f */
346		scp = srccnt + cntord[sn].sndx;
347		prob = hwt * (double)source[scp->sno].nhits /
348		(double)source[scp->sno].ntests;
349	+	if (prob > 1.0)
350	+	prob = 1.0;
351		scalecolor(scp->val, prob);
352		addcolor(r->rcol, scp->val);
353		}
#	Line 355 | Line 359 | char  *p;                      /* data for f */
359		* because they are very nasty and difficult to understand.
360		*/
361
362	<	/* wrongillum *
362	>	/* illumblock *
363		*
364		* We cannot allow an illum to pass to another illum, because that
365		* would almost certainly constitute overcounting.
366		* However, we do allow an illum to pass to another illum
367		* that is actually going to relay to a virtual light source.
368	+	* We also prevent an illum from passing to a glow; this provides a
369	+	* convenient mechanism for defining detailed light source
370	+	* geometry behind (or inside) an effective radiator.
371		*/
372
373	<	#define  wrongillum(m, r)       (!(source[r->rsrc].sflags&SVIRTUAL) && \
374	<	objptr(source[r->rsrc].so->omod)->otype==MAT_ILLUM)
373	>	static int weaksrcmod(obj) int obj;     /* efficiency booster function */
374	>	{register OBJREC *o = objptr(obj);
375	>	return(o->otype==MAT_ILLUM|o->otype==MAT_GLOW);}
376
377	+	#define  illumblock(m, r)       (!(source[r->rsrc].sflags&SVIRTUAL) && \
378	+	r->rod > 0.0 && \
379	+	weaksrcmod(source[r->rsrc].so->omod))
380	+
381		/* wrongsource *
382		*
383		* This source is the wrong source (ie. overcounted) if we are
384		* aimed to a different source than the one we hit and the one
385	<	* we hit is not an illum which should be passed.
385	>	* we hit is not an illum that should be passed.
386		*/
387
388		#define  wrongsource(m, r)      (r->rsrc>=0 && source[r->rsrc].so!=r->ro && \
389	<	(m->otype!=MAT_ILLUM || wrongillum(m,r)))
389	>	(m->otype!=MAT_ILLUM || illumblock(m,r)))
390
391		/* distglow *
392		*
393		* A distant glow is an object that sometimes acts as a light source,
394		* but is too far away from the test point to be one in this case.
395	+	* (Glows with negative radii should NEVER participate in illumination.)
396		*/
397
398		#define  distglow(m, r)         (m->otype==MAT_GLOW && \
399	+	m->oargs.farg[3] >= -FTINY && \
400		r->rot > m->oargs.farg[3])
401
402		/* badcomponent *
#	Line 398 | Line 412 | char  *p;                      /* data for f */
412		!(r->crtype&SHADOW || r->rod < 0.0 || \
413		distglow(m, r)))
414
401	–	/* overcount *
402	–	*
403	–	* All overcounting possibilities are contained here.
404	–	*/
405	–
406	–	#define  overcount(m, r)        (badcomponent(m,r) || wrongsource(m,r))
407	–
415		/* passillum *
416		*
417		* An illum passes to another material type when we didn't hit it
#	Line 418 | Line 425 | char  *p;                      /* data for f */
425
426		/* srcignore *
427		*
428	<	* The -di flag renders light sources invisible, and here is the test.
428	>	* The -dv flag is normally on for sources to be visible.
429		*/
430
431	<	#define  srcignore(m, r)        (directinvis && !(r->crtype&SHADOW) && \
431	>	#define  srcignore(m, r)        (!directvis && !(r->crtype&SHADOW) && \
432		!distglow(m, r))
433
434
#	Line 430 | Line 437 | register OBJREC  *m;
437		register RAY  *r;
438		{
439		/* check for over-counting */
440	<	if (overcount(m, r))
440	>	if (badcomponent(m, r))
441	>	return;
442	>	if (wrongsource(m,r))
443		return;
444		/* check for passed illum */
445		if (passillum(m, r)) {

Diff Legend

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