--- ray/src/rt/raytrace.c	2007/07/02 20:16:00	2.59
+++ ray/src/rt/raytrace.c	2023/11/15 18:02:53	2.88
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: raytrace.c,v 2.59 2007/07/02 20:16:00 greg Exp $";
+static const char RCSid[] = "$Id: raytrace.c,v 2.88 2023/11/15 18:02:53 greg Exp $";
 #endif
 /*
  *  raytrace.c - routines for tracing and shading rays.
@@ -14,11 +14,12 @@ static const char RCSid[] = "$Id: raytrace.c,v 2.59 20
 #include  "otypes.h"
 #include  "otspecial.h"
 #include  "random.h"
+#include  "pmap.h"
 
 #define  MAXCSET	((MAXSET+1)*2-1)	/* maximum check set size */
 
-unsigned long  raynum = 0;		/* next unique ray number */
-unsigned long  nrays = 0;		/* number of calls to localhit */
+RNUMBER  raynum = 0;		/* next unique ray number */
+RNUMBER  nrays = 0;		/* number of calls to localhit */
 
 static RREAL  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
 OBJREC  Lamb = {
@@ -35,23 +36,25 @@ static int checkhit(RAY  *r, CUBE  *cu, OBJECT  *cxs);
 static void checkset(OBJECT  *os, OBJECT  *cs);
 
 
-extern int
+int
 rayorigin(		/* start new ray from old one */
 	RAY  *r,
 	int  rt,
 	const RAY  *ro,
-	const COLOR rc
+	const SCOLOR rc
 )
 {
 	double	rw, re;
 						/* assign coefficient/weight */
 	if (rc == NULL) {
 		rw = 1.0;
-		setcolor(r->rcoef, 1., 1., 1.);
+		setscolor(r->rcoef, 1., 1., 1.);
 	} else {
-		rw = intens(rc);
+		rw = sintens(rc);
+		if (rw > 1.0)
+			rw = 1.0;		/* avoid calculation growth */
 		if (rc != r->rcoef)
-			copycolor(r->rcoef, rc);
+			copyscolor(r->rcoef, rc);
 	}
 	if ((r->parent = ro) == NULL) {		/* primary ray */
 		r->rlvl = 0;
@@ -65,7 +68,7 @@ rayorigin(		/* start new ray from old one */
 		r->gecc = seccg;
 		r->slights = NULL;
 	} else {				/* spawned ray */
-		if (ro->rot >= FHUGE) {
+		if (ro->rot >= FHUGE*.99) {
 			memset(r, 0, sizeof(RAY));
 			return(-1);		/* illegal continuation */
 		}
@@ -106,27 +109,34 @@ rayorigin(		/* start new ray from old one */
 		return(-1);
 	if (r->crtype & SHADOW)			/* shadow commitment */
 		return(0);
-	if (maxdepth <= 0 && rc != NULL) {	/* Russian roulette */
+						/* ambient in photon map? */
+	if (ro != NULL && ro->crtype & AMBIENT) {
+		if (causticPhotonMapping)
+			return(-1);
+		if (photonMapping && rt != TRANS)
+			return(-1);
+	}
+	if ((maxdepth <= 0) & (rc != NULL)) {	/* Russian roulette */
 		if (minweight <= 0.0)
 			error(USER, "zero ray weight in Russian roulette");
-		if (maxdepth < 0 && r->rlvl > -maxdepth)
+		if ((maxdepth < 0) & (r->rlvl > -maxdepth))
 			return(-1);		/* upper reflection limit */
 		if (r->rweight >= minweight)
 			return(0);
 		if (frandom() > r->rweight/minweight)
 			return(-1);
 		rw = minweight/r->rweight;	/* promote survivor */
-		scalecolor(r->rcoef, rw);
+		scalescolor(r->rcoef, rw);
 		r->rweight = minweight;
 		return(0);
 	}
-	return(r->rlvl <= abs(maxdepth) && r->rweight >= minweight ? 0 : -1);
+	return((r->rweight >= minweight) & (r->rlvl <= abs(maxdepth)) ? 0 : -1);
 }
 
 
-extern void
+void
 rayclear(			/* clear a ray for (re)evaluation */
-	register RAY  *r
+	RAY  *r
 )
 {
 	r->rno = raynum++;
@@ -135,15 +145,20 @@ rayclear(			/* clear a ray for (re)evaluation */
 	r->robj = OVOID;
 	r->ro = NULL;
 	r->rox = NULL;
-	r->rt = r->rot = FHUGE;
+	r->rxt = r->rmt = r->rot = FHUGE;
+	VCOPY(r->rop, r->rorg);
+	r->ron[0] = -r->rdir[0]; r->ron[1] = -r->rdir[1]; r->ron[2] = -r->rdir[2];
+	r->rod = 1.0;
 	r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
+	r->rflips = 0;
 	r->uv[0] = r->uv[1] = 0.0;
-	setcolor(r->pcol, 1.0, 1.0, 1.0);
-	setcolor(r->rcol, 0.0, 0.0, 0.0);
+	setscolor(r->pcol, 1.0, 1.0, 1.0);
+	scolorblack(r->mcol);
+	scolorblack(r->rcol);
 }
 
 
-extern void
+void
 raytrace(			/* trace a ray and compute its value */
 	RAY  *r
 )
@@ -163,9 +178,9 @@ raytrace(			/* trace a ray and compute its value */
 }
 
 
-extern void
+void
 raycont(			/* check for clipped object and continue */
-	register RAY  *r
+	RAY  *r
 )
 {
 	if ((r->clipset != NULL && inset(r->clipset, r->ro->omod)) ||
@@ -174,31 +189,53 @@ raycont(			/* check for clipped object and continue */
 }
 
 
-extern void
+void
 raytrans(			/* transmit ray as is */
-	register RAY  *r
+	RAY  *r
 )
 {
 	RAY  tr;
 
-	if (rayorigin(&tr, TRANS, r, NULL) == 0) {
-		VCOPY(tr.rdir, r->rdir);
-		rayvalue(&tr);
-		copycolor(r->rcol, tr.rcol);
-		r->rt = r->rot + tr.rt;
+	rayorigin(&tr, TRANS, r, NULL);		/* always continue */
+	VCOPY(tr.rdir, r->rdir);
+	rayvalue(&tr);
+	copyscolor(r->mcol, tr.mcol);
+	copyscolor(r->rcol, tr.rcol);
+	r->rmt = r->rot + tr.rmt;
+	r->rxt = r->rot + tr.rxt;
+}
+
+
+int
+raytirrad(			/* irradiance hack */
+	OBJREC	*m,
+	RAY	*r
+)
+{
+	if (ofun[m->otype].flags & (T_M|T_X) && m->otype != MAT_CLIP) {
+		if (istransp(m->otype) || isBSDFproxy(m)) {
+			raytrans(r);
+			return(1);
+		}
+		if (!islight(m->otype)) {
+			setscolor(r->pcol, 1.0, 1.0, 1.0);
+			return((*ofun[Lamb.otype].funp)(&Lamb, r));
+		}
 	}
+	return(0);		/* not a qualifying surface */
 }
 
 
-extern int
+int
 rayshade(		/* shade ray r with material mod */
-	register RAY  *r,
+	RAY  *r,
 	int  mod
 )
 {
-	register OBJREC  *m;
+	int	tst_irrad = do_irrad && !(r->crtype & ~(PRIMARY|TRANS));
+	OBJREC  *m;
 
-	r->rt = r->rot;			/* set effective ray length */
+	r->rxt = r->rot;		/* preset effective ray length */
 	for ( ; mod != OVOID; mod = m->omod) {
 		m = objptr(mod);
 		/****** unnecessary test since modifier() is always called
@@ -208,16 +245,9 @@ rayshade(		/* shade ray r with material mod */
 		}
 		******/
 					/* hack for irradiance calculation */
-		if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS)) &&
-				m->otype != MAT_CLIP &&
-				(ofun[m->otype].flags & (T_M|T_X))) {
-			if (irr_ignore(m->otype)) {
-				raytrans(r);
-				return(1);
-			}
-			if (!islight(m->otype))
-				m = &Lamb;
-		}
+		if (tst_irrad && raytirrad(m, r))
+			return(1);
+
 		if ((*ofun[m->otype].funp)(m, r))
 			return(1);	/* materials call raytexture() */
 	}
@@ -225,12 +255,12 @@ rayshade(		/* shade ray r with material mod */
 }
 
 
-extern void
+void
 rayparticipate(			/* compute ray medium participation */
-	register RAY  *r
+	RAY  *r
 )
 {
-	COLOR	ce, ca;
+	SCOLOR	ce, ca;
 	double	re, ge, be;
 
 	if (intens(r->cext) <= 1./FHUGE)
@@ -243,28 +273,33 @@ rayparticipate(			/* compute ray medium participation 
 		ge *= 1. - colval(r->albedo,GRN);
 		be *= 1. - colval(r->albedo,BLU);
 	}
-	setcolor(ce,	re<=FTINY ? 1. : re>92. ? 0. : exp(-re),
+	setscolor(ce,	re<=FTINY ? 1. : re>92. ? 0. : exp(-re),
 			ge<=FTINY ? 1. : ge>92. ? 0. : exp(-ge),
 			be<=FTINY ? 1. : be>92. ? 0. : exp(-be));
-	multcolor(r->rcol, ce);			/* path extinction */
+	smultscolor(r->rcol, ce);		/* path extinction */
 	if (r->crtype & SHADOW || intens(r->albedo) <= FTINY)
 		return;				/* no scattering */
-	setcolor(ca,
-		colval(r->albedo,RED)*colval(ambval,RED)*(1.-colval(ce,RED)),
-		colval(r->albedo,GRN)*colval(ambval,GRN)*(1.-colval(ce,GRN)),
-		colval(r->albedo,BLU)*colval(ambval,BLU)*(1.-colval(ce,BLU)));
-	addcolor(r->rcol, ca);			/* ambient in scattering */
+	
+	/* PMAP: indirect inscattering accounted for by volume photons? */
+	if (!volumePhotonMapping) {
+		setscolor(ca,
+			colval(r->albedo,RED)*colval(ambval,RED)*(1.-colval(ce,RED)),
+			colval(r->albedo,GRN)*colval(ambval,GRN)*(1.-colval(ce,GRN)),
+			colval(r->albedo,BLU)*colval(ambval,BLU)*(1.-colval(ce,BLU)));
+		saddscolor(r->rcol, ca);		/* ambient in scattering */
+	}
+	
 	srcscatter(r);				/* source in scattering */
 }
 
 
-extern void
+void
 raytexture(			/* get material modifiers */
 	RAY  *r,
 	OBJECT  mod
 )
 {
-	register OBJREC  *m;
+	OBJREC  *m;
 					/* execute textures and patterns */
 	for ( ; mod != OVOID; mod = m->omod) {
 		m = objptr(mod);
@@ -283,17 +318,18 @@ raytexture(			/* get material modifiers */
 }
 
 
-extern int
+int
 raymixture(		/* mix modifiers */
-	register RAY  *r,
+	RAY  *r,
 	OBJECT  fore,
 	OBJECT  back,
 	double  coef
 )
 {
 	RAY  fr, br;
+	double  mfore, mback;
 	int  foremat, backmat;
-	register int  i;
+	int  i;
 					/* bound coefficient */
 	if (coef > 1.0)
 		coef = 1.0;
@@ -305,14 +341,14 @@ raymixture(		/* mix modifiers */
 	fr = *r;
 	if (coef > FTINY) {
 		fr.rweight *= coef;
-		scalecolor(fr.rcoef, coef);
+		scalescolor(fr.rcoef, coef);
 		foremat = rayshade(&fr, fore);
 	}
 					/* background */
 	br = *r;
 	if (coef < 1.0-FTINY) {
 		br.rweight *= 1.0-coef;
-		scalecolor(br.rcoef, 1.0-coef);
+		scalescolor(br.rcoef, 1.0-coef);
 		backmat = rayshade(&br, back);
 	}
 					/* check for transparency */
@@ -326,27 +362,34 @@ raymixture(		/* mix modifiers */
 	for (i = 0; i < 3; i++)
 		r->pert[i] = coef*fr.pert[i] + (1.0-coef)*br.pert[i];
 					/* mix pattern colors */
-	scalecolor(fr.pcol, coef);
-	scalecolor(br.pcol, 1.0-coef);
-	copycolor(r->pcol, fr.pcol);
-	addcolor(r->pcol, br.pcol);
+	scalescolor(fr.pcol, coef);
+	scalescolor(br.pcol, 1.0-coef);
+	copyscolor(r->pcol, fr.pcol);
+	saddscolor(r->pcol, br.pcol);
 					/* return value tells if material */
 	if (!foremat & !backmat)
 		return(0);
 					/* mix returned ray values */
-	scalecolor(fr.rcol, coef);
-	scalecolor(br.rcol, 1.0-coef);
-	copycolor(r->rcol, fr.rcol);
-	addcolor(r->rcol, br.rcol);
-	r->rt = bright(fr.rcol) > bright(br.rcol) ? fr.rt : br.rt;
+	scalescolor(fr.rcol, coef);
+	scalescolor(br.rcol, 1.0-coef);
+	copyscolor(r->rcol, fr.rcol);
+	saddscolor(r->rcol, br.rcol);
+	scalescolor(fr.mcol, coef);
+	scalescolor(br.mcol, 1.0-coef);
+	copyscolor(r->mcol, fr.mcol);
+	saddscolor(r->mcol, br.mcol);
+	mfore = pbright(fr.mcol); mback = pbright(br.mcol);
+	r->rmt = mfore > mback ? fr.rmt : br.rmt;
+	r->rxt = pbright(fr.rcol)-mfore > pbright(br.rcol)-mback ?
+			fr.rxt : br.rxt;
 	return(1);
 }
 
 
-extern double
+double
 raydist(		/* compute (cumulative) ray distance */
-	register const RAY  *r,
-	register int  flags
+	const RAY  *r,
+	int  flags
 )
 {
 	double  sum = 0.0;
@@ -359,40 +402,39 @@ raydist(		/* compute (cumulative) ray distance */
 }
 
 
-extern void
+void
 raycontrib(		/* compute (cumulative) ray contribution */
-	double  rc[3],
+	SCOLOR  rc,
 	const RAY  *r,
 	int  flags
 )
 {
-	double	eext[3];
-	int	i;
+	static int	warnedPM = 0;
 
-	eext[0] = eext[1] = eext[2] = 0.;
-	rc[0] = rc[1] = rc[2] = 1.;
+	setscolor(rc, 1., 1., 1.);
 
 	while (r != NULL && r->crtype&flags) {
-		for (i = 3; i--; ) {
-			rc[i] *= colval(r->rcoef,i);
-			eext[i] += r->rot * colval(r->cext,i);
+		smultscolor(rc, r->rcoef);
+					/* check for participating medium */
+		if (!warnedPM && (bright(r->cext) > FTINY) |
+				(bright(r->albedo) > FTINY)) {
+			error(WARNING,
+	"ray contribution calculation does not support participating media");
+			warnedPM++;
 		}
 		r = r->parent;
 	}
-	for (i = 3; i--; )
-		rc[i] *= (eext[i] <= FTINY) ? 1. :
-				(eext[i] > 92.) ? 0. : exp(-eext[i]);
 }
 
 
-extern double
+double
 raynormal(		/* compute perturbed normal for ray */
 	FVECT  norm,
-	register RAY  *r
+	RAY  *r
 )
 {
 	double  newdot;
-	register int  i;
+	int  i;
 
 	/*	The perturbation is added to the surface normal to obtain
 	 *  the new normal.  If the new normal would affect the surface
@@ -421,7 +463,7 @@ raynormal(		/* compute perturbed normal for ray */
 }
 
 
-extern void
+void
 newrayxf(			/* get new tranformation matrix for ray */
 	RAY  *r
 )
@@ -430,8 +472,8 @@ newrayxf(			/* get new tranformation matrix for ray */
 		struct xfn  *next;
 		FULLXF  xf;
 	}  xfseed = { &xfseed }, *xflast = &xfseed;
-	register struct xfn  *xp;
-	register const RAY  *rp;
+	struct xfn  *xp;
+	const RAY  *rp;
 
 	/*
 	 * Search for transform in circular list that
@@ -442,7 +484,7 @@ newrayxf(			/* get new tranformation matrix for ray */
 		if (rp->rox == &xp->xf) {		/* xp in use */
 			xp = xp->next;			/* move to next */
 			if (xp == xflast) {		/* need new one */
-				xp = (struct xfn *)malloc(sizeof(struct xfn));
+				xp = (struct xfn *)bmalloc(sizeof(struct xfn));
 				if (xp == NULL)
 					error(SYSTEM,
 						"out of memory in newrayxf");
@@ -459,9 +501,9 @@ newrayxf(			/* get new tranformation matrix for ray */
 }
 
 
-extern void
+void
 flipsurface(			/* reverse surface orientation */
-	register RAY  *r
+	RAY  *r
 )
 {
 	r->rod = -r->rod;
@@ -471,10 +513,53 @@ flipsurface(			/* reverse surface orientation */
 	r->pert[0] = -r->pert[0];
 	r->pert[1] = -r->pert[1];
 	r->pert[2] = -r->pert[2];
+	r->rflips++;
 }
 
 
-extern void
+int
+rayreject(		/* check if candidate hit is worse than current */
+	OBJREC *o,
+	RAY *r,
+	double t,
+	double rod
+)
+{
+	OBJREC	*mnew, *mray;
+
+	if ((t <= FTINY) | (t > r->rot + FTINY))
+		return(1);
+	if (t < r->rot - FTINY)		/* is new hit significantly closer? */
+		return(0);
+					/* coincident point, so decide... */
+	if (o == r->ro)
+		return(1);		/* shouldn't happen */
+	if (r->ro == NULL)
+		return(0);		/* ditto */
+	mnew = findmaterial(o);
+	mray = findmaterial(r->ro);	/* check material transparencies */
+	if (mnew == NULL) {
+		if (mray != NULL)
+			return(1);	/* old has material, new does not */
+	} else if (mray == NULL) {
+		return(0);		/* new has material, old does not */
+	} else if (istransp(mnew->otype)) {
+		if (!istransp(mray->otype))
+			return(1);	/* new is transparent, old is not */
+	} else if (istransp(mray->otype)) {
+		return(0);		/* old is transparent, new is not */
+	}
+	if (rod <= 0) {			/* check which side we hit */
+		if (r->rod > 0)
+			return(1);	/* old hit front, new did not */
+	} else if (r->rod <= 0) {
+		return(0);		/* new hit front, old did not */
+	}
+			/* earlier modifier definition wins tie */
+	return (r->ro->omod >= o->omod);
+}
+
+void
 rayhit(			/* standard ray hit test */
 	OBJECT  *oset,
 	RAY  *r
@@ -491,17 +576,17 @@ rayhit(			/* standard ray hit test */
 }
 
 
-extern int
+int
 localhit(		/* check for hit in the octree */
-	register RAY  *r,
-	register CUBE  *scene
+	RAY  *r,
+	CUBE  *scene
 )
 {
 	OBJECT  cxset[MAXCSET+1];	/* set of checked objects */
 	FVECT  curpos;			/* current cube position */
 	int  sflags;			/* sign flags */
 	double  t, dt;
-	register int  i;
+	int  i;
 
 	nrays++;			/* increment trace counter */
 	sflags = 0;
@@ -512,14 +597,15 @@ localhit(		/* check for hit in the octree */
 		else if (r->rdir[i] < -1e-7)
 			sflags |= 0x10 << i;
 	}
-	if (sflags == 0)
-		error(CONSISTENCY, "zero ray direction in localhit");
+	if (!sflags) {
+		error(WARNING, "zero ray direction in localhit");
+		return(0);
+	}
 					/* start off assuming nothing hit */
 	if (r->rmax > FTINY) {		/* except aft plane if one */
 		r->ro = &Aftplane;
 		r->rot = r->rmax;
-		for (i = 0; i < 3; i++)
-			r->rop[i] = r->rorg[i] + r->rot*r->rdir[i];
+		VSUM(r->rop, r->rorg, r->rdir, r->rot);
 	}
 					/* find global cube entrance point */
 	t = 0.0;
@@ -542,8 +628,7 @@ localhit(		/* check for hit in the octree */
 		if (t >= r->rot)	/* clipped already */
 			return(0);
 					/* advance position */
-		for (i = 0; i < 3; i++)
-			curpos[i] += r->rdir[i]*t;
+		VSUM(curpos, curpos, r->rdir, t);
 
 		if (!incube(scene, curpos))	/* non-intersecting ray */
 			return(0);
@@ -559,8 +644,8 @@ raymove(		/* check for hit as we move */
 	FVECT  pos,			/* current position, modified herein */
 	OBJECT  *cxs,			/* checked objects, modified by checkhit */
 	int  dirf,			/* direction indicators to speed tests */
-	register RAY  *r,
-	register CUBE  *cu
+	RAY  *r,
+	CUBE  *cu
 )
 {
 	int  ax;
@@ -568,7 +653,7 @@ raymove(		/* check for hit as we move */
 
 	if (istree(cu->cutree)) {		/* recurse on subcubes */
 		CUBE  cukid;
-		register int  br, sgn;
+		int  br, sgn;
 
 		cukid.cusize = cu->cusize * 0.5;	/* find subcube */
 		VCOPY(cukid.cuorg, cu->cuorg);
@@ -634,16 +719,14 @@ raymove(		/* check for hit as we move */
 			ax = 2;
 		}
 	}
-	pos[0] += r->rdir[0]*t;
-	pos[1] += r->rdir[1]*t;
-	pos[2] += r->rdir[2]*t;
+	VSUM(pos, pos, r->rdir, t);
 	return(ax);
 }
 
 
 static int
 checkhit(		/* check for hit in full cube */
-	register RAY  *r,
+	RAY  *r,
 	CUBE  *cu,
 	OBJECT  *cxs
 )
@@ -664,12 +747,12 @@ checkhit(		/* check for hit in full cube */
 
 static void
 checkset(		/* modify checked set and set to check */
-	register OBJECT  *os,			/* os' = os - cs */
-	register OBJECT  *cs			/* cs' = cs + os */
+	OBJECT  *os,			/* os' = os - cs */
+	OBJECT  *cs			/* cs' = cs + os */
 )
 {
 	OBJECT  cset[MAXCSET+MAXSET+1];
-	register int  i, j;
+	int  i, j;
 	int  k;
 					/* copy os in place, cset <- cs */
 	cset[0] = 0;