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.34 by greg, Tue Apr 23 17:18:18 2019 UTC vs.
Revision 2.43 by greg, Tue Jun 3 21:31:51 2025 UTC

#	Line 9 | Line 9 | static const char RCSid[] = "$Id$";
9		*/
10
11		#define _USE_MATH_DEFINES
12	–	#include <stdio.h>
12		#include <stdlib.h>
14	–	#include <string.h>
13		#include <ctype.h>
14		#include <math.h>
15	+	#include "rtio.h"
16		#include "platform.h"
17	+	#include "paths.h"
18		#include "bsdfrep.h"
19	–	#include "resolu.h"
20	–	/* global argv[0] */
21	–	char                    *progname;
19
20		typedef struct {
21		const char      *fname;         /* input file path */
#	Line 31 | Line 28 | typedef struct {
28		} PGINPUT;
29
30		PGINPUT         *inpfile;       /* input files sorted by incidence */
34	–	int             ninpfiles;      /* number of input files */
31
32		int             rev_orient = 0; /* shall we reverse surface orientation? */
33
34	+	double          lim_graze = 0;  /* limit scattering near grazing (deg above) */
35	+
36		/* Compare incident angles */
37		static int
38		cmp_indir(const void *p1, const void *p2)
#	Line 49 | Line 47 | cmp_indir(const void *p1, const void *p2)
47		return(inp1->igp[0] - inp2->igp[0]);
48		}
49
50	+	/* Assign grid position from theta and phi */
51	+	static void
52	+	set_grid_pos(PGINPUT *pip)
53	+	{
54	+	FVECT   dv;
55	+
56	+	if (pip->theta <= FTINY) {
57	+	pip->igp[0] = pip->igp[1] = grid_res/2 - 1;
58	+	return;
59	+	}
60	+	dv[2] = sin(M_PI/180.*pip->theta);
61	+	dv[0] = cos(M_PI/180.*pip->phi)*dv[2];
62	+	dv[1] = sin(M_PI/180.*pip->phi)*dv[2];
63	+	dv[2] = sqrt(1. - dv[2]*dv[2]);
64	+	pos_from_vec(pip->igp, dv);
65	+	}
66	+
67		/* Prepare a PAB-Opto input file by reading its header */
68		static int
69		init_pabopto_inp(const int i, const char *fname)
70		{
71		FILE    *fp = fopen(fname, "r");
57	–	FVECT   dv;
72		char    buf[2048];
73		int     c;
74
#	Line 124 | Line 138 | init_pabopto_inp(const int i, const char *fname)
138		/* convert to Y-up orientation */
139		inpfile[i].phi += 90.-inpfile[i].up_phi;
140		/* convert angle to grid position */
141	<	dv[2] = sin(M_PI/180.*inpfile[i].theta);
128	<	dv[0] = cos(M_PI/180.*inpfile[i].phi)*dv[2];
129	<	dv[1] = sin(M_PI/180.*inpfile[i].phi)*dv[2];
130	<	dv[2] = sqrt(1. - dv[2]*dv[2]);
131	<	if (inpfile[i].theta <= FTINY)
132	<	inpfile[i].igp[0] = inpfile[i].igp[1] = grid_res/2 - 1;
133	<	else
134	<	pos_from_vec(inpfile[i].igp, dv);
141	>	set_grid_pos(&inpfile[i]);
142		return(1);
143		}
144
#	Line 172 | Line 179 | add_pabopto_inp(const int i)
179		fclose(fp);
180		return(1);
181		}
182	<	if (rev_orient) {       /* reverse Z-axis to face outside */
182	>	/* check if scatter angle is too low */
183	>	if (fabs(theta_out - 90.) < lim_graze-FTINY)
184	>	continue;
185	>	if (rev_orient) {       /* reverse Z-axis to face outside? */
186		theta_out = 180. - theta_out;
187		phi_out = 360. - phi_out;
188		}
189	<	add_bsdf_data(theta_out, phi_out+90.-inpfile[i].up_phi,
190	<	val, inpfile[i].isDSF);
189	>	phi_out += 90.-inpfile[i].up_phi;
190	>	add_bsdf_data(theta_out, phi_out, val, inpfile[i].isDSF);
191		}
192		n = 0;
193		while ((c = getc(fp)) != EOF)
#	Line 191 | Line 201 | add_pabopto_inp(const int i)
201		}
202
203		#ifndef TEST_MAIN
204	+
205	+	#define SYM_ILL         '?'             /* illegal symmetry value */
206	+	#define SYM_ISO         'I'             /* isotropic */
207	+	#define SYM_QUAD        'Q'             /* quadrilateral symmetry */
208	+	#define SYM_BILAT       'B'             /* bilateral symmetry */
209	+	#define SYM_ANISO       'A'             /* anisotropic */
210	+	#define SYM_UP          'U'             /* "up-down" (180°) symmetry */
211	+
212	+	static const char       quadrant_rep[16][16] = {
213	+	"in-plane","0-90","90-180","0-180",
214	+	"180-270","0-90+180-270","90-270",
215	+	"0-270","270-360","270-90",
216	+	"90-180+270-360","270-180","180-360",
217	+	"180-90","90-360","0-360"
218	+	};
219	+	static const char       quadrant_sym[16] = {
220	+	SYM_ISO, SYM_QUAD, SYM_QUAD, SYM_BILAT,
221	+	SYM_QUAD, SYM_ILL, SYM_BILAT, SYM_ILL,
222	+	SYM_QUAD, SYM_BILAT, SYM_ILL, SYM_ILL,
223	+	SYM_BILAT, SYM_ILL, SYM_ILL, SYM_ANISO
224	+	};
225	+
226		/* Read in PAB-Opto BSDF files and output RBF interpolant */
227		int
228		main(int argc, char *argv[])
229		{
230	<	extern int              nprocs;
231	<	static const char       quadrant_rep[16][16] = {
232	<	"iso","0-90","90-180","0-180",
233	<	"180-270","0-90+180-270","90-270",
234	<	"0-270","270-360","270-90",
235	<	"90-180+270-360","270-180","180-360",
236	<	"0-90+180-360","90-360","0-360"
237	<	};
238	<	const char *            symmetry = "Unknown";
239	<	int                     i;
240	<	/* start header */
209	<	SET_FILE_BINARY(stdout);
210	<	newheader("RADIANCE", stdout);
211	<	printargs(argc, argv, stdout);
212	<	fputnow(stdout);
213	<	progname = argv[0];                     /* get options */
214	<	while (argc > 2 && argv[1][0] == '-') {
215	<	switch (argv[1][1]) {
230	>	extern int      nprocs;
231	>	static char     gval_buf[16];
232	>	char *          auto_grazing = NULL;
233	>	const char      *symmetry = "0";
234	>	int             ninpfiles, totinc;
235	>	int             a, i;
236	>	/* set global progname */
237	>	fixargv0(argv[0]);
238	>	/* get options */
239	>	for (a = 1; a < argc && argv[a][0] == '-'; a++)
240	>	switch (argv[a][1]) {
241		case 't':
242		rev_orient = !rev_orient;
243		break;
244		case 'n':
245	<	nprocs = atoi(argv[2]);
221	<	argv++; argc--;
245	>	nprocs = atoi(argv[++a]);
246		break;
247		case 's':
248	<	symmetry = argv[2];
225	<	argv++; argc--;
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		}
260	<	argv++; argc--;
231	<	}
232	<	/* initialize & sort inputs */
233	<	ninpfiles = argc - 1;
260	>	totinc = ninpfiles = argc - a;          /* initialize & sort inputs */
261		if (ninpfiles < 2)
262		goto userr;
263	<	inpfile = (PGINPUT *)malloc(sizeof(PGINPUT)*ninpfiles);
263	>	if (toupper(symmetry[0]) == SYM_UP)     /* special case for "up" symmetry */
264	>	totinc += ninpfiles;
265	>	inpfile = (PGINPUT *)malloc(sizeof(PGINPUT)*totinc);
266		if (inpfile == NULL)
267		return(1);
268	<	for (i = 0; i < ninpfiles; i++)
269	<	if (!init_pabopto_inp(i, argv[i+1]))
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	<	qsort(inpfile, ninpfiles, sizeof(PGINPUT), cmp_indir);
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, totinc, sizeof(PGINPUT), cmp_indir);
285		/* compile measurements */
286	<	for (i = 0; i < ninpfiles; i++)
286	>	for (i = 0; i < totinc; i++)
287		if (!add_pabopto_inp(i))
288		return(1);
289		make_rbfrep();                          /* process last data set */
290		/* check input symmetry */
291		switch (toupper(symmetry[0])) {
292	<	case 'U':                               /* unknown symmetry */
293	<	if ((inp_coverage == (INP_QUAD1|INP_QUAD3)) |
294	<	(inp_coverage == (INP_QUAD2|INP_QUAD4)) |
295	<	(inp_coverage == (INP_QUAD1|INP_QUAD2|INP_QUAD3)) |
296	<	(inp_coverage == (INP_QUAD2|INP_QUAD3|INP_QUAD4)) |
297	<	(inp_coverage == (INP_QUAD4|INP_QUAD1|INP_QUAD2)) |
298	<	(inp_coverage == (INP_QUAD1|INP_QUAD3|INP_QUAD4))) {
299	<	fprintf(stderr, "%s: unsupported phi coverage (%s)\n",
300	<	progname, quadrant_rep[inp_coverage]);
301	<	return(1);
302	<	}
303	<	break;
304	<	case 'I':                               /* isotropic */
305	<	if (inp_coverage)
306	<	goto badsymmetry;
307	<	break;
308	<	case 'Q':                               /* quadrilateral symmetry */
309	<	if ((inp_coverage != INP_QUAD1) &
310	<	(inp_coverage != INP_QUAD2) &
311	<	(inp_coverage != INP_QUAD3) &
270	<	(inp_coverage != INP_QUAD4))
271	<	goto badsymmetry;
272	<	break;
273	<	case 'B':                               /* bilateral symmetry */
274	<	if ((inp_coverage != (INP_QUAD1|INP_QUAD2)) &
275	<	(inp_coverage != (INP_QUAD2|INP_QUAD3)) &
276	<	(inp_coverage != (INP_QUAD3|INP_QUAD4)) &
277	<	(inp_coverage != (INP_QUAD4|INP_QUAD1)))
278	<	goto badsymmetry;
279	<	break;
280	<	case 'A':                               /* anisotropic */
281	<	if (inp_coverage != (INP_QUAD1|INP_QUAD2|INP_QUAD3|INP_QUAD4))
282	<	goto badsymmetry;
283	<	break;
292	>	case '0':                               /* unspecified symmetry */
293	>	if (quadrant_sym[inp_coverage] != SYM_ILL)
294	>	break;                  /* anything legal goes */
295	>	fprintf(stderr, "%s: unsupported phi coverage (%s)\n",
296	>	progname, quadrant_rep[inp_coverage]);
297	>	return(1);
298	>	case SYM_UP:                            /* faux "up" symmetry */
299	>	if (quadrant_sym[inp_coverage] == SYM_ANISO)
300	>	break;
301	>	/* fall through */
302	>	case SYM_ISO:                           /* usual symmetry types */
303	>	case SYM_QUAD:
304	>	case SYM_BILAT:
305	>	case SYM_ANISO:
306	>	if (quadrant_sym[inp_coverage] == toupper(symmetry[0]))
307	>	break;                  /* matches spec */
308	>	fprintf(stderr,
309	>	"%s: phi coverage (%s) does not match requested '%s' symmetry\n",
310	>	progname, quadrant_rep[inp_coverage], symmetry);
311	>	return(1);
312		default:
313		fprintf(stderr,
314	<	"%s: -s option must be Isotropic, Quadrilateral, Bilateral, or Anisotropic\n",
314	>	"%s: -s option must be Isotropic, Quadrilateral, Bilateral, Up, or Anisotropic\n",
315		progname);
316		return(1);
317		}
318		#ifdef DEBUG
319	<	fprintf(stderr, "Input phi coverage: %s\n", quadrant_rep[inp_coverage]);
319	>	fprintf(stderr, "Input phi coverage (%s) has '%c' symmetry\n",
320	>	quadrant_rep[inp_coverage],
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);
296	–	badsymmetry:
297	–	fprintf(stderr, "%s: phi coverage (%s) does not match requested '%s' symmetry\n",
298	–	progname, quadrant_rep[inp_coverage], symmetry);
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		}
335	<	#else
335	>
336	>	#else           /* TEST_MAIN */
337	>
338		/* Test main produces a Radiance model from the given input file */
339		int
340		main(int argc, char *argv[])
#	Line 318 | Line 351 | main(int argc, char *argv[])
351		fprintf(stderr, "Usage: %s input.dat > output.rad\n", progname);
352		return(1);
353		}
321	–	ninpfiles = 1;
354		inpfile = &pginp;
355		if (!init_pabopto_inp(0, argv[1]) || !add_pabopto_inp(0))
356		return(1);
#	Line 385 | Line 417 | main(int argc, char *argv[])
417		#endif
418		return(0);
419		}
420	<	#endif
420	>
421	>	#endif          /* TEST_MAIN */

Diff Legend

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