ViewVC Help

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

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

Comparing ray/src/rt/ambcomp.c (file contents):
Revision 2.89 by greg, Tue Apr 19 00:36:34 2022 UTC vs.
Revision 2.105 by greg, Thu Aug 21 20:38:41 2025 UTC

#	Line 24 | Line 24 | static const char      RCSid[] = "$Id$";
24		#ifndef MINADIV
25		#define MINADIV         7       /* minimum # divisions in each dimension */
26		#endif
27	+	#ifndef MINSDIST
28	+	#define MINSDIST        0.2     /* def. min. spacing = 1/5th division */
29	+	#endif
30
31		typedef struct {
29	–	COLOR   v;              /* hemisphere sample value */
30	–	float   d;              /* reciprocal distance */
32		FVECT   p;              /* intersection point */
33	+	float   d;              /* reciprocal distance */
34	+	SCOLOR  v;              /* hemisphere sample value */
35		} AMBSAMP;              /* sample value */
36
37		typedef struct {
38		RAY     *rp;            /* originating ray sample */
39		int     ns;             /* number of samples per axis */
40		int     sampOK;         /* acquired full sample set? */
41	<	COLOR   acoef;          /* division contribution coefficient */
42	<	double  acol[3];        /* accumulated color */
41	>	int     atyp;           /* RAMBIENT or TAMBIENT */
42	>	SCOLOR  acoef;          /* division contribution coefficient */
43	>	SCOLOR  acol;           /* accumulated color */
44	>	FVECT   onrm;           /* oriented unperturbed surface normal */
45		FVECT   ux, uy;         /* tangent axis unit vectors */
46		AMBSAMP sa[1];          /* sample array (extends struct) */
47		}  AMBHEMI;             /* ambient sample hemisphere */
#	Line 50 | Line 55 | typedef struct {
55		} FFTRI;                /* vectors and coefficients for Hessian calculation */
56
57
58	+	#define XLOTSIZ         512             /* size of used car lot */
59	+	#define CFIRST          0               /* first corner */
60	+	#define COTHER          (CFIRST+4)      /* non-corner sample */
61	+	#define CMAXTARGET      (int)(XLOTSIZ*MINSDIST/(1-MINSDIST))
62	+
63		static int
64	<	ambcollision(                           /* proposed direciton collides? */
64	>	psample_class(double ss[2])             /* classify patch sample */
65	>	{
66	>	if (ss[0] < MINSDIST) {
67	>	if (ss[1] < MINSDIST)
68	>	return(CFIRST);
69	>	if (ss[1] > 1.-MINSDIST)
70	>	return(CFIRST+2);
71	>	} else if (ss[0] > 1.-MINSDIST) {
72	>	if (ss[1] < MINSDIST)
73	>	return(CFIRST+1);
74	>	if (ss[1] > 1.-MINSDIST)
75	>	return(CFIRST+3);
76	>	}
77	>	return(COTHER);                 /* not in a corner */
78	>	}
79	>
80	>	static void
81	>	trade_patchsamp(double ss[2])           /* trade in problem patch position */
82	>	{
83	>	static float    tradelot[XLOTSIZ][2];
84	>	static int      gterm[COTHER+1];
85	>	double          repl[2];
86	>	int             sclass, rclass;
87	>	int             x;
88	>	re_initialize:                          /* initialize lot? */
89	>	while (gterm[COTHER] < XLOTSIZ) {
90	>	tradelot[gterm[COTHER]][0] = frandom();
91	>	tradelot[gterm[COTHER]][1] = frandom();
92	>	++gterm[COTHER];
93	>	}
94	>	/* get trade-in candidate... */
95	>	sclass = psample_class(ss);     /* submitted corner or not? */
96	>	switch (sclass) {
97	>	case COTHER:                    /* trade mid-edge with corner/any */
98	>	x = irandom( gterm[COTHER-1] > CMAXTARGET
99	>	? gterm[COTHER-1] : XLOTSIZ );
100	>	break;
101	>	case CFIRST:                    /* kick out of first corner */
102	>	x = gterm[CFIRST] + irandom(XLOTSIZ - gterm[CFIRST]);
103	>	break;
104	>	default:                        /* kick out of 2nd-4th corner */
105	>	x = irandom(XLOTSIZ - (gterm[sclass] - gterm[sclass-1]));
106	>	x += (x >= gterm[sclass-1])*(gterm[sclass] - gterm[sclass-1]);
107	>	break;
108	>	}
109	>	if (x >= XLOTSIZ) {             /* uh-oh... trapped in a corner! */
110	>	memset(gterm, 0, sizeof(gterm));
111	>	goto re_initialize;
112	>	}
113	>	repl[0] = tradelot[x][0];       /* save selected replacement (result) */
114	>	repl[1] = tradelot[x][1];
115	>	/* identify replacement class */
116	>	for (rclass = CFIRST; rclass < COTHER; rclass++)
117	>	if (x < gterm[rclass])
118	>	break;          /* repark to keep classes grouped */
119	>	while (rclass > sclass) {       /* replacement group after submitted? */
120	>	tradelot[x][0] = tradelot[gterm[rclass-1]][0];
121	>	tradelot[x][1] = tradelot[gterm[rclass-1]][1];
122	>	x = gterm[--rclass]++;
123	>	}
124	>	while (rclass < sclass) {       /* replacement group before submitted? */
125	>	tradelot[x][0] = tradelot[--gterm[rclass]][0];
126	>	tradelot[x][1] = tradelot[gterm[rclass]][1];
127	>	x = gterm[rclass++];
128	>	}
129	>	tradelot[x][0] = ss[0];         /* complete the trade-in */
130	>	tradelot[x][1] = ss[1];
131	>	ss[0] = repl[0];
132	>	ss[1] = repl[1];
133	>	}
134	>
135	>	#undef XLOTSIZ
136	>	#undef COTHER
137	>	#undef CFIRST
138	>
139	>
140	>	static int
141	>	ambcollision(                           /* proposed direction collides? */
142		AMBHEMI *hp,
143		int     i,
144		int     j,
145	<	FVECT   dv
145	>	RREAL   spt[2]
146		)
147		{
61	–	double  cos_thresh;
148		int     ii, jj;
63	–	/* min. spacing = 1/4th division */
64	–	cos_thresh = (PI/4.)/(double)hp->ns;
65	–	cos_thresh = 1. - .5*cos_thresh*cos_thresh;
149		/* check existing neighbors */
150		for (ii = i-1; ii <= i+1; ii++) {
151		if (ii < 0) continue;
#	Line 70 | Line 153 | ambcollision(                          /* proposed direciton collides? */
153		for (jj = j-1; jj <= j+1; jj++) {
154		AMBSAMP *ap;
155		FVECT   avec;
156	<	double  dprod;
156	>	double  dx, dy;
157		if (jj < 0) continue;
158		if (jj >= hp->ns) break;
159		if ((ii==i) & (jj==j)) continue;
#	Line 78 | Line 161 | ambcollision(                          /* proposed direciton collides? */
161		if (ap->d <= .5/FHUGE)
162		continue;       /* no one home */
163		VSUB(avec, ap->p, hp->rp->rop);
164	<	dprod = DOT(avec, dv);
165	<	if (dprod >= cos_thresh*VLEN(avec))
166	<	return(1);      /* collision */
164	>	normalize(avec);        /* use diskworld distance */
165	>	dx = DOT(avec, hp->ux) - spt[0];
166	>	dy = DOT(avec, hp->uy) - spt[1];
167	>	if ((dx*dx + dy*dy)*(hp->ns*hp->ns) <
168	>	PI*MINSDIST*MINSDIST)
169	>	return(1);      /* too close */
170		}
171		}
172		return(0);                      /* nothing to worry about */
#	Line 95 | Line 181 | ambsample(                             /* initial ambient division sample */
181		int     n
182		)
183		{
184	+	int     trade_ok = (!n & (hp->ns >= 4))*21;
185		AMBSAMP *ap = &ambsam(hp,i,j);
186		RAY     ar;
187		int     hlist[3], ii;
188	+	double  ss[2];
189		RREAL   spt[2];
190		double  zd;
191		/* generate hemispherical sample */
192		/* ambient coefficient for weight */
193		if (ambacc > FTINY)
194	<	setcolor(ar.rcoef, AVGREFL, AVGREFL, AVGREFL);
194	>	setscolor(ar.rcoef, AVGREFL, AVGREFL, AVGREFL);
195		else
196	<	copycolor(ar.rcoef, hp->acoef);
197	<	if (rayorigin(&ar, AMBIENT, hp->rp, ar.rcoef) < 0)
196	>	copyscolor(ar.rcoef, hp->acoef);
197	>	if (rayorigin(&ar, hp->atyp, hp->rp, ar.rcoef) < 0)
198		return(0);
199		if (ambacc > FTINY) {
200	<	multcolor(ar.rcoef, hp->acoef);
201	<	scalecolor(ar.rcoef, 1./AVGREFL);
200	>	smultscolor(ar.rcoef, hp->acoef);
201	>	scalescolor(ar.rcoef, 1./AVGREFL);
202		}
203		hlist[0] = hp->rp->rno;
204	<	hlist[1] = j;
205	<	hlist[2] = i;
206	<	multisamp(spt, 2, urand(ilhash(hlist,3)+n));
207	<	resample:
208	<	square2disk(spt, (j+spt[1])/hp->ns, (i+spt[0])/hp->ns);
204	>	hlist[1] = AI(hp,i,j);
205	>	hlist[2] = samplendx;
206	>	multisamp(ss, 2, urand(ilhash(hlist,3)+n));
207	>	square2disk(spt, (j+ss[1])/hp->ns, (i+ss[0])/hp->ns);
208	>	/* avoid coincident samples? */
209	>	while (trade_ok-- && ambcollision(hp, i, j, spt)) {
210	>	if (trade_ok) {
211	>	trade_patchsamp(ss);
212	>	} else {                /* punting... */
213	>	ss[0] = MINSDIST + (1-2*MINSDIST)*frandom();
214	>	ss[1] = MINSDIST + (1-2*MINSDIST)*frandom();
215	>	}
216	>	square2disk(spt, (j+ss[1])/hp->ns, (i+ss[0])/hp->ns);
217	>	}
218		zd = sqrt(1. - spt[0]*spt[0] - spt[1]*spt[1]);
219		for (ii = 3; ii--; )
220		ar.rdir[ii] =   spt[0]*hp->ux[ii] +
221		spt[1]*hp->uy[ii] +
222	<	zd*hp->rp->ron[ii];
222	>	zd*hp->onrm[ii];
223		checknorm(ar.rdir);
224	<	/* avoid coincident samples */
128	<	if (!n && ambcollision(hp, i, j, ar.rdir)) {
129	<	spt[0] = frandom(); spt[1] = frandom();
130	<	goto resample;          /* reject this sample */
131	<	}
132	<	dimlist[ndims++] = AI(hp,i,j) + 90171;
224	>	dimlist[ndims_inc()] = AI(hp,i,j) + 90171;
225		rayvalue(&ar);                  /* evaluate ray */
226	<	ndims--;
226	>	dec_ndims();
227		zd = raydistance(&ar);
228		if (zd <= FTINY)
229		return(0);              /* should never happen */
230	<	multcolor(ar.rcol, ar.rcoef);   /* apply coefficient */
230	>	smultscolor(ar.rcol, ar.rcoef); /* apply coefficient */
231		if (zd*ap->d < 1.0)             /* new/closer distance? */
232		ap->d = 1.0/zd;
233		if (!n) {                       /* record first vertex & value */
234		if (zd > 10.0*thescene.cusize + 1000.)
235		zd = 10.0*thescene.cusize + 1000.;
236		VSUM(ap->p, ar.rorg, ar.rdir, zd);
237	<	copycolor(ap->v, ar.rcol);
237	>	copyscolor(ap->v, ar.rcol);
238		} else {                        /* else update recorded value */
239	<	hp->acol[RED] -= colval(ap->v,RED);
148	<	hp->acol[GRN] -= colval(ap->v,GRN);
149	<	hp->acol[BLU] -= colval(ap->v,BLU);
239	>	sopscolor(hp->acol, -=, ap->v);
240		zd = 1.0/(double)(n+1);
241	<	scalecolor(ar.rcol, zd);
241	>	scalescolor(ar.rcol, zd);
242		zd *= (double)n;
243	<	scalecolor(ap->v, zd);
244	<	addcolor(ap->v, ar.rcol);
243	>	scalescolor(ap->v, zd);
244	>	saddscolor(ap->v, ar.rcol);
245		}
246	<	addcolor(hp->acol, ap->v);      /* add to our sum */
246	>	saddscolor(hp->acol, ap->v);    /* add to our sum */
247		return(1);
248		}
249
#	Line 162 | Line 252 | resample:
252		static float *
253		getambdiffs(AMBHEMI *hp)
254		{
255	<	const double    normf = 1./bright(hp->acoef);
256	<	float   *earr = (float *)calloc(hp->ns*hp->ns, sizeof(float));
255	>	const double    normf = 1./(pbright(hp->acoef) + FTINY);
256	>	float   *earr = (float *)calloc(2*hp->ns*hp->ns, sizeof(float));
257		float   *ep;
258		AMBSAMP *ap;
259		double  b, b1, d2;
#	Line 172 | Line 262 | getambdiffs(AMBHEMI *hp)
262		if (earr == NULL)               /* out of memory? */
263		return(NULL);
264		/* sum squared neighbor diffs */
265	<	for (ap = hp->sa, ep = earr, i = 0; i < hp->ns; i++)
265	>	ap = hp->sa;
266	>	ep = earr + hp->ns*hp->ns;      /* original estimates to scratch */
267	>	for (i = 0; i < hp->ns; i++)
268		for (j = 0; j < hp->ns; j++, ap++, ep++) {
269	<	b = bright(ap[0].v);
269	>	b = pbright(ap[0].v);
270		if (i) {                /* from above */
271	<	b1 = bright(ap[-hp->ns].v);
271	>	b1 = pbright(ap[-hp->ns].v);
272		d2 = b - b1;
273		d2 *= d2*normf/(b + b1 + FTINY);
274		ep[0] += d2;
#	Line 184 | Line 276 | getambdiffs(AMBHEMI *hp)
276		}
277		if (!j) continue;
278		/* from behind */
279	<	b1 = bright(ap[-1].v);
279	>	b1 = pbright(ap[-1].v);
280		d2 = b - b1;
281		d2 *= d2*normf/(b + b1 + FTINY);
282		ep[0] += d2;
283		ep[-1] += d2;
284		if (!i) continue;
285		/* diagonal */
286	<	b1 = bright(ap[-hp->ns-1].v);
286	>	b1 = pbright(ap[-hp->ns-1].v);
287		d2 = b - b1;
288		d2 *= d2*normf/(b + b1 + FTINY);
289		ep[0] += d2;
290		ep[-hp->ns-1] += d2;
291		}
292		/* correct for number of neighbors */
293	<	earr[0] *= 8./3.;
294	<	earr[hp->ns-1] *= 8./3.;
295	<	earr[(hp->ns-1)*hp->ns] *= 8./3.;
296	<	earr[(hp->ns-1)*hp->ns + hp->ns-1] *= 8./3.;
293	>	ep = earr + hp->ns*hp->ns;
294	>	ep[0] *= 6./3.;
295	>	ep[hp->ns-1] *= 6./3.;
296	>	ep[(hp->ns-1)*hp->ns] *= 6./3.;
297	>	ep[(hp->ns-1)*hp->ns + hp->ns-1] *= 6./3.;
298		for (i = 1; i < hp->ns-1; i++) {
299	<	earr[i*hp->ns] *= 8./5.;
300	<	earr[i*hp->ns + hp->ns-1] *= 8./5.;
299	>	ep[i*hp->ns] *= 6./5.;
300	>	ep[i*hp->ns + hp->ns-1] *= 6./5.;
301		}
302		for (j = 1; j < hp->ns-1; j++) {
303	<	earr[j] *= 8./5.;
304	<	earr[(hp->ns-1)*hp->ns + j] *= 8./5.;
303	>	ep[j] *= 6./5.;
304	>	ep[(hp->ns-1)*hp->ns + j] *= 6./5.;
305		}
306	+	/* blur final map to reduce bias */
307	+	for (i = 0; i < hp->ns-1; i++) {
308	+	float  *ep2;
309	+	ep = earr + i*hp->ns;
310	+	ep2 = ep + hp->ns*hp->ns;
311	+	for (j = 0; j < hp->ns-1; j++, ep++, ep2++) {
312	+	ep[0] += .5*ep2[0] + .125*(ep2[1] + ep2[hp->ns]);
313	+	ep[1] += .125*ep2[0];
314	+	ep[hp->ns] += .125*ep2[0];
315	+	}
316	+	}
317		return(earr);
318		}
319
#	Line 245 | Line 349 | done:
349
350		static AMBHEMI *
351		samp_hemi(                              /* sample indirect hemisphere */
352	<	COLOR   rcol,
352	>	SCOLOR  rcol,
353		RAY     *r,
354		double  wt
355		)
356		{
357	+	int     backside = (wt < 0);
358		AMBHEMI *hp;
359		double  d;
360		int     n, i, j;
361		/* insignificance check */
362	<	if (bright(rcol) <= FTINY)
362	>	d = sintens(rcol);
363	>	if (d <= FTINY)
364		return(NULL);
365		/* set number of divisions */
366	+	if (backside) wt = -wt;
367		if (ambacc <= FTINY &&
368	<	wt > (d = 0.8*intens(rcol)*r->rweight/(ambdiv*minweight)))
368	>	wt > (d *= 0.8*r->rweight/(ambdiv*minweight + 1e-20)))
369		wt = d;                 /* avoid ray termination */
370		n = sqrt(ambdiv * wt) + 0.5;
371		i = 1 + (MINADIV-1)*(ambacc > FTINY);
#	Line 268 | Line 375 | samp_hemi(                             /* sample indirect hemisphere */
375		hp = (AMBHEMI *)malloc(sizeof(AMBHEMI) + sizeof(AMBSAMP)*(n*n - 1));
376		if (hp == NULL)
377		error(SYSTEM, "out of memory in samp_hemi");
378	+
379	+	if (backside) {
380	+	hp->atyp = TAMBIENT;
381	+	hp->onrm[0] = -r->ron[0];
382	+	hp->onrm[1] = -r->ron[1];
383	+	hp->onrm[2] = -r->ron[2];
384	+	} else {
385	+	hp->atyp = RAMBIENT;
386	+	VCOPY(hp->onrm, r->ron);
387	+	}
388		hp->rp = r;
389		hp->ns = n;
390	<	hp->acol[RED] = hp->acol[GRN] = hp->acol[BLU] = 0.0;
390	>	scolorblack(hp->acol);
391		memset(hp->sa, 0, sizeof(AMBSAMP)*n*n);
392		hp->sampOK = 0;
393		/* assign coefficient */
394	<	copycolor(hp->acoef, rcol);
394	>	copyscolor(hp->acoef, rcol);
395		d = 1.0/(n*n);
396	<	scalecolor(hp->acoef, d);
396	>	scalescolor(hp->acoef, d);
397		/* make tangent plane axes */
398	<	if (!getperpendicular(hp->ux, r->ron, 1))
398	>	if (!getperpendicular(hp->ux, hp->onrm, 1))
399		error(CONSISTENCY, "bad ray direction in samp_hemi");
400	<	VCROSS(hp->uy, r->ron, hp->ux);
400	>	VCROSS(hp->uy, hp->onrm, hp->ux);
401		/* sample divisions */
402		for (i = hp->ns; i--; )
403		for (j = hp->ns; j--; )
404		hp->sampOK += ambsample(hp, i, j, 0);
405	<	copycolor(rcol, hp->acol);
405	>	copyscolor(rcol, hp->acol);
406		if (!hp->sampOK) {              /* utter failure? */
407		free(hp);
408		return(NULL);
#	Line 297 | Line 414 | samp_hemi(                             /* sample indirect hemisphere */
414		if (hp->sampOK <= MINADIV*MINADIV)
415		return(hp);             /* don't bother super-sampling */
416		n = ambssamp*wt + 0.5;
417	<	if (n > 8) {                    /* perform super-sampling? */
417	>	if (n >= 4*hp->ns) {            /* perform super-sampling? */
418		ambsupersamp(hp, n);
419	<	copycolor(rcol, hp->acol);
419	>	copyscolor(rcol, hp->acol);
420		}
421		return(hp);                     /* all is well */
422		}
#	Line 311 | Line 428 | back_ambval(AMBHEMI *hp, const int n1, const int n2, c
428		{
429		if (hp->sa[n1].d <= hp->sa[n2].d) {
430		if (hp->sa[n1].d <= hp->sa[n3].d)
431	<	return(colval(hp->sa[n1].v,CIEY));
432	<	return(colval(hp->sa[n3].v,CIEY));
431	>	return(hp->sa[n1].v[0]);
432	>	return(hp->sa[n3].v[0]);
433		}
434		if (hp->sa[n2].d <= hp->sa[n3].d)
435	<	return(colval(hp->sa[n2].v,CIEY));
436	<	return(colval(hp->sa[n3].v,CIEY));
435	>	return(hp->sa[n2].v[0]);
436	>	return(hp->sa[n3].v[0]);
437		}
438
439
#	Line 545 | Line 662 | ambHessian(                            /* anisotropic radii & pos. gradient */
662		for (j = 0; j < hp->ns-1; j++) {
663		comp_fftri(&fftr, hp, AI(hp,0,j), AI(hp,0,j+1));
664		if (hessrow != NULL)
665	<	comp_hessian(hessrow[j], &fftr, hp->rp->ron);
665	>	comp_hessian(hessrow[j], &fftr, hp->onrm);
666		if (gradrow != NULL)
667	<	comp_gradient(gradrow[j], &fftr, hp->rp->ron);
667	>	comp_gradient(gradrow[j], &fftr, hp->onrm);
668		}
669		/* sum each row of triangles */
670		for (i = 0; i < hp->ns-1; i++) {
#	Line 555 | Line 672 | ambHessian(                            /* anisotropic radii & pos. gradient */
672		FVECT       gradcol;
673		comp_fftri(&fftr, hp, AI(hp,i,0), AI(hp,i+1,0));
674		if (hessrow != NULL)
675	<	comp_hessian(hesscol, &fftr, hp->rp->ron);
675	>	comp_hessian(hesscol, &fftr, hp->onrm);
676		if (gradrow != NULL)
677	<	comp_gradient(gradcol, &fftr, hp->rp->ron);
677	>	comp_gradient(gradcol, &fftr, hp->onrm);
678		for (j = 0; j < hp->ns-1; j++) {
679		FVECT   hessdia[3];     /* compute triangle contributions */
680		FVECT   graddia;
#	Line 567 | Line 684 | ambHessian(                            /* anisotropic radii & pos. gradient */
684		/* diagonal (inner) edge */
685		comp_fftri(&fftr, hp, AI(hp,i,j+1), AI(hp,i+1,j));
686		if (hessrow != NULL) {
687	<	comp_hessian(hessdia, &fftr, hp->rp->ron);
687	>	comp_hessian(hessdia, &fftr, hp->onrm);
688		rev_hessian(hesscol);
689		add2hessian(hessian, hessrow[j], hessdia, hesscol, backg);
690		}
691		if (gradrow != NULL) {
692	<	comp_gradient(graddia, &fftr, hp->rp->ron);
692	>	comp_gradient(graddia, &fftr, hp->onrm);
693		rev_gradient(gradcol);
694		add2gradient(gradient, gradrow[j], graddia, gradcol, backg);
695		}
696		/* initialize edge in next row */
697		comp_fftri(&fftr, hp, AI(hp,i+1,j+1), AI(hp,i+1,j));
698		if (hessrow != NULL)
699	<	comp_hessian(hessrow[j], &fftr, hp->rp->ron);
699	>	comp_hessian(hessrow[j], &fftr, hp->onrm);
700		if (gradrow != NULL)
701	<	comp_gradient(gradrow[j], &fftr, hp->rp->ron);
701	>	comp_gradient(gradrow[j], &fftr, hp->onrm);
702		/* new column edge & paired triangle */
703		backg = back_ambval(hp, AI(hp,i+1,j+1),
704		AI(hp,i+1,j), AI(hp,i,j+1));
705		comp_fftri(&fftr, hp, AI(hp,i,j+1), AI(hp,i+1,j+1));
706		if (hessrow != NULL) {
707	<	comp_hessian(hesscol, &fftr, hp->rp->ron);
707	>	comp_hessian(hesscol, &fftr, hp->onrm);
708		rev_hessian(hessdia);
709		add2hessian(hessian, hessrow[j], hessdia, hesscol, backg);
710		if (i < hp->ns-2)
711		rev_hessian(hessrow[j]);
712		}
713		if (gradrow != NULL) {
714	<	comp_gradient(gradcol, &fftr, hp->rp->ron);
714	>	comp_gradient(gradcol, &fftr, hp->onrm);
715		rev_gradient(graddia);
716		add2gradient(gradient, gradrow[j], graddia, gradcol, backg);
717		if (i < hp->ns-2)
#	Line 630 | Line 747 | ambdirgrad(AMBHEMI *hp, FVECT uv[2], float dg[2])
747		/* use vector for azimuth + 90deg */
748		VSUB(vd, ap->p, hp->rp->rop);
749		/* brightness over cosine factor */
750	<	gfact = colval(ap->v,CIEY) / DOT(hp->rp->ron, vd);
750	>	gfact = ap->v[0] / DOT(hp->onrm, vd);
751		/* sine = proj_radius/vd_length */
752		dgsum[0] -= DOT(uv[1], vd) * gfact;
753		dgsum[1] += DOT(uv[0], vd) * gfact;
#	Line 686 | Line 803 | ambcorral(AMBHEMI *hp, FVECT uv[2], const double r0, c
803
804		int
805		doambient(                              /* compute ambient component */
806	<	COLOR   rcol,                   /* input/output color */
806	>	SCOLOR  rcol,                   /* input/output color */
807		RAY     *r,
808	<	double  wt,
808	>	double  wt,                     /* negative for back side */
809		FVECT   uv[2],                  /* returned (optional) */
810		float   ra[2],                  /* returned (optional) */
811		float   pg[2],                  /* returned (optional) */
#	Line 720 | Line 837 | doambient(                             /* compute ambient component */
837		free(hp);               /* Hessian not requested/possible */
838		return(-1);             /* value-only return value */
839		}
840	<	if ((d = bright(rcol)) > FTINY) {       /* normalize Y values */
841	<	d = 0.99*(hp->ns*hp->ns)/d;
840	>	if ((d = scolor_mean(rcol)) > FTINY) {
841	>	d = 0.99*(hp->ns*hp->ns)/d;     /* normalize avg. values */
842		K = 0.01;
843		} else {                        /* or fall back on geometric Hessian */
844		K = 1.0;
#	Line 729 | Line 846 | doambient(                             /* compute ambient component */
846		dg = NULL;
847		crlp = NULL;
848		}
849	<	ap = hp->sa;                    /* relative Y channel from here on... */
849	>	ap = hp->sa;                    /* single channel from here on... */
850		for (i = hp->ns*hp->ns; i--; ap++)
851	<	colval(ap->v,CIEY) = bright(ap->v)*d + K;
851	>	ap->v[0] = scolor_mean(ap->v)*d + K;
852
853		if (uv == NULL)                 /* make sure we have axis pointers */
854		uv = my_uv;
#	Line 755 | Line 872 | doambient(                             /* compute ambient component */
872		if (ra[1] < minarad)
873		ra[1] = minarad;
874		}
875	<	ra[0] *= d = 1.0/sqrt(wt);
875	>	ra[0] *= d = 1.0/sqrt(fabs(wt));
876		if ((ra[1] *= d) > 2.0*ra[0])
877		ra[1] = 2.0*ra[0];
878		if (ra[1] > maxarad) {

Diff Legend

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