ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/pmapcontrib.c

Comparing ray/src/rt/pmapcontrib.c (file contents):
Revision 2.6 by greg, Wed May 20 13:43:28 2015 UTC vs.
Revision 2.8 by greg, Thu May 21 13:54:59 2015 UTC

#	Line 51 | Line 51 | static void checkPmapContribs (const PhotonMap *pmap,
51		if (primary -> srcIdx < 0 || primary -> srcIdx >= nsources)
52		error(INTERNAL, "invalid light source index in photon map");
53
54	<	srcMod = objptr(source [primary -> srcIdx].so -> omod);
54	>	srcMod = findmaterial(source [primary -> srcIdx].so);
55		if ((MODCONT*)lu_find(srcContrib, srcMod -> oname) -> data)
56		++found;
57		}
#	Line 154 | Line 154 | void photonContrib (PhotonMap *pmap, RAY *ray, COLOR i
154		if (pmap -> srcContrib) {
155		const PhotonPrimary *primary = pmap -> primary +
156		sq -> photon -> primary;
157	<	SRCREC *sp = &source[primary -> srcIdx];
158	<	OBJREC *srcMod = objptr(sp -> so -> omod);
157	>	const SRCREC *sp = &source[primary -> srcIdx];
158	>	OBJREC *srcMod = findmaterial(sp -> so);
159		MODCONT *srcContrib = (MODCONT*)lu_find(pmap -> srcContrib,
160		srcMod -> oname) -> data;
161		if (!srcContrib)
#	Line 174 | Line 174 | void photonContrib (PhotonMap *pmap, RAY *ray, COLOR i
174		rayorigin(&srcRay, SHADOW, NULL, NULL);
175		srcRay.rsrc = primary -> srcIdx;
176		VCOPY(srcRay.rorg, primary -> pos);
177	<	VCOPY(srcRay.rdir, primary -> dir);
178	<	if (!(source [primary -> srcIdx].sflags & SDISTANT ?
179	<	sourcehit(&srcRay) :
180	<	(*ofun[sp -> so -> otype].funp)(sp -> so, &srcRay)))
177	>	decodedir(srcRay.rdir, primary -> dir);
178	>
179	>	if (!(sp->sflags & SDISTANT ? sourcehit(&srcRay)
180	>	: (*ofun[sp -> so -> otype].funp)(sp -> so, &srcRay)))
181		continue;               /* XXX shouldn't happen! */
182	+
183		worldfunc(RCCONTEXT, &srcRay);
184		set_eparams((char *)srcContrib -> params);
185		}

Diff Legend

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