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 1.14 by greg, Wed Jul 19 18:47:01 1989 UTC vs.
Revision 1.24 by greg, Thu Dec 13 10:44:04 1990 UTC

#	Line 47 | Line 47 | marksources()                  /* find and mark source objects */
47
48		m = objptr(o->omod);
49
50	<	if (m->otype != MAT_LIGHT &&
51	<	m->otype != MAT_ILLUM &&
52	<	m->otype != MAT_GLOW &&
53	<	m->otype != MAT_SPOT)
50	>	if (!islight(m->otype))
51		continue;
52
53		if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 :
#	Line 310 | Line 307 | char  *p;                      /* data for f */
307		double  prob, ourthresh, hwt, test2, hit2;
308		RAY  sr;
309
310	+	if (nsources <= 0)
311	+	return;
312		srccnt = (CONTRIB *)malloc(nsources*sizeof(CONTRIB));
313		cntord = (CNTPTR *)malloc(nsources*sizeof(CNTPTR));
314		if (srccnt == NULL || cntord == NULL)
#	Line 329 | Line 328 | char  *p;                      /* data for f */
328		/* compute coefficient */
329		(*f)(srccnt[sn].val, p, srccnt[sn].dir, srccnt[sn].dom);
330		cntord[sn].brt = bright(srccnt[sn].val);
331	<	if (cntord[sn].brt <= FTINY)
331	>	if (cntord[sn].brt <= 0.0)
332		continue;
333		/* compute intersection */
334		if (!( source[sn].sflags & SDISTANT ?
#	Line 338 | Line 337 | char  *p;                      /* data for f */
337		(source[sn].so, &sr) ))
338		continue;
339		/* compute contribution */
340	<	rayshade(&sr, sr.ro->omod);
340	>	raycont(&sr);
341		multcolor(srccnt[sn].val, sr.rcol);
342		cntord[sn].brt = bright(srccnt[sn].val);
343		}
#	Line 376 | Line 375 | char  *p;                      /* data for f */
375		/* test for hit */
376		rayorigin(&sr, r, SHADOW, 1.0);
377		VCOPY(sr.rdir, srccnt[cntord[sn].sno].dir);
378	+	sr.rsrc = cntord[sn].sno;
379		if (localhit(&sr, &thescene) &&
380		sr.ro != source[cntord[sn].sno].so) {
381		/* check for transmission */
382	<	rayshade(&sr, sr.ro->omod);
382	>	raycont(&sr);
383		if (bright(sr.rcol) <= FTINY)
384		continue;       /* missed! */
385		(*f)(srccnt[cntord[sn].sno].val, p,
#	Line 407 | Line 407 | char  *p;                      /* data for f */
407		addcolor(r->rcol, srccnt[cntord[sn].sno].val);
408		}
409
410	<	free(srccnt);
411	<	free(cntord);
410	>	free((char *)srccnt);
411	>	free((char *)cntord);
412		}
413
414
#	Line 428 | Line 428 | m_light(m, r)                  /* ray hit a light source */
428		register OBJREC  *m;
429		register RAY  *r;
430		{
431	–	/* check for behind */
432	–	if (r->rod < 0.0)
433	–	return;
431		/* check for over-counting */
432		if (wrongsource(m, r) || badambient(m, r))
433		return;
#	Line 444 | Line 441 | register RAY  *r;
441
442		/* otherwise treat as source */
443		} else {
444	+	/* check for behind */
445	+	if (r->rod < 0.0)
446	+	return;
447		/* get distribution pattern */
448		raytexture(r, m->omod);
449		/* get source color */
#	Line 452 | Line 452 | register RAY  *r;
452		m->oargs.farg[2]);
453		/* modify value */
454		multcolor(r->rcol, r->pcol);
455	+	/* assign distance */
456	+	r->rt = r->rot;
457		}
458		}
457	–
458	–
459	–	o_source() {}           /* intersection with a source is done elsewhere */

Diff Legend

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