--- ray/src/cv/bsdf2rad.c	2017/04/10 06:09:14	2.20
+++ ray/src/cv/bsdf2rad.c	2017/04/12 03:35:01	2.26
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdf2rad.c,v 2.20 2017/04/10 06:09:14 greg Exp $";
+static const char RCSid[] = "$Id: bsdf2rad.c,v 2.26 2017/04/12 03:35:01 greg Exp $";
 #endif
 /*
  *  Plot 3-D BSDF output based on scattering interpolant or XML representation
@@ -26,15 +26,14 @@ double	overall_max = .0;		/* overall maximum BSDF valu
 
 char	ourTempDir[TEMPLEN] = "";	/* our temporary directory */
 
-const FVECT	Yaxis = {0., 1., 0.};
-
-const char	frpref[] = "frefl";
-const char	ftpref[] = "ftrans";
-const char	brpref[] = "brefl";
-const char	btpref[] = "btrans";
+const char	frpref[] = "rf";
+const char	ftpref[] = "tf";
+const char	brpref[] = "rb";
+const char	btpref[] = "tb";
 const char	dsuffix[] = ".txt";
 
-const char	sph_mat[] = "BSDFmat";
+const char	sph_fmat[] = "fBSDFmat";
+const char	sph_bmat[] = "bBSDFmat";
 const double	sph_rad = 10.;
 const double	sph_xoffset = 15.;
 
@@ -271,19 +270,17 @@ build_wRBF(void)
 
 /* Put out mirror arrow for the given incident vector */
 static void
