ViewVC Help

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

root/Development/ray/src/util/rfluxmtx.c

Comparing ray/src/util/rfluxmtx.c (file contents):
Revision 2.35 by greg, Fri Mar 4 00:21:21 2016 UTC vs.
Revision 2.65 by greg, Wed Oct 22 20:00:17 2025 UTC

#	Line 11 | Line 11 | static const char RCSid[] = "$Id$";
11		#include <stdlib.h>
12		#include "rtio.h"
13		#include "rtmath.h"
14	<	#include "paths.h"
14	>	#include "rtprocess.h"
15		#include "bsdf.h"
16		#include "bsdf_m.h"
17		#include "random.h"
18		#include "triangulate.h"
19		#include "platform.h"
20
21	<	#define MAXRCARG        512
21	>	#ifndef MAXRCARG
22	>	#define MAXRCARG        10000
23	>	#endif
24
25	<	char            *progname;              /* global argv[0] */
25	>	#define         NOWARN          1
26	>	#define         VERBO           2
27
28	<	int             verbose = 0;            /* verbose mode (< 0 no warnings) */
28	>	int             verbose = 0;            /* verbose/warning mode */
29
30		char            *rcarg[MAXRCARG+1] = {"rcontrib", "-fo+"};
31		int             nrcargs = 2;
#	Line 39 | Line 42 | char           *shirchiufn = "disk2square.cal";
42		char            *kfullfn = "klems_full.cal";
43		char            *khalffn = "klems_half.cal";
44		char            *kquarterfn = "klems_quarter.cal";
45	+	char            *ciefn = "cieskyscan.cal";
46
47		/* string indicating parameters */
48	<	const char      PARAMSTART[] = "@rfluxmtx";
48	>	#define PARAMSTART      "@rfluxmtx"
49
50		/* surface type IDs */
51		#define ST_NONE         0
#	Line 64 | Line 68 | typedef struct {
68		FVECT   uva[2];                 /* tangent axes */
69		int     ntris;                  /* number of triangles */
70		struct ptri {
71	<	float   afrac;                  /* fraction of total area */
71	>	double  afrac;                  /* fraction of total area */
72		short   vndx[3];                /* vertex indices */
73		}       tri[1];                 /* triangle array (extends struct) */
74		} POLYTRIS;                     /* triangulated polygon */
#	Line 106 | Line 110 | clear_params(PARAMS *p, int reset_only)
110		free(sdel);
111		}
112		if (reset_only) {
113	+	p->slist = NULL;
114		p->nsurfs = 0;
115		memset(p->nrm, 0, sizeof(FVECT));
116		memset(p->vup, 0, sizeof(FVECT));
#	Line 138 | Line 143 | oconv_command(int ac, char *av[])
143
144		if (ac-- <= 0)
145		return(NULL);
146	<	while (ac-- > 0) {
147	<	strcpy(cp, *av++);
148	<	while (*cp) cp++;
149	<	*cp++ = ' ';
150	<	if (cp >= oconvbuf+(sizeof(oconvbuf)-32))
146	>	if (verbose & NOWARN) { /* warnings off? */
147	>	strcpy(cp, "-w ");
148	>	cp += 3;
149	>	}
150	>	while (ac-- > 0) {      /* copy each argument */
151	>	int     len = strlen(*av);
152	>	if (cp+len+4 >= oconvbuf+sizeof(oconvbuf))
153		goto overrun;
154	+	if (matchany(*av, SPECIALS)) {
155	+	*cp++ = QUOTCHAR;
156	+	strcpy(cp, *av++);
157	+	cp += len;
158	+	*cp++ = QUOTCHAR;
159	+	} else {
160	+	strcpy(cp, *av++);
161	+	cp += len;
162	+	}
163	+	*cp++ = ' ';
164		}
165		/* receiver goes last */
166		if (matchany(recv, SPECIALS)) {
#	Line 164 | Line 181 | overrun:
181		exit(1);
182		}
183
184	+	#if defined(_WIN32) || defined(_WIN64)
185	+
186		/* Open a pipe to/from a command given as an argument list */
187		static FILE *
188		popen_arglist(char *av[], char *mode)
#	Line 175 | Line 194 | popen_arglist(char *av[], char *mode)
194		fputs(": command line too long in popen_arglist()\n", stderr);
195		return(NULL);
196		}
197	<	if (verbose > 0)
197	>	if (verbose & VERBO)
198		fprintf(stderr, "%s: opening pipe %s: %s\n",
199		progname, (*mode=='w') ? "to" : "from", cmd);
200		return(popen(cmd, mode));
201		}
202
203	<	#ifdef _WIN32
203	>	#define pclose_al       pclose
204	>
205		/* Execute system command (Windows version) */
206		static int
207		my_exec(char *av[])
#	Line 193 | Line 213 | my_exec(char *av[])
213		fputs(": command line too long in my_exec()\n", stderr);
214		return(1);
215		}
216	<	if (verbose > 0)
216	>	if (verbose & VERBO)
217		fprintf(stderr, "%s: running: %s\n", progname, cmd);
218		return(system(cmd));
219		}
220	<	#else
220	>
221	>	#else   /* UNIX */
222	>
223	>	static SUBPROC  rt_proc = SP_INACTIVE;  /* we only support one of these */
224	>
225	>	/* Open a pipe to a command using an argument list */
226	>	static FILE *
227	>	popen_arglist(char *av[], char *mode)
228	>	{
229	>	int     fd;
230	>
231	>	if (rt_proc.pid > 0) {
232	>	fprintf(stderr, "%s: only one i/o pipe at a time!\n", progname);
233	>	return(NULL);
234	>	}
235	>	if (verbose & VERBO) {
236	>	char    cmd[4096];
237	>	if (!convert_commandline(cmd, sizeof(cmd), av))
238	>	strcpy(cmd, "COMMAND TOO LONG TO SHOW");
239	>	fprintf(stderr, "%s: opening pipe %s: %s\n",
240	>	progname, (*mode=='w') ? "to" : "from", cmd);
241	>	}
242	>	if (*mode == 'w') {
243	>	fd = rt_proc.w = dup(fileno(stdout));
244	>	rt_proc.flags |= PF_FILT_OUT;
245	>	} else if (*mode == 'r') {
246	>	fd = rt_proc.r = dup(fileno(stdin));
247	>	rt_proc.flags |= PF_FILT_INP;
248	>	}
249	>	if (fd < 0 || open_process(&rt_proc, av) <= 0) {
250	>	perror(av[0]);
251	>	return(NULL);
252	>	}
253	>	return(fdopen(fd, mode));
254	>	}
255	>
256	>	/* Close command pipe (returns -1 on error to match pclose) */
257	>	static int
258	>	pclose_al(FILE *fp)
259	>	{
260	>	int     prob = (fclose(fp) == EOF);
261	>
262	>	if (rt_proc.pid <= 0)
263	>	return(-1);
264	>
265	>	prob |= (close_process(&rt_proc) != 0);
266	>
267	>	return(-prob);
268	>	}
269	>
270		/* Execute system command in our stead (Unix version) */
271		static int
272		my_exec(char *av[])
#	Line 208 | Line 277 | my_exec(char *av[])
277		fprintf(stderr, "%s: cannot locate %s\n", progname, av[0]);
278		return(1);
279		}
280	<	if (verbose > 0) {
280	>	if (verbose & VERBO) {
281		char    cmd[4096];
282		if (!convert_commandline(cmd, sizeof(cmd), av))
283		strcpy(cmd, "COMMAND TOO LONG TO SHOW");
#	Line 218 | Line 287 | my_exec(char *av[])
287		perror(compath);
288		return(1);
289		}
290	+
291		#endif
292
293		/* Get normalized direction vector from string specification */
#	Line 379 | Line 449 | finish_receiver(void)
449		curparams.vup[1] = 1;
450		}
451		/* determine sample type/bin */
452	<	if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1') {
453	<	sprintf(sbuf, "if(-Dx*%g-Dy*%g-Dz*%g,0,-1)",
454	<	curparams.nrm[0], curparams.nrm[1], curparams.nrm[2]);
455	<	binv = savqstr(sbuf);
452	>	if ((tolower(curparams.hemis[0]) == 'u') | (curparams.hemis[0] == '1')) {
453	>	if (curparams.slist->styp != ST_SOURCE) {
454	>	sprintf(sbuf, "if(-Dx*%g-Dy*%g-Dz*%g,0,-1)",
455	>	curparams.nrm[0], curparams.nrm[1], curparams.nrm[2]);
456	>	binv = savqstr(sbuf);
457	>	} else
458	>	binv = "0";
459		nbins = "1";            /* uniform sampling -- one bin */
460		uniform = 1;
461		} else if (tolower(curparams.hemis[0]) == 's' &&
#	Line 432 | Line 505 | finish_receiver(void)
505		calfn = kquarterfn; kquarterfn = NULL;
506		binf = "kqbin";
507		nbins = "Nkqbins";
508	+	} else if (!strcasecmp(curparams.hemis, "cie")) {
509	+	calfn = ciefn; ciefn = NULL;
510	+	sprintf(sbuf, "rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g,RHS=%c1",
511	+	curparams.nrm[0], curparams.nrm[1], curparams.nrm[2],
512	+	curparams.vup[0], curparams.vup[1], curparams.vup[2],
513	+	curparams.sign);
514	+	params = savqstr(sbuf);
515	+	binv = "cbin";
516	+	nbins = "Ncbins";
517		} else {
518		fprintf(stderr, "%s: unrecognized hemisphere sampling: h=%s\n",
519		progname, curparams.hemis);
#	Line 441 | Line 523 | finish_receiver(void)
523		sprintf(sbuf, "RHS=%c1", curparams.sign);
524		params = savqstr(sbuf);
525		}
526	<	if (!uniform & (curparams.slist->styp == ST_SOURCE)) {
526	>	if (!uniform) {
527		SURF    *sp;
528		for (sp = curparams.slist; sp != NULL; sp = sp->next)
529	<	if (fabs(sp->area - PI) > 1e-3) {
529	>	if (sp->styp == ST_SOURCE && fabs(sp->area - PI) > 1e-3) {
530		fprintf(stderr, "%s: source '%s' must be 180-degrees\n",
531		progname, sp->sname);
532		exit(1);
#	Line 602 | Line 684 | ssamp_poly(FVECT orig, SURF *sp, double x)
684		sp->priv = (void *)ptp;
685		}
686		/* pick triangle by partial area */
687	<	for (i = 0; i < ptp->ntris && x > ptp->tri[i].afrac; i++)
687	>	for (i = 0; i < ptp->ntris-1 && x > ptp->tri[i].afrac; i++)
688		x -= ptp->tri[i].afrac;
689		SDmultiSamp(samp2, 2, x/ptp->tri[i].afrac);
690		samp2[0] *= samp2[1] = sqrt(samp2[1]);
#	Line 643 | Line 725 | sample_origin(PARAMS *p, FVECT orig, const FVECT rdir,
725		if (p->nsurfs > nall) {         /* (re)allocate surface area cache */
726		if (projsa) free(projsa);
727		projsa = (double *)malloc(sizeof(double)*p->nsurfs);
728	<	if (!projsa) return(0);
728	>	if (projsa == NULL) {
729	>	fputs(progname, stderr);
730	>	fputs(": out of memory in sample_origin!\n", stderr);
731	>	exit(1);
732	>	}
733		nall = p->nsurfs;
734		}
735		/* compute projected areas */
736		for (i = 0, sp = p->slist; sp != NULL; i++, sp = sp->next) {
737		projsa[i] = -DOT(sp->snrm, rdir) * sp->area;
738	<	tarea += projsa[i] *= (double)(projsa[i] > FTINY);
738	>	tarea += projsa[i] *= (double)(projsa[i] > 0);
739		}
740	<	if (tarea <= FTINY) {           /* wrong side of sender? */
740	>	if (tarea < FTINY*FTINY) {      /* wrong side of sender? */
741		fputs(progname, stderr);
742		fputs(": internal - sample behind all sender elements!\n",
743		stderr);
#	Line 669 | Line 755 | sample_uniform(PARAMS *p, int b, FILE *fp)
755		{
756		int     n = sampcnt;
757		double  samp3[3];
758	<	double  duvw[3];
673	<	FVECT   orig_dir[2];
758	>	FVECT   duvw, orig_dir[2];
759		int     i;
760
761		if (fp == NULL)                 /* just requesting number of bins? */
#	Line 678 | Line 763 | sample_uniform(PARAMS *p, int b, FILE *fp)
763
764		while (n--) {                   /* stratified hemisphere sampling */
765		SDmultiSamp(samp3, 3, (n+frandom())/sampcnt);
766	<	SDsquare2disk(duvw, samp3[1], samp3[2]);
766	>	square2disk(duvw, samp3[1], samp3[2]);
767		duvw[2] = -sqrt(1. - duvw[0]*duvw[0] - duvw[1]*duvw[1]);
768		for (i = 3; i--; )
769		orig_dir[1][i] = duvw[0]*p->udir[i] +
#	Line 686 | Line 771 | sample_uniform(PARAMS *p, int b, FILE *fp)
771		duvw[2]*p->nrm[i] ;
772		if (!sample_origin(p, orig_dir[0], orig_dir[1], samp3[0]))
773		return(0);
774	<	if (fwrite(orig_dir, sizeof(FVECT), 2, fp) != 2)
774	>	if (putbinary(orig_dir, sizeof(FVECT), 2, fp) != 2)
775		return(0);
776		}
777		return(1);
#	Line 698 | Line 783 | sample_shirchiu(PARAMS *p, int b, FILE *fp)
783		{
784		int     n = sampcnt;
785		double  samp3[3];
786	<	double  duvw[3];
702	<	FVECT   orig_dir[2];
786	>	FVECT   duvw, orig_dir[2];
787		int     i;
788
789		if (fp == NULL)                 /* just requesting number of bins? */
#	Line 707 | Line 791 | sample_shirchiu(PARAMS *p, int b, FILE *fp)
791
792		while (n--) {                   /* stratified sampling */
793		SDmultiSamp(samp3, 3, (n+frandom())/sampcnt);
794	<	SDsquare2disk(duvw, (b/p->hsiz + samp3[1])/curparams.hsiz,
794	>	square2disk(duvw, (b/p->hsiz + samp3[1])/curparams.hsiz,
795		(b%p->hsiz + samp3[2])/curparams.hsiz);
796		duvw[2] = sqrt(1. - duvw[0]*duvw[0] - duvw[1]*duvw[1]);
797		for (i = 3; i--; )
#	Line 716 | Line 800 | sample_shirchiu(PARAMS *p, int b, FILE *fp)
800		duvw[2]*p->nrm[i] ;
801		if (!sample_origin(p, orig_dir[0], orig_dir[1], samp3[0]))
802		return(0);
803	<	if (fwrite(orig_dir, sizeof(FVECT), 2, fp) != 2)
803	>	if (putbinary(orig_dir, sizeof(FVECT), 2, fp) != 2)
804		return(0);
805		}
806		return(1);
#	Line 752 | Line 836 | sample_reinhart(PARAMS *p, int b, FILE *fp)
836		}
837		while (n--) {                   /* stratified sampling */
838		SDmultiSamp(samp3, 3, (n+frandom())/sampcnt);
839	+	if (row >= RowMax-1)    /* avoid crowding at zenith */
840	+	samp3[1] *= samp3[1];
841		alt = (row+samp3[1])*RAH;
842		azi = (2.*PI)*(col+samp3[2]-.5)/rnaz(row);
843		duvw[2] = cos(alt);     /* measured from horizon */
844		duvw[0] = tsin(azi)*duvw[2];
845	<	duvw[1] = tcos(azi)*duvw[2];
845	>	duvw[1] = -tcos(azi)*duvw[2];
846		duvw[2] = sqrt(1. - duvw[2]*duvw[2]);
847		for (i = 3; i--; )
848		orig_dir[1][i] = -duvw[0]*p->udir[i] -
#	Line 764 | Line 850 | sample_reinhart(PARAMS *p, int b, FILE *fp)
850		duvw[2]*p->nrm[i] ;
851		if (!sample_origin(p, orig_dir[0], orig_dir[1], samp3[0]))
852		return(0);
853	<	if (fwrite(orig_dir, sizeof(FVECT), 2, fp) != 2)
853	>	if (putbinary(orig_dir, sizeof(FVECT), 2, fp) != 2)
854		return(0);
855		}
856		return(1);
#	Line 815 | Line 901 | sample_klems(PARAMS *p, int b, FILE *fp)
901		duvw[2]*p->nrm[i] ;
902		if (!sample_origin(p, orig_dir[0], orig_dir[1], samp2[0]))
903		return(0);
904	<	if (fwrite(orig_dir, sizeof(FVECT), 2, fp) != 2)
904	>	if (putbinary(orig_dir, sizeof(FVECT), 2, fp) != 2)
905		return(0);
906		}
907		return(1);
#	Line 823 | Line 909 | sample_klems(PARAMS *p, int b, FILE *fp)
909
910		/* Prepare hemisphere basis sampler that will send rays to rcontrib */
911		static int
912	<	prepare_sampler(void)
912	>	prepare_sampler(PARAMS *p)
913		{
914	<	if (curparams.slist == NULL) {  /* missing sample surface! */
914	>	if (p->slist == NULL) { /* missing sample surface! */
915		fputs(progname, stderr);
916		fputs(": no sender surface!\n", stderr);
917		return(-1);
918		}
919		/* misplaced output file spec. */
920	<	if ((curparams.outfn != NULL) & (verbose >= 0))
920	>	if ((p->outfn != NULL) & !(verbose & NOWARN))
921		fprintf(stderr, "%s: warning - ignoring output file in sender ('%s')\n",
922	<	progname, curparams.outfn);
922	>	progname, p->outfn);
923		/* check/set basis hemisphere */
924	<	if (!curparams.hemis[0]) {
924	>	if (!p->hemis[0]) {
925		fputs(progname, stderr);
926		fputs(": missing sender sampling type!\n", stderr);
927		return(-1);
928		}
929	<	if (normalize(curparams.nrm) == 0) {
929	>	if (normalize(p->nrm) == 0) {
930		fputs(progname, stderr);
931		fputs(": undefined normal for sender sampling\n", stderr);
932		return(-1);
933		}
934	<	if (normalize(curparams.vup) == 0) {
935	<	if (fabs(curparams.nrm[2]) < .7)
936	<	curparams.vup[2] = 1;
934	>	if (normalize(p->vup) == 0) {
935	>	if (fabs(p->nrm[2]) < .7)
936	>	p->vup[2] = 1;
937		else
938	<	curparams.vup[1] = 1;
938	>	p->vup[1] = 1;
939		}
940	<	fcross(curparams.udir, curparams.vup, curparams.nrm);
941	<	if (normalize(curparams.udir) == 0) {
940	>	fcross(p->udir, p->vup, p->nrm);
941	>	if (normalize(p->udir) == 0) {
942		fputs(progname, stderr);
943		fputs(": up vector coincides with sender normal\n", stderr);
944		return(-1);
945		}
946	<	fcross(curparams.vdir, curparams.nrm, curparams.udir);
947	<	if (curparams.sign == '-') {    /* left-handed coordinate system? */
948	<	curparams.udir[0] *= -1.;
949	<	curparams.udir[1] *= -1.;
950	<	curparams.udir[2] *= -1.;
946	>	fcross(p->vdir, p->nrm, p->udir);
947	>	if (p->sign == '-') {   /* left-handed coordinate system? */
948	>	p->udir[0] *= -1.;
949	>	p->udir[1] *= -1.;
950	>	p->udir[2] *= -1.;
951		}
952	<	if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1')
953	<	curparams.sample_basis = sample_uniform;
954	<	else if (tolower(curparams.hemis[0]) == 's' &&
955	<	tolower(curparams.hemis[1]) == 'c')
956	<	curparams.sample_basis = sample_shirchiu;
957	<	else if ((tolower(curparams.hemis[0]) == 'r') |
958	<	(tolower(curparams.hemis[0]) == 't'))
959	<	curparams.sample_basis = sample_reinhart;
960	<	else if (tolower(curparams.hemis[0]) == 'k') {
961	<	switch (curparams.hemis[1]) {
952	>	if ((tolower(p->hemis[0]) == 'u') | (p->hemis[0] == '1'))
953	>	p->sample_basis = sample_uniform;
954	>	else if (tolower(p->hemis[0]) == 's' &&
955	>	tolower(p->hemis[1]) == 'c')
956	>	p->sample_basis = sample_shirchiu;
957	>	else if ((tolower(p->hemis[0]) == 'r') |
958	>	(tolower(p->hemis[0]) == 't'))
959	>	p->sample_basis = sample_reinhart;
960	>	else if (tolower(p->hemis[0]) == 'k') {
961	>	switch (p->hemis[1]) {
962		case '1':
963		case '2':
964		case '4':
#	Line 880 | Line 966 | prepare_sampler(void)
966		case 'f':
967		case 'F':
968		case '\0':
969	<	curparams.hemis[1] = '1';
969	>	p->hemis[1] = '1';
970		break;
971		case 'h':
972		case 'H':
973	<	curparams.hemis[1] = '2';
973	>	p->hemis[1] = '2';
974		break;
975		case 'q':
976		case 'Q':
977	<	curparams.hemis[1] = '4';
977	>	p->hemis[1] = '4';
978		break;
979		default:
980		goto unrecognized;
981		}
982	<	curparams.hemis[2] = '\0';
983	<	curparams.sample_basis = sample_klems;
982	>	p->hemis[2] = '\0';
983	>	p->sample_basis = sample_klems;
984		} else
985		goto unrecognized;
986		/* return number of bins */
987	<	return((*curparams.sample_basis)(&curparams,0,NULL));
987	>	return((*p->sample_basis)(p,0,NULL));
988		unrecognized:
989		fprintf(stderr, "%s: unrecognized sender sampling: h=%s\n",
990	<	progname, curparams.hemis);
990	>	progname, p->hemis);
991		return(-1);
992		}
993
#	Line 924 | Line 1010 | finish_polygon(SURF *p)
1010		VCOPY(e1, e2);
1011		}
1012		p->area = normalize(p->snrm)*0.5;
1013	<	return(p->area > FTINY);
1013	>	return(p->area > FTINY*FTINY);
1014		}
1015
1016		/* Add a surface to our current parameters */
#	Line 942 | Line 1028 | add_surface(int st, const char *oname, FILE *fp)
1028		snew = (SURF *)malloc(sizeof(SURF) + sizeof(double)*(n-1));
1029		if (snew == NULL) {
1030		fputs(progname, stderr);
1031	<	fputs(": out of memory!\n", stderr);
1031	>	fputs(": out of memory in add_surface!\n", stderr);
1032		exit(1);
1033		}
1034		strncpy(snew->sname, oname, sizeof(snew->sname)-1);
#	Line 987 | Line 1073 | add_surface(int st, const char *oname, FILE *fp)
1073		snew->area *= PI*snew->area;
1074		break;
1075		}
1076	<	if ((snew->area <= FTINY) & (verbose >= 0)) {
1076	>	if ((snew->area <= FTINY*FTINY) & !(verbose & NOWARN)) {
1077		fprintf(stderr, "%s: warning - zero area for surface '%s'\n",
1078		progname, oname);
1079		free(snew);
#	Line 1024 | Line 1110 | add_recv_object(FILE *fp)
1110		}
1111		/* is it a new receiver? */
1112		if ((st = surf_type(otype)) != ST_NONE) {
1027	–	if (curparams.slist != NULL && (st == ST_SOURCE) ^
1028	–	(curparams.slist->styp == ST_SOURCE)) {
1029	–	fputs(progname, stderr);
1030	–	fputs(": cannot mix source/non-source receivers!\n", stderr);
1031	–	return(-1);
1032	–	}
1113		if (strcmp(thismod, curmod)) {
1114		if (curmod[0]) {        /* output last receiver? */
1115		finish_receiver();
#	Line 1165 | Line 1245 | main(int argc, char *argv[])
1245		FILE    *rcfp;
1246		int     nsbins;
1247		int     a, i;
1248	+	/* set global progname */
1249	+	fixargv0(argv[0]);
1250		/* screen rcontrib options */
1169	–	progname = argv[0];
1251		for (a = 1; a < argc-2; a++) {
1252		int     na;
1253		/* check for argument expansion */
#	Line 1182 | Line 1263 | main(int argc, char *argv[])
1263		na = 1;
1264		switch (argv[a][1]) {   /* !! Keep consistent !! */
1265		case 'v':               /* verbose mode */
1266	<	verbose = 1;
1266	>	verbose ^= VERBO;
1267		na = 0;
1268		continue;
1269		case 'f':               /* special case for -fo, -ff, etc. */
#	Line 1212 | Line 1293 | main(int argc, char *argv[])
1293		yrs = argv[++a];
1294		na = 0;
1295		continue;
1296	<	case 'c':               /* number of samples */
1297	<	sampcnt = atoi(argv[++a]);
1298	<	if (sampcnt <= 0)
1299	<	goto userr;
1300	<	na = 0;         /* we re-add this later */
1301	<	continue;
1296	>	case 'c':               /* spectral sampling or count */
1297	>	switch (argv[a][2]) {
1298	>	case 's':
1299	>	na = 2;
1300	>	break;
1301	>	case 'w':
1302	>	na = 3;
1303	>	break;
1304	>	case '\0':
1305	>	sampcnt = atoi(argv[++a]);
1306	>	if (sampcnt <= 0)
1307	>	goto userr;
1308	>	na = 0;         /* we re-add this later */
1309	>	continue;
1310	>	}
1311	>	break;
1312		case 'I':               /* only for pass-through mode */
1313		case 'i':
1314		iropt = argv[a];
1315		na = 0;
1316		continue;
1317		case 'w':               /* options without arguments */
1318	<	if (argv[a][2] != '+') verbose = -1;
1318	>	if (!argv[a][2])
1319	>	verbose ^= NOWARN;
1320	>	else if (strchr("+1tTyY", argv[a][2]) != NULL)
1321	>	verbose &= ~NOWARN;
1322	>	else
1323	>	verbose |= NOWARN;
1324	>	break;
1325		case 'V':
1326		case 'u':
1327		case 'h':
#	Line 1233 | Line 1330 | main(int argc, char *argv[])
1330		case 'n':               /* options with 1 argument */
1331		case 's':
1332		case 'o':
1333	+	case 't':
1334		na = 2;
1335		break;
1336		case 'b':               /* special case */
#	Line 1301 | Line 1399 | main(int argc, char *argv[])
1399		fputs(": -i, -I supported for pass-through only\n", stderr);
1400		return(1);
1401		}
1402	<	fmtopt[2] = (sizeof(RREAL)==sizeof(double)) ? 'd' : 'f';
1402	>	#ifdef SMLFLT
1403	>	fmtopt[2] = 'f';
1404	>	#else
1405	>	fmtopt[2] = 'd';
1406	>	#endif
1407		if (sampcnt <= 0) sampcnt = 10000;
1408		}
1409		sprintf(sampcntbuf, "%d", sampcnt);
#	Line 1323 | Line 1425 | main(int argc, char *argv[])
1425		curmod[0] = '\0';
1426		if (load_scene(sendfn, add_send_object) < 0)
1427		return(1);
1428	<	if ((nsbins = prepare_sampler()) <= 0)
1428	>	if ((nsbins = prepare_sampler(&curparams)) <= 0)
1429		return(1);
1430		CHECKARGC(3);                   /* add row count and octree */
1431		rcarg[nrcargs++] = "-y";
#	Line 1338 | Line 1440 | main(int argc, char *argv[])
1440		#ifdef getc_unlocked
1441		flockfile(rcfp);
1442		#endif
1443	<	if (verbose > 0) {
1443	>	if (verbose & VERBO) {
1444		fprintf(stderr, "%s: sampling %d directions", progname, nsbins);
1445		if (curparams.nsurfs > 1)
1446		fprintf(stderr, " (%d elements)\n", curparams.nsurfs);
#	Line 1348 | Line 1450 | main(int argc, char *argv[])
1450		for (i = 0; i < nsbins; i++)    /* send rcontrib ray samples */
1451		if (!(*curparams.sample_basis)(&curparams, i, rcfp))
1452		return(1);
1453	<	return(pclose(rcfp) < 0);       /* all finished! */
1453	>	return(pclose_al(rcfp) < 0);    /* all finished! */
1454		userr:
1455		if (a < argc-2)
1456	<	fprintf(stderr, "%s: unsupported option '%s'", progname, argv[a]);
1456	>	fprintf(stderr, "%s: unsupported option '%s'\n", progname, argv[a]);
1457		fprintf(stderr, "Usage: %s [-v][rcontrib options] sender.rad receiver.rad [-i system.oct] [system.rad ..]\n",
1458		progname);
1459		return(1);

Diff Legend

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