ViewVC Help

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

root/Development/ray/src/cv/bsdf2klems.c

Comparing ray/src/cv/bsdf2klems.c (file contents):
Revision 2.23 by greg, Thu Oct 13 16:59:29 2016 UTC vs.
Revision 2.26 by greg, Tue Mar 19 22:03:24 2019 UTC

#	Line 31 | Line 31 | static const char      klems_half[] = "LBNL/Klems Half";
31		static const char       klems_quarter[] = "LBNL/Klems Quarter";
32		static const char       *kbasis = klems_full;
33		/* number of BSDF samples per patch */
34	<	static int              npsamps = 256;
34	>	static int              npsamps = 1024;
35		/* limit on number of RBF lobes */
36		static int              lobe_lim = 15000;
37		/* progress bar length */
#	Line 202 | Line 202 | eval_bsdf(const char *fname)
202		goto err;
203		sum += sdv.cieY;
204		if (rbf_colorimetry == RBCtristimulus) {
205	–	c_ccvt(&sdv.spec, C_CSXY);
205		xsum += sdv.cieY * sdv.spec.cx;
206		ysum += sdv.cieY * sdv.spec.cy;
207		}
#	Line 252 | Line 251 | eval_bsdf(const char *fname)
251		goto err;
252		sum += sdv.cieY;
253		if (rbf_colorimetry == RBCtristimulus) {
255	–	c_ccvt(&sdv.spec, C_CSXY);
254		xsum += sdv.cieY * sdv.spec.cx;
255		ysum += sdv.cieY * sdv.spec.cy;
256		}
#	Line 301 | Line 299 | eval_bsdf(const char *fname)
299		goto err;
300		sum += sdv.cieY;
301		if (rbf_colorimetry == RBCtristimulus) {
304	–	c_ccvt(&sdv.spec, C_CSXY);
302		xsum += sdv.cieY * sdv.spec.cx;
303		ysum += sdv.cieY * sdv.spec.cy;
304		}
#	Line 351 | Line 348 | eval_bsdf(const char *fname)
348		goto err;
349		sum += sdv.cieY;
350		if (rbf_colorimetry == RBCtristimulus) {
354	–	c_ccvt(&sdv.spec, C_CSXY);
351		xsum += sdv.cieY * sdv.spec.cx;
352		ysum += sdv.cieY * sdv.spec.cy;
353		}
#	Line 471 | Line 467 | eval_rbf(void)
467		eval_rbfcol(&sdv, rbf, vout);
468		sum += sdv.cieY;
469		if (rbf_colorimetry == RBCtristimulus) {
474	–	c_ccvt(&sdv.spec, C_CSXY);
470		xsum += sdv.cieY * sdv.spec.cx;
471		ysum += sdv.cieY * sdv.spec.cy;
472		}
#	Line 607 | Line 602 | main(int argc, char *argv[])
602		add_wbsdf("-f", 1);
603		add_wbsdf(argv[i], 1);
604		} else {
605	<	fcompile(argv[i]);
605	>	char    *fpath = getpath(argv[i],
606	>	getrlibpath(), 0);
607	>	if (fpath == NULL) {
608	>	fprintf(stderr,
609	>	"%s: cannot find file '%s'\n",
610	>	argv[0], argv[i]);
611	>	return(1);
612	>	}
613	>	fcompile(fpath);
614		single_plane_incident = 0;
615		}
616		} else

Diff Legend

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