--- ray/src/util/genBSDF.pl	2019/06/09 20:52:13	2.82
+++ ray/src/util/genBSDF.pl	2025/04/04 18:06:48	2.95
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# RCSid $Id: genBSDF.pl,v 2.82 2019/06/09 20:52:13 greg Exp $
+# RCSid $Id: genBSDF.pl,v 2.95 2025/04/04 18:06:48 greg Exp $
 #
 # Compute BSDF based on geometry and material description
 #
@@ -13,7 +13,7 @@ sub userror {
 	exit 1;
 }
 my ($td,$radscn,$mgfscn,$octree,$fsender,$bsender,$receivers,$facedat,$behinddat,$rmtmp);
-my ($tf,$rf,$tb,$rb,$tfx,$rfx,$tbx,$rbx,$tfz,$rfz,$tbz,$rbz,$cph);
+my ($tf,$rf,$tb,$rb,$tfx,$rfx,$tbx,$rbx,$tfz,$rfz,$tbz,$rbz);
 my ($curphase, $recovery);
 if ($#ARGV == 1 && "$ARGV[0]" =~ /^-rec/) {
 	$td = $ARGV[1];
@@ -57,7 +57,6 @@ if ($windoz) {
 	$rfz = "$td\\rfz.dat";
 	$tbz = "$td\\tbz.dat";
 	$rbz = "$td\\rbz.dat";
-	$cph = "$td\\phase.txt";
 	$rmtmp = "rd /S /Q $td";
 } else {
 	$radscn = "$td/device.rad";
@@ -80,7 +79,6 @@ if ($windoz) {
 	$rfz = "$td/rfz.dat";
 	$tbz = "$td/tbz.dat";
 	$rbz = "$td/rbz.dat";
-	$cph = "$td/phase.txt";
 	$rmtmp = "rm -rf $td";
 }
 my @savedARGV = @ARGV;
@@ -165,7 +163,7 @@ if ( !defined $recovery ) {
 			($tensortree==3 && !($doforw && $doback));
 	# Get scene description
 	if ( $mgfin ) {
-		system "mgf2rad @ARGV > $radscn";
+		system "mgf2rad -s @ARGV > $radscn";
 		die "Could not load MGF input\n" if ( $? );
 	} else {
 		system "xform -e @ARGV > $radscn";
@@ -186,10 +184,7 @@ $wrapper .= ' -f "t=' . (-$dim[4]) . ';w=' . ($dim[1] 
 		';h=' . ($dim[3] - $dim[2]) . '"';
 $wrapper .= " -g $mgfscn" if ( $geout );
 # Calculate CIE (u',v') from Radiance RGB:
-my $CIEuv =	'Xi=.5141*Ri+.3239*Gi+.1620*Bi;' .
-		'Yi=.2651*Ri+.6701*Gi+.0648*Bi;' .
-		'Zi=.0241*Ri+.1229*Gi+.8530*Bi;' .
-		'den=Xi+15*Yi+3*Zi;' .
+my $CIEuv =	'den=Xi+15*Yi+3*Zi;' .
 		'uprime=if(Yi,4*Xi/den,4/19);' .
 		'vprime=if(Yi,9*Yi/den,9/19);' ;
 my $FEPS = 1e-5;
@@ -213,6 +208,7 @@ if ( !defined $recovery ) {
 		printf MGFSCN "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2;
 		close MGFSCN;
 		if ( $mgfin ) {
+			die "+mgf requires input file with +geom\n" if ($#ARGV < 0);
 			system qq{mgfilt "#,o,xf,c,cxy,cspec,cmix,m,sides,rd,td,rs,ts,ir,v,p,n,f,fh,sph,cyl,cone,prism,ring,torus" @ARGV >> $mgfscn};
 		} else {
 			system "rad2mgf $radscn >> $mgfscn";
@@ -324,8 +320,9 @@ sub do_ttree_dir {
 				qq{-e "r2=rand(-5.37138*recno+67.1737811)" } .
 				qq{-e "r3=rand(+3.17603772*recno+83.766771)" } .
 				qq{-e "r4=rand(-1.5839226*recno-59.82712)" } .
-				qq{-e "Dx=1-2*(\$1+r1)/$ns" } .
-				qq{-e "Dy=if(\$1-.5,1/$ns,sqrt(1-Dx*Dx))*(2*r2-1)" } .
+				qq{-e "odds(n):if(.5*n-floor(.5*n)-.25,-1,1)"} .
+				qq{-e "Dx=1-(\$1+r1)/$ns2" } .
+				qq{-e "Dy=min(1/$ns,sqrt(1-Dx*Dx))*odds(\$1)*r2" } .
 				qq{-e "Dz=sqrt(1-Dx*Dx-Dy*Dy)" } .
 				qq{-e "xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]" } .
 				qq{-e "yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]" } .
@@ -339,15 +336,16 @@ sub do_ttree_dir {
 				qq{-e 'r2=rand(-5.37138*recno+67.1737811)' } .
 				qq{-e 'r3=rand(+3.17603772*recno+83.766771)' } .
 				qq{-e 'r4=rand(-1.5839226*recno-59.82712)' } .
-				qq{-e 'Dx=1-2*(\$1+r1)/$ns' } .
-				qq{-e 'Dy=if(\$1-.5,1/$ns,sqrt(1-Dx*Dx))*(2*r2-1)' } .
+				qq{-e 'odds(n):if(.5*n-floor(.5*n)-.25,-1,1)' } .
+				qq{-e 'Dx=1-(\$1+r1)/$ns2' } .
+				qq{-e 'Dy=min(1/$ns,sqrt(1-Dx*Dx))*odds(\$1)*r2' } .
 				qq{-e 'Dz=sqrt(1-Dx*Dx-Dy*Dy)' } .
 				qq{-e 'xp=(\$3+r3)*(($dim[1]-$dim[0])/$nx)+$dim[0]' } .
 				qq{-e 'yp=(\$2+r4)*(($dim[3]-$dim[2])/$ny)+$dim[2]' } .
 				qq{-e 'zp=$dim[5-$forw]' -e 'myDz=Dz*($forw*2-1)' } .
 				qq{-e '\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz' } .
 				qq{-e '\$4=Dx;\$5=Dy;\$6=myDz' -of } .
-				"| $rfluxmtx$r -h -ff -y $ns2 - $receivers -i $octree";
+				"| $rfluxmtx$r -ff -y $ns2 - $receivers -i $octree";
 		}
 	} else {
 		# Anisotropic BSDF
@@ -355,7 +353,7 @@ sub do_ttree_dir {
 		if ($windoz) {
 			$cmd = "$rfluxmtx$r -fa $sender $receivers -i $octree";
 		} else {
-			$cmd = "$rfluxmtx$r -h -ff $sender $receivers -i $octree";
+			$cmd = "$rfluxmtx$r -ff $sender $receivers -i $octree";
 		}
 	}
 	if ( $dop ) {
@@ -403,55 +401,43 @@ sub ttree_comp {
 	my $dest = shift;
 	my $cmd;
 	if ($windoz) {
+		$cmd = "rcomb -fa -c xyz $src | rcollate -ho -oc 1" .
+				q{ | rcalc -e "Xi=$1;Yi=$2;Zi=$3" };
 		if ("$spec" eq "Visible") {
-			$cmd = qq{rcalc -e "Omega:PI/($ns*$ns)" } .
-				q{-e "Ri=$1;Gi=$2;Bi=$3" } .
-				qq{-e "$CIEuv" } .
+			$cmd .= qq{-e "Omega:PI/($ns*$ns)" } .
 				q{-e "$1=Yi/Omega"};
 		} elsif ("$spec" eq "CIE-u") {
-			$cmd = q{rcalc -e "Ri=$1;Gi=$2;Bi=$3" } .
-				qq{-e "$CIEuv" } .
+			$cmd .= qq{-e "$CIEuv" } .
 				q{-e "$1=uprime"};
 		} elsif ("$spec" eq "CIE-v") {
-			$cmd = q{rcalc -e "Ri=$1;Gi=$2;Bi=$3" } .
-				qq{-e "$CIEuv" } .
+			$cmd .= qq{-e "$CIEuv" } .
 				q{-e "$1=vprime"};
 		}
 	} else {
+		$cmd = "rcomb -ff -c xyz $src | getinfo -" .
+				q{ | rcalc -if3 -of -e 'Xi=$1;Yi=$2;Zi=$3' };
 		if ("$spec" eq "Visible") {
-			$cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " .
-				q{-e 'Ri=$1;Gi=$2;Bi=$3' } .
-				"-e '$CIEuv' " .
+			$cmd .= "-e 'Omega:PI/($ns*$ns)' " .
 				q{-e '$1=Yi/Omega'};
 		} elsif ("$spec" eq "CIE-u") {
-			$cmd = q{rcalc -if3 -e 'Ri=$1;Gi=$2;Bi=$3' } .
-				"-e '$CIEuv' " .
+			$cmd .= "-e '$CIEuv' " .
 				q{-e '$1=uprime'};
 		} elsif ("$spec" eq "CIE-v") {
-			$cmd = q{rcalc -if3 -e 'Ri=$1;Gi=$2;Bi=$3' } .
-				"-e '$CIEuv' " .
+			$cmd .= "-e '$CIEuv' " .
 				q{-e '$1=vprime'};
 		}
 	}
 	if ($pctcull >= 0) {
-		my $avg = ( $dorecip && "$typ" =~ /^r[fb]/ ) ? " -a" : "";
+		my $avg = ( $dorecip && ( $tensortree == 3 || "$typ" =~ /^r[fb]/ ) ) ? " -a" : "";
 		my $pcull = ("$spec" eq "Visible") ? $pctcull :
 						     (100 - (100-$pctcull)*.25) ;
 		if ($windoz) {
-			$cmd = "rcollate -ho -oc 1 $src | " .
-					$cmd .
-					" | rttree_reduce$avg -h -fa -t $pcull -r $tensortree -g $ttlog2";
+			$cmd .= " | rttree_reduce$avg -h -fa -t $pcull -r $tensortree -g $ttlog2";
 		} else {
-			$cmd .= " -of $src " .
-					"| rttree_reduce$avg -h -ff -t $pcull -r $tensortree -g $ttlog2";
+			$cmd .= " | rttree_reduce$avg -h -ff -t $pcull -r $tensortree -g $ttlog2";
 		}
 		run_check "$cmd > $dest";
 	} else {
-		if ($windoz) {
-			$cmd = "rcollate -ho -oc 1 $src | " . $cmd ;
-		} else {
-			$cmd .= " $src";
-		}
 		if ( active_phase() ) {
 			open(DATOUT, "> $dest");
 			print DATOUT "{\n";
@@ -491,7 +477,7 @@ sub do_matrix_dir {
 	my $dop = do_phase();
 	my $r = ($dop < 0) ? " -r" : "";
 	my $sender = ($bsender,$fsender)[$forw];
-	my $cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree";
+	my $cmd = "$rfluxmtx$r -ff $sender $receivers -i $octree";
 	if ( $dop ) {
 		# print STDERR "Running: $cmd\n";
 		system $cmd;
@@ -534,11 +520,11 @@ sub matrix_comp {
 	my $dest = shift;
 	my $cmd = "rmtxop -fa -t";
 	if ("$spec" eq "Visible") {
-		$cmd .= " -c 0.2651 0.6701 0.0648";
+		$cmd .= " -c y";
 	} elsif ("$spec" eq "CIE-X") {
-		$cmd .= " -c 0.5141 0.3239 0.1620";
+		$cmd .= " -c x";
 	} elsif ("$spec" eq "CIE-Z") {
-		$cmd .= " -c 0.0241 0.1229 0.8530";
+		$cmd .= " -c z";
 	}
 	$cmd .= " $src | getinfo -";
 	run_check "$cmd > $dest";