ViewVC Help

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

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

Comparing ray/src/cv/bsdfrep.c (file contents):
Revision 2.30 by greg, Sat Jan 30 01:31:57 2016 UTC vs.
Revision 2.38 by greg, Sun May 18 01:46:05 2025 UTC

#	Line 9 | Line 9 | static const char RCSid[] = "$Id$";
9
10		#define _USE_MATH_DEFINES
11		#include <stdlib.h>
12	–	#include <string.h>
12		#include <math.h>
13		#include "rtio.h"
14		#include "resolu.h"
#	Line 54 | Line 53 | MIGRATION              *mig_list = NULL;
53		/* current input direction */
54		double                  theta_in_deg, phi_in_deg;
55
56	+	/* header line sharing callback */
57	+	int                     (*sir_headshare)(char *s) = NULL;
58	+
59		/* Register new input direction */
60		int
61		new_input_direction(double new_theta, double new_phi)
#	Line 102 | Line 104 | new_input_direction(double new_theta, double new_phi)
104		int
105		use_symmetry(FVECT vec)
106		{
107	<	const double    phi = get_phi360(vec);
107	>	double  phi = get_phi360(vec);
108	>	/* because of -0. issue */
109	>	while (phi >= 360.) phi -= 360.;
110	>	while (phi < 0.) phi += 360.;
111
112		switch (inp_coverage) {
113		case INP_QUAD1|INP_QUAD2|INP_QUAD3|INP_QUAD4:
#	Line 220 | Line 225 | rotate_rbf(RBFNODE *rbf, const FVECT invec)
225		}
226
227		/* Compute outgoing vector from grid position */
228	+	#if 1
229		void
230		ovec_from_pos(FVECT vec, int xpos, int ypos)
231	<	{
232	<	double  uv[2];
231	>	{                               /* precomputed table version */
232	>	static int      qsiz = 0;
233	>	static float    (*q_uv)[2] = NULL;
234	>
235	>	if (vec == NULL) {      /* just free table? */
236	>	if (q_uv) free(q_uv);
237	>	qsiz = 0;
238	>	return;
239	>	}
240	>	if (qsiz != grid_res>>1) {
241	>	int     x, y;   /* (re)make positive quadrant table */
242	>	RREAL   uv[2];
243	>	double  r;
244	>	if (q_uv) free(q_uv);
245	>	qsiz = grid_res>>1;
246	>	q_uv = (float (*)[2])malloc(sizeof(float)*2*qsiz*qsiz);
247	>	for (y = qsiz; y--; )
248	>	for (x = qsiz; x--; ) {
249	>	square2disk(uv, 0.5 + (x+.5)/grid_res,
250	>	0.5 + (y+.5)/grid_res);
251	>	/* uniform hemispherical projection */
252	>	r = sqrt(2. - uv[0]*uv[0] - uv[1]*uv[1]);
253	>	q_uv[qsiz*y + x][0] = (float)(r*uv[0]);
254	>	q_uv[qsiz*y + x][1] = (float)(r*uv[1]);
255	>	}
256	>	}
257	>	/* put in positive quadrant */
258	>	if (xpos >= qsiz) { xpos -= qsiz; vec[0] = 1.; }
259	>	else { xpos = qsiz-1 - xpos; vec[0] = -1.; }
260	>	if (ypos >= qsiz) { ypos -= qsiz; vec[1] = 1.; }
261	>	else { ypos = qsiz-1 - ypos; vec[1] = -1.; }
262	>
263	>	vec[0] *= (RREAL)q_uv[qsiz*ypos + xpos][0];
264	>	vec[1] *= (RREAL)q_uv[qsiz*ypos + xpos][1];
265	>	vec[2] = output_orient*sqrt(1. - vec[0]*vec[0] - vec[1]*vec[1]);
266	>	}
267	>	#else
268	>	void
269	>	ovec_from_pos(FVECT vec, int xpos, int ypos)
270	>	{                               /* table-free version */
271	>	RREAL   uv[2];
272		double  r2;
273	<
274	<	SDsquare2disk(uv, (xpos+.5)/grid_res, (ypos+.5)/grid_res);
273	>
274	>	if (vec == NULL)
275	>	return;
276	>
277	>	square2disk(uv, (xpos+.5)/grid_res, (ypos+.5)/grid_res);
278		/* uniform hemispherical projection */
279		r2 = uv[0]*uv[0] + uv[1]*uv[1];
280		vec[0] = vec[1] = sqrt(2. - r2);
#	Line 234 | Line 282 | ovec_from_pos(FVECT vec, int xpos, int ypos)
282		vec[1] *= uv[1];
283		vec[2] = output_orient*(1. - r2);
284		}
285	+	#endif
286
287		/* Compute grid position from normalized input/output vector */
288		void
289		pos_from_vec(int pos[2], const FVECT vec)
290		{
291	<	double  sq[2];          /* uniform hemispherical projection */
291	>	RREAL   sq[2];          /* uniform hemispherical projection */
292		double  norm = 1./sqrt(1. + fabs(vec[2]));
293
294	<	SDdisk2square(sq, vec[0]*norm, vec[1]*norm);
294	>	disk2square(sq, vec[0]*norm, vec[1]*norm);
295
296		pos[0] = (int)(sq[0]*grid_res);
297		pos[1] = (int)(sq[1]*grid_res);
#	Line 310 | Line 359 | eval_rbfcol(SDValue *sv, const RBFNODE *rp, const FVEC
359		}
360		res += val;
361		}
362	<	if ((rbf_colorimetry == RBCtristimulus) & (res > 1e-6)) {
362	>	sv->cieY = res / COSF(outvec[2]);
363	>	if (sv->cieY < bsdf_min) {      /* never return less than bsdf_min */
364	>	sv->cieY = bsdf_min;
365	>	} else if (rbf_colorimetry == RBCtristimulus) {
366		C_CHROMA        cres = (int)(usum/res + frandom());
367		cres |= (int)(vsum/res + frandom()) << 8;
368		c_decodeChroma(&sv->spec, cres);
369		}
318	–	sv->cieY = res / COSF(outvec[2]);
319	–	if (sv->cieY < bsdf_min)        /* never return less than bsdf_min */
320	–	sv->cieY = bsdf_min;
370		return(SDEnone);
371		}
372
#	Line 476 | Line 525 | e_advect_rbf(const MIGRATION *mig, const FVECT invec,
525		double          t, full_dist;
526		/* get relative position */
527		t = Acos(DOT(invec, mig->rbfv[0]->invec));
528	<	if (t < M_PI/grid_res) {                /* near first DSF */
528	>	if (t <= .001) {                        /* near first DSF */
529		n = sizeof(RBFNODE) + sizeof(RBFVAL)*(mig->rbfv[0]->nrbf-1);
530		rbf = (RBFNODE *)malloc(n);
531		if (rbf == NULL)
#	Line 486 | Line 535 | e_advect_rbf(const MIGRATION *mig, const FVECT invec,
535		return(rbf);
536		}
537		full_dist = acos(DOT(mig->rbfv[0]->invec, mig->rbfv[1]->invec));
538	<	if (t > full_dist-M_PI/grid_res) {      /* near second DSF */
538	>	if (t >= full_dist-.001) {              /* near second DSF */
539		n = sizeof(RBFNODE) + sizeof(RBFVAL)*(mig->rbfv[1]->nrbf-1);
540		rbf = (RBFNODE *)malloc(n);
541		if (rbf == NULL)
#	Line 582 | Line 631 | clear_bsdf_rep(void)
631		input_orient = output_orient = 0;
632		rbf_colorimetry = RBCunknown;
633		grid_res = GRIDRES;
634	+	memset(bsdf_hist, 0, sizeof(bsdf_hist));
635		bsdf_min = 0;
636		bsdf_spec_val = 0;
637		bsdf_spec_rad = 0;
#	Line 658 | Line 708 | save_bsdf_rep(FILE *ofp)
708		static int
709		headline(char *s, void *p)
710		{
711	<	char    fmt[64];
711	>	char    fmt[MAXFMTLEN];
712		int     i;
713
714	+	if (isheadid(s))
715	+	return(0);
716		if (!strncmp(s, "NAME=", 5)) {
717		strcpy(bsdf_name, s+5);
718		bsdf_name[strlen(bsdf_name)-1] = '\0';
719	+	return(1);
720		}
721		if (!strncmp(s, "MANUFACT=", 9)) {
722		strcpy(bsdf_manuf, s+9);
723		bsdf_manuf[strlen(bsdf_manuf)-1] = '\0';
724	+	return(1);
725		}
726		if (!strncmp(s, "SYMMETRY=", 9)) {
727		inp_coverage = atoi(s+9);
728		single_plane_incident = !inp_coverage;
729	<	return(0);
729	>	return(1);
730		}
731		if (!strncmp(s, "IO_SIDES=", 9)) {
732		sscanf(s+9, "%d %d", &input_orient, &output_orient);
733	<	return(0);
733	>	return(1);
734		}
735		if (!strncmp(s, "COLORIMETRY=", 12)) {
736		fmt[0] = '\0';
#	Line 687 | Line 741 | headline(char *s, void *p)
741		if (i < 0)
742		return(-1);
743		rbf_colorimetry = i;
744	<	return(0);
744	>	return(1);
745		}
746		if (!strncmp(s, "GRIDRES=", 8)) {
747		sscanf(s+8, "%d", &grid_res);
748	<	return(0);
748	>	return(1);
749		}
750		if (!strncmp(s, "BSDFMIN=", 8)) {
751		sscanf(s+8, "%lf", &bsdf_min);
752	<	return(0);
752	>	return(1);
753		}
754		if (!strncmp(s, "BSDFSPEC=", 9)) {
755		sscanf(s+9, "%lf %lf", &bsdf_spec_val, &bsdf_spec_rad);
756	<	return(0);
756	>	return(1);
757		}
758	<	if (formatval(fmt, s) && strcmp(fmt, BSDFREP_FMT))
759	<	return(-1);
758	>	if (formatval(fmt, s))
759	>	return (strcmp(fmt, BSDFREP_FMT) ? -1 : 0);
760	>	if (sir_headshare != NULL)
761	>	return ((*sir_headshare)(s));
762		return(0);
763		}
764

Diff Legend

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