ViewVC Help

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

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

Comparing ray/src/cv/pabopto2bsdf.c (file contents):
Revision 2.14 by greg, Thu Feb 20 09:21:32 2014 UTC vs.
Revision 2.19 by greg, Wed Mar 19 19:48:57 2014 UTC

#	Line 14 | Line 14 | static const char RCSid[] = "$Id$";
14		#include <math.h>
15		#include "platform.h"
16		#include "bsdfrep.h"
17	+	#include "resolu.h"
18		/* global argv[0] */
19		char                    *progname;
20
#	Line 24 | Line 25 | typedef struct {
25		long            dstart;         /* data start offset in file */
26		} PGINPUT;
27
28	+	double          angle_eps = 0;  /* epsilon for angle comparisons */
29	+
30		PGINPUT         *inpfile;       /* input files sorted by incidence */
31		int             ninpfiles;      /* number of input files */
32
#	Line 34 | Line 37 | cmp_inang(const void *p1, const void *p2)
37		const PGINPUT   *inp1 = (const PGINPUT *)p1;
38		const PGINPUT   *inp2 = (const PGINPUT *)p2;
39
40	<	if (inp1->theta > inp2->theta+FTINY)
40	>	if (inp1->theta > inp2->theta+angle_eps)
41		return(1);
42	<	if (inp1->theta < inp2->theta-FTINY)
42	>	if (inp1->theta < inp2->theta-angle_eps)
43		return(-1);
44	<	if (inp1->phi > inp2->phi+FTINY)
44	>	if (inp1->phi > inp2->phi+angle_eps)
45		return(1);
46	<	if (inp1->phi < inp2->phi-FTINY)
46	>	if (inp1->phi < inp2->phi-angle_eps)
47		return(-1);
48		return(0);
49		}
#	Line 111 | Line 114 | init_pabopto_inp(const int i, const char *fname)
114		static int
115		add_pabopto_inp(const int i)
116		{
117	<	FILE    *fp = fopen(inpfile[i].fname, "r");
118	<	double  theta_out, phi_out, val;
119	<	int     n, c;
117	>	static int      lastnew = -1;
118	>	FILE            *fp = fopen(inpfile[i].fname, "r");
119	>	double          theta_out, phi_out, val;
120	>	int             n, c;
121
122		if (fp == NULL || fseek(fp, inpfile[i].dstart, 0) == EOF) {
123		fputs(inpfile[i].fname, stderr);
#	Line 121 | Line 125 | add_pabopto_inp(const int i)
125		return(0);
126		}
127		/* prepare input grid */
128	<	if (!i || cmp_inang(&inpfile[i-1], &inpfile[i])) {
129	<	if (i)                  /* need to process previous incidence */
128	>	angle_eps = 180./2./GRIDRES;
129	>	if (lastnew < 0 || cmp_inang(&inpfile[lastnew], &inpfile[i])) {
130	>	if (lastnew >= 0)       /* need to process previous incidence */
131		make_rbfrep();
132		#ifdef DEBUG
133		fprintf(stderr, "New incident (theta,phi)=(%f,%f)\n",
134		inpfile[i].theta, inpfile[i].phi);
135		#endif
136		new_bsdf_data(inpfile[i].theta, inpfile[i].phi);
137	+	lastnew = i;
138		}
139		#ifdef DEBUG
140		fprintf(stderr, "Loading measurements from '%s'...\n", inpfile[i].fname);
#	Line 180 | Line 186 | main(int argc, char *argv[])
186		for (i = 0; i < ninpfiles; i++)
187		if (!init_pabopto_inp(i, argv[i+1]))
188		return(1);
189	+	angle_eps = 0;
190		qsort(inpfile, ninpfiles, sizeof(PGINPUT), &cmp_inang);
191		/* compile measurements */
192		for (i = 0; i < ninpfiles; i++)
#	Line 225 | Line 232 | main(int argc, char *argv[])
232		n = 0;
233		for (i = 0; i < GRIDRES; i++)
234		for (j = 0; j < GRIDRES; j++)
235	<	if (dsf_grid[i][j].nval > 0) {
235	>	if (dsf_grid[i][j].sum.n > 0) {
236		ovec_from_pos(dir, i, j);
237	<	bsdf = dsf_grid[i][j].vsum /
238	<	(dsf_grid[i][j].nval*output_orient*dir[2]);
237	>	bsdf = dsf_grid[i][j].sum.v /
238	>	(dsf_grid[i][j].sum.n*output_orient*dir[2]);
239		if (bsdf <= bsdf_min*.6)
240		continue;
241		bsdf = log(bsdf + 1e-5) - min_log;

Diff Legend

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