-put_mirror_arrow(const FVECT ivec, int inc_side)
+put_mirror_arrow(const FVECT origin, const FVECT nrm)
 {
 	const double	arrow_len = 1.2*bsdf_rad;
 	const double	tip_len = 0.2*bsdf_rad;
-	FVECT		origin, refl;
+	FVECT		refl;
 	int		i;
 
-	cvt_sposition(origin, ivec, inc_side);
+	refl[0] = 2.*nrm[2]*nrm[0];
+	refl[1] = 2.*nrm[2]*nrm[1];
+	refl[2] = 2.*nrm[2]*nrm[2] - 1.;
 
-	refl[0] = -2.*ivec[2]*ivec[0];
-	refl[1] = -2.*ivec[2]*ivec[1];
-	refl[2] = 2.*ivec[2]*ivec[2] - 1.;
-
 	printf("\n# Mirror arrow\n");
 	printf("\narrow_mat cylinder inc_dir\n0\n0\n7");
 	printf("\n\t%f %f %f\n\t%f %f %f\n\t%f\n",
@@ -310,15 +307,12 @@ put_mirror_arrow(const FVECT ivec, int inc_side)
 
 /* Put out transmitted direction arrow for the given incident vector */
 static void
-put_trans_arrow(const FVECT ivec, int inc_side)
+put_trans_arrow(const FVECT origin)
 {
 	const double	arrow_len = 1.2*bsdf_rad;
 	const double	tip_len = 0.2*bsdf_rad;
-	FVECT		origin;
 	int		i;
 
-	cvt_sposition(origin, ivec, inc_side);
-
 	printf("\n# Transmission arrow\n");
 	printf("\narrow_mat cylinder trans_dir\n0\n0\n7");
 	printf("\n\t%f %f %f\n\t%f %f %f\n\t%f\n",
@@ -373,120 +367,86 @@ static int
 put_BSDFs(void)
 {
 	const double	scalef = bsdf_rad/(log10(overall_max) - min_log10);
-	FVECT		ivec, sorg;
+	FVECT		ivec, sorg, nrm, upv;
 	RREAL		vMtx[3][3];
 	char		*fname;
 	char		cmdbuf[256];
-	char		xfargs[128];
-	int		nxfa;
+	char		rotargs[64];
+	int		nrota;
 	int		i;
 
 	printf("\n# Gensurf output corresponding to %d incident directions\n",
 			NINCIDENT);
 
 	printf("\nvoid glow arrow_glow\n0\n0\n4 1 0 1 0\n");
-	printf("\nvoid mixfunc arrow_mat\n4 arrow_glow void 0.5 .\n0\n0\n");
+	printf("\nvoid mixfunc arrow_mat\n4 arrow_glow void 0.25 .\n0\n0\n");
 
-	if (front_comp & SDsampR)			/* front reflection */
-		for (i = 0; i < NINCIDENT; i++) {
-			get_ivector(ivec, i);
-			put_mirror_arrow(ivec, 1);
+	for (i = 0; i < NINCIDENT; i++) {
+		get_ivector(ivec, i);
+		nrm[0] = -ivec[0]; nrm[1] = -ivec[1]; nrm[2] = ivec[2];
+		upv[0] = nrm[0]*nrm[1]*(nrm[2] - 1.);
+		upv[1] = nrm[0]*nrm[0] + nrm[1]*nrm[1]*nrm[2];
+		upv[2] = -nrm[1]*(nrm[0]*nrm[0] + nrm[1]*nrm[1]);
+		if (SDcompXform(vMtx, nrm, upv) != SDEnone)
+			continue;
+		nrota = addrot(rotargs, vMtx[0], vMtx[1], vMtx[2]);
+		if (front_comp) {
 			cvt_sposition(sorg, ivec, 1);
-			ivec[0] = -ivec[0]; ivec[1] = -ivec[1];	/* normal */
-			sprintf(xfargs, "-s %f -t %f %f %f", bsdf_rad,
-					sorg[0], sorg[1], sorg[2]);
-			nxfa = 6;
 			printf("\nvoid colorfunc scale_pat\n");
-			printf("%d bsdf_red bsdf_grn bsdf_blu bsdf2rad.cal\n\t%s\n0\n0\n",
-					4+nxfa, xfargs);
+			printf("10 bsdf_red bsdf_grn bsdf_blu bsdf2rad.cal\n");
+			printf("\t-s %f -t %f %f %f\n0\n0\n",
+					bsdf_rad, sorg[0], sorg[1], sorg[2]);
 			printf("\nscale_pat glow scale_mat\n0\n0\n4 1 1 1 0\n");
-			SDcompXform(vMtx, ivec, Yaxis);
-			nxfa = addrot(xfargs, vMtx[0], vMtx[1], vMtx[2]);
-			sprintf(xfargs+strlen(xfargs), " -s %f -t %f %f %f",
-					scalef, sorg[0], sorg[1], sorg[2]);
-			nxfa += 6;
+		}
+		if (front_comp & SDsampR) {
+			put_mirror_arrow(sorg, nrm);
 			fname = tfile_name(frpref, dsuffix, i);
-			sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform %s",
+			sprintf(cmdbuf,
+		"gensurf scale_mat %s%d %s %s %s %d %d | xform %s -s %f -t %f %f %f",
 					frpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
-					xfargs);
+					rotargs, scalef, sorg[0], sorg[1], sorg[2]);
 			if (!run_cmd(cmdbuf))
 				return(0);
 		}
-	if (front_comp & SDsampT)			/* front transmission */
-		for (i = 0; i < NINCIDENT; i++) {
-			get_ivector(ivec, i);
-			put_trans_arrow(ivec, 1);
-			cvt_sposition(sorg, ivec, 1);
-			ivec[0] = -ivec[0]; ivec[1] = -ivec[1];	/* normal */
-			sprintf(xfargs, "-s %f -t %f %f %f", bsdf_rad,
-					sorg[0], sorg[1], sorg[2]);
-			nxfa = 6;
-			printf("\nvoid colorfunc scale_pat\n");
-			printf("%d bsdf_red bsdf_grn bsdf_blu bsdf2rad.cal\n\t%s\n0\n0\n",
-					4+nxfa, xfargs);
-			printf("\nscale_pat glow scale_mat\n0\n0\n4 1 1 1 0\n");
-			SDcompXform(vMtx, ivec, Yaxis);
-			nxfa = addrot(xfargs, vMtx[0], vMtx[1], vMtx[2]);
-			sprintf(xfargs+strlen(xfargs), " -s %f -t %f %f %f",
-					scalef, sorg[0], sorg[1], sorg[2]);
-			nxfa += 6;
+		if (front_comp & SDsampT) {
+			put_trans_arrow(sorg);
 			fname = tfile_name(ftpref, dsuffix, i);
-			sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -I %s",
+			sprintf(cmdbuf,
+		"gensurf scale_mat %s%d %s %s %s %d %d | xform -I %s -s %f -t %f %f %f",
 					ftpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
-					xfargs);
+					rotargs, scalef, sorg[0], sorg[1], sorg[2]);
 			if (!run_cmd(cmdbuf))
 				return(0);
 		}
-	if (back_comp & SDsampR)			/* rear reflection */
-		for (i = 0; i < NINCIDENT; i++) {
-			get_ivector(ivec, i);
-			put_mirror_arrow(ivec, -1);
+		if (back_comp) {
 			cvt_sposition(sorg, ivec, -1);
-			ivec[0] = -ivec[0]; ivec[1] = -ivec[1];	/* normal */
-			sprintf(xfargs, "-s %f -t %f %f %f", bsdf_rad,
-					sorg[0], sorg[1], sorg[2]);
-			nxfa = 6;
 			printf("\nvoid colorfunc scale_pat\n");
-			printf("%d bsdf_red bsdf_grn bsdf_blu bsdf2rad.cal\n\t%s\n0\n0\n",
-					4+nxfa, xfargs);
+			printf("10 bsdf_red bsdf_grn bsdf_blu bsdf2rad.cal\n");
+			printf("\t-s %f -t %f %f %f\n0\n0\n",
+					bsdf_rad, sorg[0], sorg[1], sorg[2]);
 			printf("\nscale_pat glow scale_mat\n0\n0\n4 1 1 1 0\n");
-			SDcompXform(vMtx, ivec, Yaxis);
-			nxfa = addrot(xfargs, vMtx[0], vMtx[1], vMtx[2]);
-			sprintf(xfargs+strlen(xfargs), " -s %f -t %f %f %f",
-					scalef, sorg[0], sorg[1], sorg[2]);
-			nxfa += 6;
+		}
+		if (back_comp & SDsampR) {
+			put_mirror_arrow(sorg, nrm);
 			fname = tfile_name(brpref, dsuffix, i);
-			sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -I -ry 180 %s",
+			sprintf(cmdbuf,
+		"gensurf scale_mat %s%d %s %s %s %d %d | xform -I -ry 180 %s -s %f -t %f %f %f",
 					brpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
-					xfargs);
+					rotargs, scalef, sorg[0], sorg[1], sorg[2]);
 			if (!run_cmd(cmdbuf))
 				return(0);
 		}
-	if (back_comp & SDsampT)			/* rear transmission */
-		for (i = 0; i < NINCIDENT; i++) {
-			get_ivector(ivec, i);
-			put_trans_arrow(ivec, -1);
-			cvt_sposition(sorg, ivec, -1);
-			ivec[0] = -ivec[0]; ivec[1] = -ivec[1];	/* normal */
-			sprintf(xfargs, "-s %f -t %f %f %f", bsdf_rad,
-					sorg[0], sorg[1], sorg[2]);
-			nxfa = 6;
-			printf("\nvoid colorfunc scale_pat\n");
-			printf("%d bsdf_red bsdf_grn bsdf_blu bsdf2rad.cal\n\t%s\n0\n0\n",
-					4+nxfa, xfargs);
-			printf("\nscale_pat glow scale_mat\n0\n0\n4 1 1 1 0\n");
-			SDcompXform(vMtx, ivec, Yaxis);
-			nxfa = addrot(xfargs, vMtx[0], vMtx[1], vMtx[2]);
-			sprintf(xfargs+strlen(xfargs), " -s %f -t %f %f %f",
-					scalef, sorg[0], sorg[1], sorg[2]);
-			nxfa += 6;
+		if (back_comp & SDsampT) {
+			put_trans_arrow(sorg);
 			fname = tfile_name(btpref, dsuffix, i);
-			sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -ry 180 %s",
+			sprintf(cmdbuf,
+		"gensurf scale_mat %s%d %s %s %s %d %d | xform -ry 180 %s -s %f -t %f %f %f",
 					btpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
-					xfargs);
+					rotargs, scalef, sorg[0], sorg[1], sorg[2]);
 			if (!run_cmd(cmdbuf))
 				return(0);
 		}
+	}
 	return(1);
 }
 
@@ -501,10 +461,11 @@ put_matBSDF(const char *XMLfile)
 		printf("\nvoid brightfunc latlong\n2 latlong bsdf2rad.cal\n0\n0\n");
 		if ((front_comp|back_comp) & SDsampT)
 			printf("\nlatlong trans %s\n0\n0\n7 .75 .75 .75 0 .04 .5 .8\n",
-					sph_mat);
+					sph_fmat);
 		else
 			printf("\nlatlong plastic %s\n0\n0\n5 .5 .5 .5 0 0\n",
-					sph_mat);
+					sph_fmat);
+		printf("\ninherit alias %s %s\n", sph_bmat, sph_fmat);
 		return;
 	}
 	switch (XMLfile[0]) {		/* avoid RAYPATH search */
@@ -517,12 +478,16 @@ put_matBSDF(const char *XMLfile)
 		exit(1);
 		break;
 	}
-	printf("\n# Actual BSDF material for rendering the hemispheres\n");
-	printf("\nvoid BSDF BSDFmat\n6 0 \"%s%s\" 0 1 0 .\n0\n0\n",
+	printf("\n# Actual BSDF materials for rendering the hemispheres\n");
+	printf("\nvoid BSDF BSDF_f\n6 0 \"%s%s\" upx upy upz bsdf2rad.cal\n0\n0\n",
 			curdir, XMLfile);
 	printf("\nvoid plastic black\n0\n0\n5 0 0 0 0 0\n");
-	printf("\nvoid mixfunc %s\n4 BSDFmat black latlong bsdf2rad.cal\n0\n0\n",
-			sph_mat);
+	printf("\nvoid mixfunc %s\n4 BSDF_f black latlong bsdf2rad.cal\n0\n0\n",
+			sph_fmat);
+	printf("\nvoid BSDF BSDF_b\n8 0 \"%s%s\" upx upy upz bsdf2rad.cal -ry 180\n0\n0\n",
+			curdir, XMLfile);
+	printf("\nvoid mixfunc %s\n4 BSDF_b black latlong bsdf2rad.cal\n0\n0\n",
+			sph_bmat);
 }
 
 /* Put out overhead parallel light source */
@@ -540,14 +505,13 @@ put_source(void)
 static void
 put_hemispheres(void)
 {
+	const int	nsegs = 131;
+
 	printf("\n# Hemisphere(s) for showing BSDF appearance (if XML file)\n");
-	printf("\nvoid antimatter anti_sph\n2 void %s\n0\n0\n", sph_mat);
 	if (front_comp) {
-		printf("\n%s sphere Front\n0\n0\n4 %f 0 0 %f\n",
-				sph_mat, sph_xoffset, sph_rad);
-		printf("\n!genbox anti_sph sph_eraser %f %f %f | xform -t %f %f %f\n",
-				2.02*sph_rad, 2.02*sph_rad, 1.02*sph_rad,
-				-1.01*sph_rad + sph_xoffset, -1.01*sph_rad, -1.01*sph_rad);
+		printf(
+"\n!genrev %s Front \"R*sin(A*t)\" \"R*cos(A*t)\" %d -e \"R:%g;A:%f\" -s | xform -t %g 0 0\n",
+				sph_fmat, nsegs, sph_rad, 0.495*PI, sph_xoffset);
 		printf("\nvoid brighttext front_text\n3 helvet.fnt . FRONT\n0\n");
 		printf("12\n\t%f %f 0\n\t%f 0 0\n\t0 %f 0\n\t.01 1 -.1\n",
 				-.22*sph_rad + sph_xoffset, -1.4*sph_rad,
@@ -561,11 +525,9 @@ put_hemispheres(void)
 				.25*sph_rad + sph_xoffset, -1.3*sph_rad );
 	}
 	if (back_comp) {
-		printf("\n%s bubble Back\n0\n0\n4 %f 0 0 %f\n",
-				sph_mat, -sph_xoffset, sph_rad);
-		printf("\n!genbox anti_sph sph_eraser %f %f %f | xform -t %f %f %f\n",
-				2.02*sph_rad, 2.02*sph_rad, 1.02*sph_rad,
-				-1.01*sph_rad - sph_xoffset, -1.01*sph_rad, -1.01*sph_rad);
+		printf(
+"\n!genrev %s Back \"R*cos(A*t)\" \"R*sin(A*t)\" %d -e \"R:%g;A:%f\" -s | xform -t %g 0 0\n",
+				sph_bmat, nsegs, sph_rad, 0.495*PI, -sph_xoffset);
 		printf("\nvoid brighttext back_text\n3 helvet.fnt . BACK\n0\n");
 		printf("12\n\t%f %f 0\n\t%f 0 0\n\t0 %f 0\n\t.01 1 -.1\n",
 				-.22*sph_rad - sph_xoffset, -1.4*sph_rad,