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.32 by greg, Tue Apr 9 22:15:51 2019 UTC vs.
Revision 2.33 by greg, Tue Apr 23 17:00:40 2019 UTC

#	Line 195 | Line 195 | add_pabopto_inp(const int i)
195		int
196		main(int argc, char *argv[])
197		{
198	<	extern int      nprocs;
199	<	int             i;
198	>	extern int              nprocs;
199	>	static const char       quadrant_rep[16][16] = {
200	>	"iso","0-90","90-180","0-180",
201	>	"180-270","0-90+180-270","90-270",
202	>	"0-270","270-360","270-90",
203	>	"90-180+270-360","270-180","180-360",
204	>	"0-90+180-360","90-360","0-360"
205	>	};
206	>	const char *            symmetry = "Unknown";
207	>	int                     i;
208		/* start header */
209		SET_FILE_BINARY(stdout);
210		newheader("RADIANCE", stdout);
#	Line 212 | Line 220 | main(int argc, char *argv[])
220		nprocs = atoi(argv[2]);
221		argv++; argc--;
222		break;
223	+	case 's':
224	+	symmetry = argv[2];
225	+	argv++; argc--;
226	+	break;
227		default:
228		goto userr;
229		}
#	Line 233 | Line 245 | main(int argc, char *argv[])
245		if (!add_pabopto_inp(i))
246		return(1);
247		make_rbfrep();                          /* process last data set */
248	+	/* check input symmetry */
249	+	switch (toupper(symmetry[0])) {
250	+	case 'U':                               /* unknown symmetry */
251	+	if ((inp_coverage == (INP_QUAD1|INP_QUAD3)) |
252	+	(inp_coverage == (INP_QUAD2|INP_QUAD4))) {
253	+	fprintf(stderr,
254	+	"%s: unsupported bowtie (%s) input symmetry\n",
255	+	progname, quadrant_rep[inp_coverage]);
256	+	return(1);
257	+	}
258	+	break;
259	+	case 'I':                               /* isotropic */
260	+	if (inp_coverage)
261	+	goto badsymmetry;
262	+	break;
263	+	case 'Q':                               /* quadrilateral symmetry */
264	+	if ((inp_coverage != INP_QUAD1) &
265	+	(inp_coverage != INP_QUAD2) &
266	+	(inp_coverage != INP_QUAD3) &
267	+	(inp_coverage != INP_QUAD4))
268	+	goto badsymmetry;
269	+	break;
270	+	case 'B':                               /* bilateral symmetry */
271	+	if ((inp_coverage != (INP_QUAD1|INP_QUAD2)) &
272	+	(inp_coverage != (INP_QUAD2|INP_QUAD3)) &
273	+	(inp_coverage != (INP_QUAD3|INP_QUAD4)) &
274	+	(inp_coverage != (INP_QUAD4|INP_QUAD1)))
275	+	goto badsymmetry;
276	+	break;
277	+	case 'A':                               /* anisotropic */
278	+	if (inp_coverage != (INP_QUAD1|INP_QUAD2|INP_QUAD3|INP_QUAD4))
279	+	goto badsymmetry;
280	+	break;
281	+	default:
282	+	fprintf(stderr,
283	+	"%s: -s option must be Isotropic, Quadrilateral, Bilateral, or Anisotropic\n",
284	+	progname);
285	+	return(1);
286	+	}
287	+	#ifdef DEBUG
288	+	fprintf(stderr, "Input phi coverage: %s\n", quadrant_rep[inp_coverage]);
289	+	#endif
290		build_mesh();                           /* create interpolation */
291		save_bsdf_rep(stdout);                  /* write it out */
292		return(0);
293	+	badsymmetry:
294	+	fprintf(stderr, "%s: phi coverage (%s) does not match requested '%s' symmetry\n",
295	+	progname, quadrant_rep[inp_coverage], symmetry);
296		userr:
297	<	fprintf(stderr, "Usage: %s [-t][-n nproc] meas1.dat meas2.dat .. > bsdf.sir\n",
297	>	fprintf(stderr, "Usage: %s [-t][-n nproc][-s symmetry] meas1.dat meas2.dat .. > bsdf.sir\n",
298		progname);
299		return(1);
300		}

Diff Legend

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