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.74 by greg, Thu Dec 17 03:30:37 2020 UTC vs.
Revision 2.80 by greg, Thu Aug 11 15:09:14 2022 UTC

#	Line 36 | Line 36 | typedef struct {
36		float  brt;             /* brightness (for comparison) */
37		}  CNTPTR;              /* contribution pointer */
38
39	<	static CONTRIB  *srccnt;                /* source contributions in direct() */
40	<	static CNTPTR  *cntord;                 /* source ordering in direct() */
39	>	static CONTRIB  *srccnt = NULL;         /* source contributions in direct() */
40	>	static CNTPTR  *cntord = NULL;          /* source ordering in direct() */
41		static int  maxcntr = 0;                /* size of contribution arrays */
42
43		static int cntcmp(const void *p1, const void *p2);
#	Line 46 | Line 46 | static int cntcmp(const void *p1, const void *p2);
46		void
47		marksources(void)                       /* find and mark source objects */
48		{
49	<	int  foundsource = 0;
49	>	int  indirect = 0;
50		int  i;
51		OBJREC  *o, *m;
52		int  ns;
53	+	/* call us only once! */
54	+	if (nsources)
55	+	error(CONSISTENCY, "Multiple calls to marksources!");
56		/* initialize dispatch table */
57		initstypes();
58		/* find direct sources */
#	Line 60 | Line 63 | marksources(void)                      /* find and mark source objects */
63		if (!issurface(o->otype) || o->omod == OVOID)
64		continue;
65		/* find material */
66	<	m = findmaterial(objptr(o->omod));
66	>	m = findmaterial(o);
67		if (m == NULL)
68		continue;
69		if (m->otype == MAT_CLIP) {
#	Line 80 | Line 83 | marksources(void)                      /* find and mark source objects */
83		if (m->otype == MAT_GLOW &&
84		o->otype != OBJ_SOURCE &&
85		m->oargs.farg[3] <= FTINY) {
86	<	foundsource += (ambounce > 0);
86	>	indirect += (ambounce > 0);
87		continue;                       /* don't track these */
88		}
89		if (sfun[o->otype].of == NULL ||
#	Line 97 | Line 100 | marksources(void)                      /* find and mark source objects */
100		source[ns].sl.prox = m->oargs.farg[3];
101		if (source[ns].sflags & SDISTANT) {
102		source[ns].sflags |= SSKIP;
103	<	foundsource += (ambounce > 0);
103	>	indirect += (ambounce > 0);
104		}
105		} else if (m->otype == MAT_SPOT) {
106		if (source[ns].sflags & SDISTANT)
#	Line 113 | Line 116 | marksources(void)                      /* find and mark source objects */
116		source[ns].sflags |= SSKIP;
117		}
118		}
119	<	foundsource += !(source[ns].sflags & SSKIP);
119	>	maxcntr += !(source[ns].sflags & SSKIP);
120		}
121	<	if (!foundsource) {
122	<	error(WARNING, "no light sources found");
123	<	return;
121	>	if (!maxcntr) {
122	>	if (!indirect)
123	>	error(WARNING, "no light sources found");
124	>	return;         /* no direct calculation, it seems */
125		}
126		#if  SHADCACHE
127		for (ns = 0; ns < nsources; ns++)       /* initialize obstructor cache */
#	Line 128 | Line 132 | marksources(void)                      /* find and mark source objects */
132		markvirtuals();                 /* find and add virtual sources */
133
134		/* allocate our contribution arrays */
135	<	maxcntr = nsources + MAXSPART;  /* start with this many */
135	>	maxcntr += MAXSPART;    /* start with this many */
136		srccnt = (CONTRIB *)malloc(maxcntr*sizeof(CONTRIB));
137		cntord = (CNTPTR *)malloc(maxcntr*sizeof(CNTPTR));
138		if ((srccnt != NULL) & (cntord != NULL))
#	Line 144 | Line 148 | distantsources(void)                   /* only mark distant sources */
148		int  i;
149		OBJREC  *o, *m;
150		int  ns;
151	+	/* call us only once! */
152	+	if (nsources)
153	+	error(CONSISTENCY, "Multiple calls to distantsources!");
154		/* initialize dispatch table */
155		initstypes();
156		/* sources needed for sourcehit() */
#	Line 154 | Line 161 | distantsources(void)                   /* only mark distant sources */
161		if ((o->otype != OBJ_SOURCE) | (o->omod == OVOID))
162		continue;
163		/* find material */
164	<	m = findmaterial(objptr(o->omod));
164	>	m = findmaterial(o);
165		if (m == NULL)
166		continue;
167		if (!islight(m->otype))
#	Line 294 | Line 301 | nomat:
301
302		static int
303		transillum(                     /* check if material is transparent illum */
304	<	OBJECT  obj
304	>	OBJREC *m
305		)
306		{
307	<	OBJREC *m = findmaterial(objptr(obj));
301	<
307	>	m = findmaterial(m);
308		if (m == NULL)
309		return(1);
310		if (m->otype != MAT_ILLUM)
#	Line 331 | Line 337 | sourcehit(                     /* check to see if ray hit distant source
337		*/
338		if (2.*PI*(1. - DOT(source[i].sloc,r->rdir)) > source[i].ss2)
339		continue;
340	<	/* is it the only possibility? */
341	<	if (first == last) {
340	>	/* is it what we aimed for? */
341	>	if (i == r->rsrc) {
342		r->ro = source[i].so;
343		break;
344		}
#	Line 344 | Line 350 | sourcehit(                     /* check to see if ray hit distant source
350		glowsrc = i;
351		continue;
352		}
353	<	if (transillum(source[i].so->omod)) {
353	>	if (transillum(source[i].so)) {
354		if (transrc < 0)
355		transrc = i;
356		continue;
#	Line 364 | Line 370 | sourcehit(                     /* check to see if ray hit distant source
370		return(0);      /* nothing usable */
371		}
372		/*
373	<	* Make assignments.
373	>	* Assign object index
374		*/
375		r->robj = objndx(r->ro);
370	–	for (i = 0; i < 3; i++)
371	–	r->ron[i] = -r->rdir[i];
372	–	r->rod = 1.0;
373	–	r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
374	–	r->uv[0] = r->uv[1] = 0.0;
375	–	r->rox = NULL;
376		return(1);
377		}
378
#	Line 415 | Line 415 | direct(                                        /* add direct component */
415		multDirectPmap(r);
416		return;
417		}
418	–
418		/* NOTE: srccnt and cntord global so no recursion */
419	<	if (nsources <= 0)
420	<	return;         /* no sources?! */
421	<	/* potential contributions */
422	<	initsrcindex(&si);
419	>	if (maxcntr <= 0)
420	>	return;         /* no direct?! */
421	>
422	>	initsrcindex(&si);                      /* potential contributions */
423		for (sn = 0; srcray(&sr, r, &si); sn++) {
424		if (sn >= maxcntr) {
425		maxcntr = sn + MAXSPART;
#	Line 436 | Line 435 | direct(                                        /* add direct component */
435		scp->sno = sr.rsrc;
436		#if SHADCACHE                                   /* check shadow cache */
437		if (si.np == 1 && srcblocked(&sr)) {
438	<	cntord[sn].brt = 0.0;
438	>	cntord[sn].brt = 0.0;   /* & count as test */
439	>	if (source[scp->sno].ntests++ > 0xfffffff0) {
440	>	source[scp->sno].ntests >>= 1;
441	>	source[scp->sno].nhits >>= 1;
442	>	}
443		continue;
444		}
445		#endif
#	Line 670 | Line 673 | srcscatter(                    /* compute source scattering into ray */
673		*/
674
675		static int
676	<	weaksrcmat(OBJECT obj)          /* identify material */
676	>	weaksrcmat(OBJREC *m)           /* identify material */
677		{
678	<	OBJREC *m = findmaterial(objptr(obj));
676	<
678	>	m = findmaterial(m);
679		if (m == NULL) return(0);
680		return((m->otype==MAT_ILLUM) | (m->otype==MAT_GLOW));
681		}
682
683		#define  illumblock(m, r)       (!(source[r->rsrc].sflags&SVIRTUAL) && \
684		r->rod > 0.0 && \
685	<	weaksrcmat(source[r->rsrc].so->omod))
685	>	weaksrcmat(source[r->rsrc].so))
686
687		/* wrongsource *
688		*
#	Line 768 | Line 770 | m_light(                               /* ray hit a light source */
770		return(1);
771		}
772		/* otherwise treat as source */
773	<	/* check for behind */
774	<	if (r->rod < 0.0)
773	>	if (r->rod < 0.0) {                     /* check for behind */
774	>	if (!backvis)
775	>	raytrans(r);            /* used to return black */
776		return(1);
777	+	}
778		/* check for outside spot */
779		if (m->otype==MAT_SPOT && spotout(r, makespot(m)))
780		return(1);

Diff Legend

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