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.37 by greg, Mon Feb 15 23:20:22 2021 UTC vs.
Revision 2.41 by greg, Mon Apr 5 21:06:32 2021 UTC

#	Line 32 | Line 32 | PGINPUT                *inpfile;       /* input files sorted by incidence
32
33		int             rev_orient = 0; /* shall we reverse surface orientation? */
34
35	+	double          lim_graze = 0;  /* limit scattering near grazing (deg above) */
36	+
37		/* Compare incident angles */
38		static int
39		cmp_indir(const void *p1, const void *p2)
#	Line 178 | Line 180 | add_pabopto_inp(const int i)
180		fclose(fp);
181		return(1);
182		}
183	<	if (rev_orient) {       /* reverse Z-axis to face outside */
183	>	/* check if scatter angle is too low */
184	>	if (fabs(theta_out - 90.) < lim_graze-FTINY)
185	>	continue;
186	>	if (rev_orient) {       /* reverse Z-axis to face outside? */
187		theta_out = 180. - theta_out;
188		phi_out = 360. - phi_out;
189		}
#	Line 224 | Line 229 | int
229		main(int argc, char *argv[])
230		{
231		extern int      nprocs;
232	+	static char     gval_buf[16];
233	+	char *          auto_grazing = NULL;
234		const char      *symmetry = "0";
235		int             ninpfiles, totinc;
236		int             a, i;
237	<	/* start header */
231	<	SET_FILE_BINARY(stdout);
232	<	newheader("RADIANCE", stdout);
233	<	printargs(argc, argv, stdout);
234	<	fputnow(stdout);
237	>
238		progname = argv[0];                     /* get options */
239		for (a = 1; a < argc && argv[a][0] == '-'; a++)
240		switch (argv[a][1]) {
#	Line 244 | Line 247 | main(int argc, char *argv[])
247		case 's':
248		symmetry = argv[++a];
249		break;
250	+	case 'g':
251	+	if (toupper(argv[a+1][0]) == 'A')
252	+	auto_grazing = argv[a+1] = gval_buf;
253	+	else
254	+	lim_graze = atof(argv[a+1]);
255	+	++a;
256	+	break;
257		default:
258		goto userr;
259		}
#	Line 255 | Line 265 | main(int argc, char *argv[])
265		inpfile = (PGINPUT *)malloc(sizeof(PGINPUT)*totinc);
266		if (inpfile == NULL)
267		return(1);
268	<	for (i = 0; i < ninpfiles; i++)
268	>	if (auto_grazing)
269	>	lim_graze = 90.;
270	>	for (i = 0; i < ninpfiles; i++) {
271		if (!init_pabopto_inp(i, argv[a+i]))
272		return(1);
273	<
273	>	if (auto_grazing && fabs(inpfile[i].theta - 90.) < lim_graze)
274	>	lim_graze = fabs(inpfile[i].theta - 90.);
275	>	}
276	>	if (auto_grazing)
277	>	sprintf(auto_grazing, "%.2f", lim_graze);
278		for (i = ninpfiles; i < totinc; i++) {  /* copy for "up" symmetry */
279		inpfile[i] = inpfile[i-ninpfiles];
280		inpfile[i].phi += 180.;         /* invert duplicate data */
281		inpfile[i].up_phi -= 180.;
282		set_grid_pos(&inpfile[i]);      /* grid location for sorting */
283		}
284	<	qsort(inpfile, ninpfiles, sizeof(PGINPUT), cmp_indir);
284	>	qsort(inpfile, totinc, sizeof(PGINPUT), cmp_indir);
285		/* compile measurements */
286		for (i = 0; i < totinc; i++)
287		if (!add_pabopto_inp(i))
#	Line 305 | Line 321 | main(int argc, char *argv[])
321		quadrant_sym[inp_coverage]);
322		#endif
323		build_mesh();                           /* create interpolation */
324	<	save_bsdf_rep(stdout);                  /* write it out */
324	>	SET_FILE_BINARY(stdout);                /* start header */
325	>	newheader("RADIANCE", stdout);
326	>	printargs(argc, argv, stdout);
327	>	fputnow(stdout);
328	>	save_bsdf_rep(stdout);                  /* complete header + data */
329		return(0);
330		userr:
331	<	fprintf(stderr, "Usage: %s [-t][-n nproc][-s symmetry] meas1.dat meas2.dat .. > bsdf.sir\n",
331	>	fprintf(stderr, "Usage: %s [-t][-n nproc][-s symmetry][-g angle|'A'] meas1.dat meas2.dat .. > bsdf.sir\n",
332		progname);
333		return(1);
334		}

Diff Legend

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